Merge pull request #3931 from MGatner/prep-php8

Prep for PHP 8
codeigniter4 · Nov 28, 2020 · d5673f4 · d5673f4
2 parents b184bb5 + b5ef7a0
commit d5673f4
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 14 deletions.
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -24,6 +24,7 @@ parameters:
 		- system/Commands/Generators/Views/*
 		- system/Config/Routes.php
 		- system/Debug/Toolbar/Views/toolbar.tpl.php
+		- system/Images/Handlers/GDHandler.php
 		- system/ThirdParty/*
 		- system/Validation/Views/single.php
 	ignoreErrors:

diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
@@ -416,6 +416,11 @@ protected function handleRequest(RouteCollectionInterface $routes = null, Cache
 		{
 			$controller = $this->createController();
 
+			if (! method_exists($controller, '_remap') && ! is_callable([$controller, $this->method], false))
+			{
+				throw PageNotFoundException::forMethodNotFound($this->method);
+			}
+
 			// Is there a "post_controller_constructor" event?
 			Events::trigger('post_controller_constructor');
 
@@ -890,11 +895,6 @@ protected function startController()
 		{
 			throw PageNotFoundException::forControllerNotFound($this->controller, $this->method);
 		}
-		if (! method_exists($this->controller, '_remap') &&
-				! is_callable([$this->controller, $this->method], false))
-		{
-			throw PageNotFoundException::forMethodNotFound($this->method);
-		}
 	}
 
 	//--------------------------------------------------------------------

diff --git a/system/Database/MySQLi/Connection.php b/system/Database/MySQLi/Connection.php
@@ -134,7 +134,7 @@ public function connect(bool $persistent = false)
 					if ($this->encrypt['ssl_verify'])
 					{
 						defined('MYSQLI_OPT_SSL_VERIFY_SERVER_CERT') &&
-						$this->mysqli->options(MYSQLI_OPT_SSL_VERIFY_SERVER_CERT, true);
+						$this->mysqli->options(MYSQLI_OPT_SSL_VERIFY_SERVER_CERT, 1);
 					}
 					// Apparently (when it exists), setting MYSQLI_OPT_SSL_VERIFY_SERVER_CERT
 					// to FALSE didn't do anything, so PHP 5.6.16 introduced yet another

diff --git a/system/Log/Handlers/ChromeLoggerHandler.php b/system/Log/Handlers/ChromeLoggerHandler.php
@@ -111,7 +111,7 @@ public function handle($level, $message): bool
 		$message = $this->format($message);
 
 		// Generate Backtrace info
-		$backtrace = debug_backtrace(false, $this->backtraceLevel);
+		$backtrace = debug_backtrace(0, $this->backtraceLevel);
 		$backtrace = end($backtrace);
 
 		$backtraceMessage = 'unknown';

diff --git a/system/Test/ReflectionHelper.php b/system/Test/ReflectionHelper.php
@@ -97,6 +97,6 @@ public static function setPrivateProperty($obj, $property, $value)
 	public static function getPrivateProperty($obj, $property)
 	{
 		$refProperty = self::getAccessibleRefProperty($obj, $property);
-		return $refProperty->getValue($obj);
+		return is_string($obj) ? $refProperty->getValue() : $refProperty->getValue($obj);
 	}
 }
diff --git a/tests/system/Cache/Handlers/FileHandlerTest.php b/tests/system/Cache/Handlers/FileHandlerTest.php
@@ -1,10 +1,6 @@
 <?php
 namespace CodeIgniter\Cache\Handlers;
 
-set_error_handler(function (int $errno, string $errstr, string $errfile, int $errline, array $errcontext) {
-	//throw new \ErrorException($errstr, $errno, 0, $errfile, $errline);
-});
-
 class FileHandlerTest extends \CodeIgniter\Test\CIUnitTestCase
 {
 

diff --git a/tests/system/Helpers/URLHelperTest.php b/tests/system/Helpers/URLHelperTest.php
@@ -875,7 +875,7 @@ public function mailtoPatterns()
 	/**
 	 * @dataProvider mailtoPatterns
 	 */
-	public function testMailto($expected = '', $email, $title = '', $attributes = '')
+	public function testMailto($expected = '', $email = '', $title = '', $attributes = '')
 	{
 		$request      = Services::request($this->config);
 		$request->uri = new URI('http://example.com/');
@@ -912,7 +912,7 @@ public function safeMailtoPatterns()
 	/**
 	 * @dataProvider safeMailtoPatterns
 	 */
-	public function testSafeMailto($expected = '', $email, $title = '', $attributes = '')
+	public function testSafeMailto($expected = '', $email = '', $title = '', $attributes = '')
 	{
 		$request      = Services::request($this->config);
 		$request->uri = new URI('http://example.com/');