misc: update dependencies

romm · Aug 7, 2023 · 78b9600 · 78b9600
1 parent 7824083
commit 78b9600
Show file tree

Hide file tree

Showing 14 changed files with 206 additions and 335 deletions.
diff --git a/.github/workflows/quality-assurance.yml b/.github/workflows/quality-assurance.yml
@@ -7,7 +7,6 @@ jobs:
     env:
       php-version: '8.2'
       php-extensions: yaml
-      PHP_CS_FIXER_IGNORE_ENV: 1 # PHP8.2 remove when PHP-CS-Fixer fully supports PHP 8.2
     steps:
       - name: Checkout
         uses: actions/checkout@v3

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -7,10 +7,7 @@
 ])
     ->notPath('Fixtures/FunctionWithGroupedImportStatements.php')
     ->notPath('Fixtures/FunctionWithSeveralImportStatementsInSameUseStatement.php')
-    ->notPath('Fixtures/TwoClassesInDifferentNamespaces.php')
-    // PHP8.2 remove when PHP-CS-Fixer fully supports PHP 8.2; also remove
-    // `@putenv PHP_CS_FIXER_IGNORE_ENV=1` inside `composer.json`
-    ->notPath('Fixture/Object/ObjectWithPropertyWithNativeDisjunctiveNormalFormType.php');
+    ->notPath('Fixtures/TwoClassesInDifferentNamespaces.php');
 
 if (PHP_VERSION_ID < 8_01_00) {
     $finder = $finder->notPath('Fixture/Enum/PureEnum.php');

diff --git a/composer.json b/composer.json
@@ -51,7 +51,6 @@
             "psalm --config=tests/StaticAnalysis/psalm-with-plugin.xml",
             "phpstan --configuration=tests/StaticAnalysis/phpstan-without-extension.neon.dist",
             "phpstan --configuration=tests/StaticAnalysis/phpstan-with-extension.neon.dist",
-            "@putenv PHP_CS_FIXER_IGNORE_ENV=1",
             "php-cs-fixer fix --dry-run",
             "rector --dry-run",
             "@check-todo"
@@ -61,7 +60,6 @@
         ],
         "fix": [
             "@putenv XDEBUG_MODE=off",
-            "@putenv PHP_CS_FIXER_IGNORE_ENV=1",
             "php-cs-fixer fix",
             "rector"
         ],