Skip to content

Update PHP Style Fixer #148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 16 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/php-cs-fixer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
.idea
.php_cs
.php_cs.cache
.php-cs-fixer.cache
.phpunit.result.cache
build
composer.lock
Expand Down
15 changes: 7 additions & 8 deletions .php_cs.dist → .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -29,15 +31,12 @@
],
'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,
],
'single_trait_insert_per_statement' => true,
])
->setFinder($finder);

return $config;
4 changes: 2 additions & 2 deletions resources/views/partials/header.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -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">
<path class="svg-location-pin" d="M115.2,25.1C55.7,25.1,7.4,73.4,7.4,132.9c0,8.4,1,16.6,2.8,24.4c-1.6-1.1,103.1,252.3,103.1,252.3
Expand All @@ -26,7 +26,7 @@ class="location-pin"
Locations
<svg
version="1.1"
class="locations-chevron"
class="locations-chevron w-4"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
viewBox="0 0 318.89 326.27"
Expand Down
3 changes: 2 additions & 1 deletion src/Nova/Fields/Enum.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ function ($value) {
}
);
}


/** @return 'Tipoff\Support\Nova\Fields\Enum' */
public function attach(string $class): self
{
Assert::that($class)->subclassOf(BaseEnum::class);
Expand Down
4 changes: 2 additions & 2 deletions src/SupportServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -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,
])
Expand Down