Merge branch 'main' into feature/throw_if_helper

driftingly · Dec 6, 2023 · b7747d7 · b7747d7
2 parents 5c1f994 + 7a7dd9e
commit b7747d7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -5,7 +5,7 @@
     "description": "Rector upgrades rules for Laravel Framework",
     "require": {
         "php": ">=8.1",
-        "rector/rector": "^0.18.0"
+        "rector/rector": "^0.18.5"
     },
     "require-dev": {
         "phpunit/phpunit": "^10.0",
@@ -18,8 +18,7 @@
         "phpstan/extension-installer": "^1.1",
         "phpstan/phpstan-webmozart-assert": "^1.1",
         "phpstan/phpstan-strict-rules": "^1.2",
-        "symplify/vendor-patches": "^11.0",
-        "rector/rector-debugging": "dev-main"
+        "symplify/vendor-patches": "^11.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/Rector/ClassMethod/AddGenericReturnTypeToRelationsRector.php b/src/Rector/ClassMethod/AddGenericReturnTypeToRelationsRector.php
@@ -23,6 +23,7 @@
 use Rector\Core\PhpParser\Node\BetterNodeFinder;
 use Rector\Core\Rector\AbstractScopeAwareRector;
 use Rector\NodeTypeResolver\TypeComparator\TypeComparator;
+use Rector\StaticTypeMapper\StaticTypeMapper;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
@@ -45,6 +46,7 @@ public function __construct(
         private readonly DocBlockUpdater $docBlockUpdater,
         private readonly PhpDocInfoFactory $phpDocInfoFactory,
         private readonly BetterNodeFinder $betterNodeFinder,
+        private readonly StaticTypeMapper $staticTypeMapper,
     ) {
     }