Merge pull request #4353 from samsonasik/fix-rector-service-req

[Rector] Fixes Rector services registration not found

Author: samsonasik

.github/workflows/test-phpunit.yml

@@ -110,7 +110,7 @@ jobs:
       - name: Install dependencies
         run: |
           composer update --ansi --no-interaction
-          composer remove --ansi --dev --unused rector/rector-prefixed phpstan/phpstan codeigniter4/codeigniter4-standard squizlabs/php_codesniffer
+          composer remove --ansi --dev --unused rector/rector phpstan/phpstan codeigniter4/codeigniter4-standard squizlabs/php_codesniffer
           php -r 'file_put_contents("vendor/laminas/laminas-zendframework-bridge/src/autoload.php", "");'
         env:
           COMPOSER_AUTH: ${{ secrets.COMPOSER_AUTH }}

composer.json

@@ -18,11 +18,10 @@
 		"codeigniter4/codeigniter4-standard": "^1.0",
 		"fakerphp/faker": "^1.9",
 		"mikey179/vfsstream": "^1.6",
-		"nette/utils": "^3.2",
-		"phpstan/phpstan": "0.12.78",
+		"phpstan/phpstan": "0.12.79",
 		"phpunit/phpunit": "^9.1",
 		"predis/predis": "^1.1",
-		"rector/rector-prefixed": "^0.9",
+		"rector/rector": "^0.9",
 		"squizlabs/php_codesniffer": "^3.3"
 	},
 	"suggest": {

rector.php

@@ -7,15 +7,15 @@
 use Rector\CodeQuality\Rector\If_\ShortenElseIfRector;
 use Rector\CodeQuality\Rector\If_\SimplifyIfReturnBoolRector;
 use Rector\CodeQuality\Rector\Return_\SimplifyUselessVariableRector;
+use Rector\CodingStyle\Rector\FuncCall\CountArrayToEmptyArrayComparisonRector;
 use Rector\Core\Configuration\Option;
 use Rector\Core\ValueObject\PhpVersion;
 use Rector\DeadCode\Rector\Switch_\RemoveDuplicatedCaseInSwitchRector;
 use Rector\EarlyReturn\Rector\Foreach_\ChangeNestedForeachIfsToEarlyContinueRector;
 use Rector\EarlyReturn\Rector\If_\ChangeIfElseValueAssignToEarlyReturnRector;
+use Rector\EarlyReturn\Rector\If_\RemoveAlwaysElseRector;
 use Rector\EarlyReturn\Rector\Return_\PreparedValueToEarlyReturnRector;
-use Rector\Performance\Rector\FuncCall\CountArrayToEmptyArrayComparisonRector;
 use Rector\Php73\Rector\FuncCall\ArrayKeyFirstLastRector;
-use Rector\SOLID\Rector\If_\RemoveAlwaysElseRector;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 use Utils\Rector\PassStrictParameterToFunctionParameterRector;
 use Utils\Rector\UnderscoreToCamelCaseVariableNameRector;

system/HTTP/IncomingRequest.php

@@ -353,16 +353,18 @@ public function getJsonVar(string $index, bool $assoc = false, $filter = null, $
 		helper('array');
 
 		$data = dot_array_search($index, $this->getJSON(true));
-		if (is_array($data) && ! $assoc)
-		{
-			return json_decode(json_encode($data));
-		}
-		elseif (! is_array($data))
+
+		if (! is_array($data))
 		{
 			$filter = $filter ?? FILTER_DEFAULT;
 			return filter_var($data, $filter, $flags);
 		}
 
+		if (! $assoc)
+		{
+			return json_decode(json_encode($data));
+		}
+
 		return $data;
 	}