[Rector] Apply Full PHP 7.3 Rector Set List

codeigniter4 · Apr 23, 2021 · dc8f30a · dc8f30a
1 parent 35fc1d0
commit dc8f30a
Show file tree

Hide file tree

Showing 21 changed files with 85 additions and 73 deletions.
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -45,6 +45,7 @@ parameters:
 		- '#Return type \(bool\) of method CodeIgniter\\Log\\Logger::(emergency|alert|critical|error|warning|notice|info|debug|log)\(\) should be compatible with return type \(null\) of method Psr\\Log\\LoggerInterface::(emergency|alert|critical|error|warning|notice|info|debug|log)\(\)#'
 		- '#Return type \(bool\) of method CodeIgniter\\HTTP\\Files\\UploadedFile::move\(\) should be compatible with return type \(CodeIgniter\\Files\\File\) of method CodeIgniter\\Files\\File::move\(\)#'
 		- '#Return type \(bool\) of method CodeIgniter\\Test\\TestLogger::log\(\) should be compatible with return type \(null\) of method Psr\\Log\\LoggerInterface::log\(\)#'
+		- '#Parameter \#2 \$assoc of function json_decode expects bool, null given#'
 	parallel:
 		processTimeout: 300.0
 	scanDirectories:

diff --git a/rector.php b/rector.php
@@ -21,7 +21,7 @@
 use Rector\EarlyReturn\Rector\If_\ChangeIfElseValueAssignToEarlyReturnRector;
 use Rector\EarlyReturn\Rector\If_\RemoveAlwaysElseRector;
 use Rector\EarlyReturn\Rector\Return_\PreparedValueToEarlyReturnRector;
-use Rector\Php73\Rector\FuncCall\ArrayKeyFirstLastRector;
+use Rector\Set\ValueObject\SetList;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 use Utils\Rector\PassStrictParameterToFunctionParameterRector;
 use Utils\Rector\UnderscoreToCamelCaseVariableNameRector;
@@ -37,6 +37,10 @@
 		__DIR__ . '/system/Test/bootstrap.php',
 	]);
 
