TASK: Update rector (#3206)

sabbelasichon · Nov 7, 2022 · eb63cff · eb63cff
1 parent 0fddd80
commit eb63cff
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 12 deletions.
diff --git a/composer.json b/composer.json
@@ -28,7 +28,7 @@
         "nette/utils": "^3.0",
         "nikic/php-parser": "^4.14",
         "phpstan/phpstan": "^1.7.12",
-        "rector/rector": "^0.14",
+        "rector/rector": "0.14.7",
         "symfony/console": "^4.0 || ^5.0 || ^6.0",
         "symfony/polyfill-php80": "^1.26",
         "symfony/polyfill-php81": "^1.26",

diff --git a/src/Rector/v12/v0/typo3/ImplementSiteLanguageAwareInterfaceRector.php b/src/Rector/v12/v0/typo3/ImplementSiteLanguageAwareInterfaceRector.php
@@ -13,7 +13,6 @@
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\ClassReflection;
 use Rector\Core\Rector\AbstractScopeAwareRector;
-use Rector\NodeTypeResolver\Node\AttributeKey;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
@@ -118,14 +117,7 @@ public function refactorWithScope(Node $node, Scope $scope): ?Node
             $classHasChanged = true;
         }
 
-        if ($classHasChanged) {
-            // invoke re-print
-            $node->setAttribute(AttributeKey::ORIGINAL_NODE, null);
-
-            return $node;
-        }
-
-        return null;
+        return $classHasChanged ? $node : null;
     }
 
     /**

diff --git a/...tor/Extensions/solr/v9/ApacheSolrDocumentToSolariumDocumentRector/Fixture/fixture.php.inc b/...tor/Extensions/solr/v9/ApacheSolrDocumentToSolariumDocumentRector/Fixture/fixture.php.inc
@@ -21,6 +21,7 @@ class MySolrIndexer
      */
     public function multiple(array $documents)
     {
+        /** @var Apache_Solr_Document $document */
         foreach ($documents as $document) {
             $document->setMultiValue('key', 'foo', true);
         }
@@ -52,6 +53,7 @@ class MySolrIndexer
      */
     public function multiple(array $documents)
     {
+        /** @var Apache_Solr_Document $document */
         foreach ($documents as $document) {
             $document->addField('key', 'foo', true);
         }

diff --git a/.../v12/v0/typo3/ImplementSiteLanguageAwareInterfaceRector/Fixture/remove_trait_only.php.inc b/.../v12/v0/typo3/ImplementSiteLanguageAwareInterfaceRector/Fixture/remove_trait_only.php.inc
@@ -9,9 +9,7 @@ use TYPO3\CMS\Core\Site\SiteLanguageAwareTrait;
 class MyClass implements SiteLanguageAwareInterface
 {
     use SiteLanguageAwareTrait;
-
     protected SiteLanguage $siteLanguage;
-
     public function setSiteLanguage(SiteLanguage $siteLanguage)
     {
         $this->siteLanguage = $siteLanguage;