Merge branch 'main' into doc/input-from-untrusted-sources

auth0 · Jul 12, 2024 · fd04567 · fd04567
2 parents 89e44a9 + d263216
commit fd04567
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 19 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -1,6 +1,7 @@
 <?php
 
 return (new PhpCsFixer\Config())
+    ->setParallelConfig(PhpCsFixer\Runner\Parallel\ParallelConfigFactory::detect())
     ->setRiskyAllowed(true)
     ->setRules([
         'array_indentation' => true,

diff --git a/composer.json b/composer.json
@@ -39,19 +39,19 @@
     "psr/http-message-implementation": "^1"
   },
   "require-dev": {
-    "ergebnis/composer-normalize": "^2",
-    "friendsofphp/php-cs-fixer": "^3",
-    "mockery/mockery": "^1",
-    "pestphp/pest": "^2",
-    "phpstan/phpstan": "^1",
-    "phpstan/phpstan-strict-rules": "^1",
-    "psr-mock/http": "^1",
-    "rector/rector": "0.17.6",
-    "spatie/ray": "^1",
+    "ergebnis/composer-normalize": "~2.43.0",
+    "friendsofphp/php-cs-fixer": "~3.59.0",
+    "mockery/mockery": "~1.6.0",
+    "pestphp/pest": "~2.34.0",
+    "phpstan/phpstan": "~1.11.0",
+    "phpstan/phpstan-strict-rules": "~1.6.0",
+    "psr-mock/http": "~1.0.0",
+    "rector/rector": "~0.17.0",
+    "spatie/ray": "~1.41.0",
     "symfony/cache": "^4 || ^5 || ^6",
     "symfony/event-dispatcher": "^4 || ^5 || ^6",
-    "vimeo/psalm": "^5",
-    "wikimedia/composer-merge-plugin": "^2"
+    "vimeo/psalm": "~5.25.0",
+    "wikimedia/composer-merge-plugin": "~2.1.0"
   },
   "suggest": {
     "psr/cache-implementation": "(PSR-6 Cache) Improve performance by avoiding making redundant network requests.",

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -48,3 +48,4 @@ parameters:
             path: src\Utility\HttpRequest.php
 
     reportUnmatchedIgnoredErrors: false
+    treatPhpDocTypesAsCertain: false
diff --git a/rector.php b/rector.php
@@ -18,7 +18,8 @@
 use Rector\CodeQuality\Rector\ClassMethod\{InlineArrayReturnAssignRector,
     NarrowUnionTypeDocRector,
     OptionalParametersAfterRequiredRector,
-    ReturnTypeFromStrictScalarReturnExprRector};
+    // ReturnTypeFromStrictScalarReturnExprRector
+    };
 use Rector\CodeQuality\Rector\Concat\JoinStringConcatRector;
 use Rector\CodeQuality\Rector\Empty_\SimplifyEmptyCheckOnEmptyArrayRector;
 use Rector\CodeQuality\Rector\Equal\UseIdenticalOverEqualWithSameTypeRector;
@@ -207,10 +208,10 @@
     AddReturnTypeDeclarationBasedOnParentClassMethodRector,
     AddVoidReturnTypeWhereNoReturnRector,
     ArrayShapeFromConstantArrayReturnRector,
-    ParamAnnotationIncorrectNullableRector,
+    // ParamAnnotationIncorrectNullableRector,
     ParamTypeByMethodCallTypeRector,
     ParamTypeByParentCallTypeRector,
-    ReturnAnnotationIncorrectNullableRector,
+    // ReturnAnnotationIncorrectNullableRector,
     ReturnNeverTypeRector,
     ReturnTypeFromReturnDirectArrayRector,
     ReturnTypeFromReturnNewRector,
@@ -220,7 +221,7 @@
     ReturnTypeFromStrictNewArrayRector,
     ReturnTypeFromStrictTypedCallRector,
     ReturnTypeFromStrictTypedPropertyRector};
-use Rector\TypeDeclaration\Rector\Closure\AddClosureReturnTypeRector;
+// use Rector\TypeDeclaration\Rector\Closure\AddClosureReturnTypeRector;
 use Rector\TypeDeclaration\Rector\Empty_\EmptyOnNullableObjectToInstanceOfRector;
 use Rector\TypeDeclaration\Rector\FunctionLike\{AddParamTypeSplFixedArrayRector,
     AddReturnTypeDeclarationFromYieldsRector};
@@ -336,7 +337,7 @@
         // ActionInjectionToConstructorInjectionRector::class,
         AddArrayDefaultToArrayPropertyRector::class,
         AddArrowFunctionReturnTypeRector::class,
-        AddClosureReturnTypeRector::class,
+        // AddClosureReturnTypeRector::class,
         // AddFalseDefaultToBoolPropertyRector::class,
         AddMethodCallBasedStrictParamTypeRector::class,
         AddParamBasedOnParentClassMethodRector::class,
@@ -412,7 +413,7 @@
         // NormalizeNamespaceByPSR4ComposerAutoloadRector::class,
         NullableCompareToNullRector::class,
         OptionalParametersAfterRequiredRector::class,
-        ParamAnnotationIncorrectNullableRector::class,
+        // ParamAnnotationIncorrectNullableRector::class,
         ParamTypeByMethodCallTypeRector::class,
         ParamTypeByParentCallTypeRector::class,
         ParamTypeFromStrictTypedPropertyRector::class,
@@ -466,7 +467,7 @@
         RenameForeachValueVariableToMatchExprVariableRector::class,
         RenameForeachValueVariableToMatchMethodCallReturnTypeRector::class,
         ReplaceMultipleBooleanNotRector::class,
-        ReturnAnnotationIncorrectNullableRector::class,
+        // ReturnAnnotationIncorrectNullableRector::class,
         // ReturnBinaryAndToEarlyReturnRector::class,
         ReturnBinaryOrToEarlyReturnRector::class,
         ReturnEarlyIfVariableRector::class,
@@ -477,7 +478,7 @@
         ReturnTypeFromStrictConstantReturnRector::class,
         ReturnTypeFromStrictNativeCallRector::class,
         ReturnTypeFromStrictNewArrayRector::class,
-        ReturnTypeFromStrictScalarReturnExprRector::class,
+        // ReturnTypeFromStrictScalarReturnExprRector::class,
         ReturnTypeFromStrictTernaryRector::class,
         ReturnTypeFromStrictTypedCallRector::class,
         ReturnTypeFromStrictTypedPropertyRector::class,