+	$parameters->set(Option::SETS, [
+		SetList::PHP_73,
+	]);
+
 	// is there a file you need to skip?
 	$parameters->set(Option::SKIP, [
 		__DIR__ . '/app/Views',
@@ -61,7 +65,6 @@
 	$services->set(ForToForeachRector::class);
 	$services->set(ChangeNestedForeachIfsToEarlyContinueRector::class);
 	$services->set(ChangeIfElseValueAssignToEarlyReturnRector::class);
-	$services->set(ArrayKeyFirstLastRector::class);
 	$services->set(SimplifyStrposLowerRector::class);
 	$services->set(CombineIfRector::class);
 	$services->set(SimplifyIfReturnBoolRector::class);

diff --git a/system/API/ResponseTrait.php b/system/API/ResponseTrait.php
@@ -401,7 +401,7 @@ protected function format($data = null)
 		{
 			// Recursively convert objects into associative arrays
 			// Conversion not required for JSONFormatter
-			$data = json_decode(json_encode($data), true);
+			$data = json_decode(json_encode($data, JSON_THROW_ON_ERROR), true, 512, JSON_THROW_ON_ERROR);
 		}
 
 		return $this->formatter->format($data);

diff --git a/system/Autoloader/Autoloader.php b/system/Autoloader/Autoloader.php
@@ -259,7 +259,7 @@ protected function loadInNamespace(string $class)
 			{
 				$directory = rtrim($directory, '\\/');
 
-				if (strpos($class, $namespace) === 0)
+				if (strpos($class, (string) $namespace) === 0)
 				{
 					$filePath = $directory . str_replace('\\', DIRECTORY_SEPARATOR, substr($class, strlen($namespace))) . '.php';
 					$filename = $this->includeFile($filePath);

diff --git a/system/CLI/GeneratorTrait.php b/system/CLI/GeneratorTrait.php
@@ -231,7 +231,7 @@ protected function qualifyClassName(): string
 			$class = $matches[1] . ucfirst($matches[2]);
 		}
 
-		if ($this->enabledSuffixing && $this->getOption('suffix') && ! strripos($class, $component))
+		if ($this->enabledSuffixing && $this->getOption('suffix') && ! strripos($class, (string) $component))
 		{
 			$class .= ucfirst($component);
 		}

diff --git a/system/Database/Config.php b/system/Database/Config.php
@@ -56,7 +56,7 @@ public static function connect($group = null, bool $getShared = true)
 		if (is_array($group))
 		{
 			$config = $group;
-			$group  = 'custom-' . md5(json_encode($config));
+			$group  = 'custom-' . md5(json_encode($config, JSON_THROW_ON_ERROR));
 		}
 
 		$config = $config ?? config('Database');

diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
@@ -165,7 +165,7 @@ public function run(float $startTime, float $totalTime, RequestInterface $reques
 			$response->CSP->addImageSrc('data:');
 		}
 
-		return json_encode($data);
+		return json_encode($data, JSON_THROW_ON_ERROR);
 	}
 
 	//--------------------------------------------------------------------
@@ -431,7 +431,7 @@ public function respond()
 	 */
 	protected function format(string $data, string $format = 'html'): string
 	{
-		$data = json_decode($data, true);
+		$data = json_decode($data, true, 512, JSON_THROW_ON_ERROR);
 
 		if ($this->config->maxHistory !== 0)
 		{

diff --git a/system/Email/Email.php b/system/Email/Email.php
@@ -940,7 +940,7 @@ protected function getEncoding()
 
 		foreach ($this->baseCharsets as $charset)
 		{
-			if (strpos($this->charset, $charset) === 0)
+			if (strpos($this->charset, (string) $charset) === 0)
 			{
 				$this->encoding = '7bit';
 

diff --git a/system/HTTP/CURLRequest.php b/system/HTTP/CURLRequest.php
@@ -734,7 +734,7 @@ protected function setCURLOptions(array $curlOptions = [], array $config = [])
 		if (isset($config['json']))
 		{
 			// Will be set as the body in `applyBody()`
-			$json = json_encode($config['json']);
+			$json = json_encode($config['json'], JSON_THROW_ON_ERROR);
 			$this->setBody($json);
 			$this->setHeader('Content-Type', 'application/json');
 			$this->setHeader('Content-Length', (string) strlen($json));

diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php
@@ -362,7 +362,7 @@ public function getJsonVar(string $index, bool $assoc = false, ?int $filter = nu
 
 		if (! $assoc)
 		{
-			return json_decode(json_encode($data));
+			return json_decode(json_encode($data, JSON_THROW_ON_ERROR), null, 512, JSON_THROW_ON_ERROR);
 		}
 
 		return $data;
@@ -727,14 +727,14 @@ protected function parseRequestURI(): string
 		if (isset($_SERVER['SCRIPT_NAME'][0]) && pathinfo($_SERVER['SCRIPT_NAME'], PATHINFO_EXTENSION) === 'php')
 		{
 			// strip the script name from the beginning of the URI
-			if (strpos($uri, $_SERVER['SCRIPT_NAME']) === 0 && strpos($uri, '/index.php') === 0)
+			if (strpos($uri, (string) $_SERVER['SCRIPT_NAME']) === 0 && strpos($uri, '/index.php') === 0)
 			{
 				$uri = (string) substr($uri, strlen($_SERVER['SCRIPT_NAME']));
 			}
 			// if the script is nested, strip the parent folder & script from the URI
-			elseif (strpos($uri, $_SERVER['SCRIPT_NAME']) > 0)
+			elseif (strpos($uri, (string) $_SERVER['SCRIPT_NAME']) > 0)
 			{
-				$uri = (string) substr($uri, strpos($uri, $_SERVER['SCRIPT_NAME']) + strlen($_SERVER['SCRIPT_NAME']));
+				$uri = (string) substr($uri, strpos($uri, (string) $_SERVER['SCRIPT_NAME']) + strlen($_SERVER['SCRIPT_NAME']));
 			}
 			// or if index.php is implied
 			elseif (strpos($uri, dirname($_SERVER['SCRIPT_NAME'])) === 0)

diff --git a/system/HTTP/RequestTrait.php b/system/HTTP/RequestTrait.php
@@ -115,7 +115,7 @@ public function getIPAddress(): string
 					}
 
 					// If the proxy entry doesn't match the IP protocol - skip it
-					if (strpos($proxyIP, $separator) === false)
+					if (strpos($proxyIP, (string) $separator) === false)
 					{
 						continue;
 					}

diff --git a/system/Log/Handlers/ChromeLoggerHandler.php b/system/Log/Handlers/ChromeLoggerHandler.php
@@ -177,7 +177,7 @@ public function sendLogs(ResponseInterface &$response = null)
 			$response = Services::response(null, true);
 		}
 
-		$data = base64_encode(utf8_encode(json_encode($this->json)));
+		$data = base64_encode(utf8_encode(json_encode($this->json, JSON_THROW_ON_ERROR)));
 
 		$response->setHeader($this->header, $data);
 	}

diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
@@ -1342,7 +1342,7 @@ protected function fillRouteParams(string $from, array $params = null): string
 
 			// Ensure that the param we're inserting matches
 			// the expected param type.
-			$pos  = strpos($from, $pattern);
+			$pos  = strpos($from, (string) $pattern);
 			$from = substr_replace($from, $params[$index], $pos, strlen($pattern));
 		}
 

diff --git a/system/Security/Security.php b/system/Security/Security.php
@@ -254,7 +254,7 @@ public function verify(RequestInterface $request)
 		{
 			// We kill this since we're done and we don't want to pollute the JSON data.
 			unset($json->{$this->tokenName});
-			$request->setBody(json_encode($json));
+			$request->setBody(json_encode($json, JSON_THROW_ON_ERROR));
 		}
 
 		if ($this->regenerate)

diff --git a/system/Test/TestResponse.php b/system/Test/TestResponse.php
@@ -406,7 +406,7 @@ public function getJSON()
 	 */
 	public function assertJSONFragment(array $fragment, bool $strict = false)
 	{
-		$json    = json_decode($this->getJSON(), true);
+		$json    = json_decode($this->getJSON(), true, 512, JSON_THROW_ON_ERROR);
 		$patched = array_replace_recursive($json, $fragment);
 
 		if ($strict)

diff --git a/tests/system/EntityTest.php b/tests/system/EntityTest.php
@@ -543,7 +543,7 @@ public function testCastAsJsonByFill()
 
 		// Check if serialiazed
 		$check = $this->getPrivateProperty($entity, 'attributes')['eleventh'];
-		$this->assertEquals(json_encode([1, 2, 3]), $check);
+		$this->assertEquals(json_encode([1, 2, 3], JSON_THROW_ON_ERROR), $check);
 
 		// Check if unserialized
 		$this->assertEquals([1, 2, 3], $entity->eleventh);
@@ -563,7 +563,7 @@ public function testCastAsJsonByConstructor()
 
 		// Check if serialiazed
 		$check = $this->getPrivateProperty($entity, 'attributes')['eleventh'];
-		$this->assertEquals(json_encode([1, 2, 3]), $check);
+		$this->assertEquals(json_encode([1, 2, 3], JSON_THROW_ON_ERROR), $check);
 
 		// Check if unserialized
 		$this->assertEquals([1, 2, 3], $entity->eleventh);
@@ -947,7 +947,7 @@ public function testJsonSerializableEntity()
 	{
 		$entity = $this->getEntity();
 		$entity->setBar('foo');
-		$this->assertEquals(json_encode($entity->toArray()), json_encode($entity));
+		$this->assertEquals(json_encode($entity->toArray(), JSON_THROW_ON_ERROR), json_encode($entity, JSON_THROW_ON_ERROR));
 	}
 
 	protected function getEntity() : Entity

diff --git a/tests/system/HTTP/CURLRequestTest.php b/tests/system/HTTP/CURLRequestTest.php
@@ -923,7 +923,7 @@ public function testJSONData()
 
 		$this->assertEquals('post', $this->request->getMethod());
 
-		$expected = json_encode($params);
+		$expected = json_encode($params, JSON_THROW_ON_ERROR);
 		$this->assertEquals($expected, $this->request->getBody());
 	}
 
@@ -940,7 +940,7 @@ public function testSetJSON()
 		];
 		$this->request->setJSON($params)->post('/post');
 
-		$this->assertEquals(json_encode($params), $this->request->getBody());
+		$this->assertEquals(json_encode($params, JSON_THROW_ON_ERROR), $this->request->getBody());
 		$this->assertEquals('application/json', $this->request->getHeaderLine('Content-Type'));
 	}
 

diff --git a/tests/system/HTTP/IncomingRequestTest.php b/tests/system/HTTP/IncomingRequestTest.php
@@ -308,7 +308,7 @@ public function testCanGetAVariableFromJson()
 				'fizz' => 'buzz',
 			],
 		];
-		$json    = json_encode($jsonObj);
+		$json    = json_encode($jsonObj, JSON_THROW_ON_ERROR);
 
 		$config          = new App();
 		$config->baseURL = 'http://example.com/';
@@ -330,7 +330,7 @@ public function testGetJsonVarAsArray()
 				'foo'  => 'bar',
 			],
 		];
