forked from LibreBooking/app
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request LibreBooking#49 from apfelchips/develop
php-cs-fixer & doc updates & composer integration
- Loading branch information
Showing
12 changed files
with
10,698 additions
and
10,750 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
<?php | ||
|
||
define('PHP_CS_FIXER_CACHE_FILE', __DIR__ . '/var/cache/.php-cs-fixer.cache'); | ||
|
||
try { | ||
mkdir(dirname(PHP_CS_FIXER_CACHE_FILE), 0755, true); | ||
} catch (exception $e) {} | ||
|
||
// doc: https://github.com/FriendsOfPhp/PHP-CS-Fixer#usage | ||
// https://symfony.com/doc/current/components/finder.html | ||
$finder = new PhpCsFixer\Finder(); | ||
|
||
$finder->exclude(['.git', 'tpl_c', 'build', '.phpdoc', 'var', 'tools', 'vendor']) | ||
->notPath(['lib/external']) | ||
->in(__DIR__); | ||
|
||
$config = new PhpCsFixer\Config(); | ||
|
||
// rules: https://cs.symfony.com/doc/rules/index.html | ||
return $config | ||
->setCacheFile(PHP_CS_FIXER_CACHE_FILE) | ||
->setRiskyAllowed(true) | ||
->setRules([ | ||
'@PSR12' => true, // https://www.php-fig.org/psr/psr-12/ | ||
'array_syntax' => ['syntax' => 'short'], | ||
]) | ||
->setFinder($finder); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,21 @@ | ||
{ | ||
"description": "Booked Scheduler", | ||
"autoload": | ||
{ | ||
|
||
}, | ||
"require-dev": | ||
{ | ||
"autoload": {}, | ||
"require-dev": { | ||
"kint-php/kint": "^3.3", | ||
"kint-php/kint-smarty": "^1.0" | ||
}, | ||
"require" : { | ||
"php" : ">=7.3" | ||
}, | ||
"scripts": { | ||
"install-tools":"phive install --copy --trust-gpg-keys 4AA394086372C20A,2420BAE0A3BE25C6,6DA3ACC4991FFAE5,E82B2FB314E9906E phing phpunit phpdocumentor php-cs-fixer", | ||
"build":"./tools/phing", | ||
"fix": "./tools/php-cs-fixer fix -v", | ||
"lint": "./tools/php-cs-fixer fix -vv --dry-run", | ||
"test": [ | ||
"./tools/phpunit", | ||
"@lint" | ||
] | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,5 @@ | ||
Sehr geehrte/r {$FirstName} {$LastName},<br/> | ||
<br /> | ||
<br/> | ||
Vielen Dank für Ihre Registrierung. | ||
Durch einen Klick auf diesen <h3>Link <a href="{$ActivationUrl}"></h3>aktivieren Sie Ihr Konto</a>. | ||
Durch einen Klick auf diesen Link: <h3><a href="{$ActivationUrl}">aktivieren Sie Ihr Konto</a></h3><br/> | ||
oder geben Sie <em>{$ActivationUrl}</em> in Ihren Browser ein. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters