[Strict] Skip from docblock @return on DisallowedEmptyRuleFixerRector (…

…#4608)

* [Strict] Skip from docblock @return on DisallowedEmptyRuleFixerRector

* [ci-review] Rector Rectify

* Fixed 🎉

* fix

* remove ArrayDimFetch feature

* [ci-review] Rector Rectify

* Revert "[ci-review] Rector Rectify"

This reverts commit cf4f602.

* Revert "remove ArrayDimFetch feature"

This reverts commit d4a8040.

* negated test

* from return

---------

Co-authored-by: GitHub Action <actions@github.com>

rules-tests/Strict/Rector/Empty_/DisallowedEmptyRuleFixerRector/Fixture/from_return_method.php.inc

@@ -0,0 +1,47 @@
+<?php
+
+namespace Rector\Tests\Strict\Rector\Empty_\DisallowedEmptyRuleFixerRector\Fixture;
+
+final class FromReturnCall
+{
+    public function run()
+    {
+        return empty($this->getProperty());
+    }
+
+    public function run2()
+    {
+        return ! empty($this->getProperty());
+    }
+
+    public function getProperty(): string
+    {
+        return '';
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\Strict\Rector\Empty_\DisallowedEmptyRuleFixerRector\Fixture;
+
+final class FromReturnCall
+{
+    public function run()
+    {
+        return $this->getProperty() === '';
+    }
+
+    public function run2()
+    {
+        return $this->getProperty() !== '';
+    }
+
+    public function getProperty(): string
+    {
+        return '';
+    }
+}
+
+?>

rules-tests/Strict/Rector/Empty_/DisallowedEmptyRuleFixerRector/Fixture/skip_from_docblock_return.php.inc

@@ -0,0 +1,23 @@
+<?php
+
+namespace Rector\Tests\Strict\Rector\Empty_\DisallowedEmptyRuleFixerRector\Fixture;
+
+final class SkipFromDocblockReturn
+{
+    public function run()
+    {
+        return empty($this->getProperty());
+    }
+
+    public function run2()
+    {
+        return ! empty($this->getProperty());
+    }
+
+    /**
+     * @return string
+     */
+    public function getProperty()
+    {
+    }
+}

rules/Strict/Rector/Empty_/DisallowedEmptyRuleFixerRector.php

@@ -104,7 +104,7 @@ private function refactorBooleanNot(BooleanNot $booleanNot, Scope $scope): Expr|
             return null;
         }
 
-        $emptyExprType = $scope->getType($empty->expr);
+        $emptyExprType = $scope->getNativeType($empty->expr);
 
         return $this->exactCompareFactory->createNotIdenticalFalsyCompare(
             $emptyExprType,
@@ -119,7 +119,7 @@ private function refactorEmpty(Empty_ $empty, Scope $scope, bool $treatAsNonEmpt
             return null;
         }
 
-        $exprType = $scope->getType($empty->expr);
+        $exprType = $scope->getNativeType($empty->expr);
         return $this->exactCompareFactory->createIdenticalFalsyCompare($exprType, $empty->expr, $treatAsNonEmpty);
     }
 

rules/TypeDeclaration/Rector/Class_/ReturnTypeFromStrictTernaryRector.php

@@ -97,7 +97,7 @@ public function refactorWithScope(Node $node, Scope $scope): ?Node
         $ternary = $return->expr;
 
         $returnScope = $return->expr->getAttribute(AttributeKey::SCOPE);
-        if ($returnScope === null) {
+        if (!$returnScope instanceof Scope) {
             return null;
         }