-		$json    = json_encode($jsonObj);
+		$json    = json_encode($jsonObj, JSON_THROW_ON_ERROR);
 
 		$config          = new App();
 		$config->baseURL = 'http://example.com/';
@@ -345,7 +345,7 @@ public function testGetJsonVarAsArray()
 
 	public function testGetJsonVarCanFilter()
 	{
-		$json = json_encode(['foo' => 'bar']);
+		$json = json_encode(['foo' => 'bar'], JSON_THROW_ON_ERROR);
 
 		$config          = new App();
 		$config->baseURL = 'http://example.com/';
@@ -361,7 +361,7 @@ public function testGetVarWorksWithJson()
 			'foo'  => 'bar',
 			'fizz' => 'buzz',
 		];
-		$json    = json_encode($jsonObj);
+		$json    = json_encode($jsonObj, JSON_THROW_ON_ERROR);
 
 		$config          = new App();
 		$config->baseURL = 'http://example.com/';

diff --git a/tests/system/Test/ControllerTestTraitTest.php b/tests/system/Test/ControllerTestTraitTest.php
@@ -205,7 +205,7 @@ public function testResponseOverriding()
 				->controller(Popcorn::class)
 				->execute('index3');
 
-		$response = json_decode($result->response()->getBody());
+		$response = json_decode($result->response()->getBody(), null, 512, JSON_THROW_ON_ERROR);
 		$this->assertEquals('en', $response->lang);
 	}
 

diff --git a/tests/system/Test/FeatureTestTraitTest.php b/tests/system/Test/FeatureTestTraitTest.php
@@ -353,7 +353,7 @@ public function testSetupRequestBodyWithParams()
 
 		$request = $this->withBodyFormat('json')->setRequestBody($request, ['foo1' => 'bar1']);
 
-		$this->assertJsonStringEqualsJsonString(json_encode(['foo1' => 'bar1']), $request->getBody());
+		$this->assertJsonStringEqualsJsonString(json_encode(['foo1' => 'bar1'], JSON_THROW_ON_ERROR), $request->getBody());
 		$this->assertTrue('application/json' === $request->header('Content-Type')->getValue());
 	}