diff --git a/.github/workflows/php-cs-fixer.yml b/.github/workflows/php-cs-fixer.yml index 7f44633..bca5c49 100644 --- a/.github/workflows/php-cs-fixer.yml +++ b/.github/workflows/php-cs-fixer.yml @@ -13,9 +13,9 @@ jobs: ref: ${{ github.head_ref }} - name: Run PHP CS Fixer - uses: docker://oskarstark/php-cs-fixer-ga:2.18.6 + uses: docker://oskarstark/php-cs-fixer-ga with: - args: --config=.php_cs.dist --allow-risky=yes + args: --allow-risky=yes - name: Commit changes uses: stefanzweifel/git-auto-commit-action@v4 diff --git a/.gitignore b/.gitignore index 0296b57..d003269 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ .idea .php_cs .php_cs.cache +.php-cs-fixer.cache .phpunit.result.cache build composer.lock diff --git a/.php_cs.dist b/.php-cs-fixer.dist.php similarity index 80% rename from .php_cs.dist rename to .php-cs-fixer.dist.php index c7d380c..040cfb5 100644 --- a/.php_cs.dist +++ b/.php-cs-fixer.dist.php @@ -13,14 +13,16 @@ ->ignoreDotFiles(true) ->ignoreVCS(true); -return PhpCsFixer\Config::create() +$config = new PhpCsFixer\Config(); +$config + ->setRiskyAllowed(true) ->setRules([ '@PSR2' => true, 'array_syntax' => ['syntax' => 'short'], - 'ordered_imports' => ['sortAlgorithm' => 'alpha'], + 'ordered_imports' => ['sort_algorithm' => 'alpha'], 'no_unused_imports' => true, 'not_operator_with_successor_space' => true, - 'trailing_comma_in_multiline_array' => true, + 'trailing_comma_in_multiline' => true, 'phpdoc_scalar' => true, 'unary_operator_spaces' => true, 'binary_operator_spaces' => true, @@ -29,11 +31,6 @@ ], 'phpdoc_single_line_var_spacing' => true, 'phpdoc_var_without_name' => true, - 'class_attributes_separation' => [ - 'elements' => [ - 'method', - ], - ], 'method_argument_space' => [ 'on_multiline' => 'ensure_fully_multiline', 'keep_multiple_spaces_after_comma' => true, @@ -41,3 +38,5 @@ 'single_trait_insert_per_statement' => true, ]) ->setFinder($finder); + +return $config; diff --git a/resources/views/partials/header.blade.php b/resources/views/partials/header.blade.php index f3ab0c8..6eace83 100644 --- a/resources/views/partials/header.blade.php +++ b/resources/views/partials/header.blade.php @@ -12,7 +12,7 @@ version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" - class="location-pin" + class="location-pin w-4" viewBox="0 0 230.4 436.7" xml:space="preserve"> subclassOf(BaseEnum::class); diff --git a/src/SupportServiceProvider.php b/src/SupportServiceProvider.php index 1f4dd2d..088f2c0 100644 --- a/src/SupportServiceProvider.php +++ b/src/SupportServiceProvider.php @@ -6,9 +6,9 @@ class SupportServiceProvider extends TipoffServiceProvider { - public function configureTipoffPackage(TipoffPackage $package): void + public function configureTipoffPackage(TipoffPackage $tipoffPackage): void { - $package + $tipoffPackage ->hasBladeComponents([ 'money' => Money::class, ])