Skip to content

Commit

Permalink
Prep for PHP 8
Browse files Browse the repository at this point in the history
  • Loading branch information
MGatner committed Nov 27, 2020
1 parent b8c2faa commit ed5939c
Show file tree
Hide file tree
Showing 14 changed files with 19 additions and 22 deletions.
1 change: 1 addition & 0 deletions phpstan.neon.dist
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
10 changes: 5 additions & 5 deletions system/CodeIgniter.php
Original file line number Diff line number Diff line change
Expand Up @@ -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');

Expand Down Expand Up @@ -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);
}
}

//--------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion system/Database/Database.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class Database
* @return mixed
* @internal param bool $useBuilder
*/
public function load(array $params = [], string $alias)
public function load(array $params, string $alias)
{
// Handle universal DSN connection string
if (! empty($params['DSN']) && strpos($params['DSN'], '://') !== false)
Expand Down
2 changes: 1 addition & 1 deletion system/Database/MySQLi/Connection.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion system/HTTP/IncomingRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ class IncomingRequest extends Request
* @param string|null $body
* @param UserAgent $userAgent
*/
public function __construct($config, URI $uri = null, $body = 'php://input', UserAgent $userAgent)
public function __construct($config, URI $uri = null, $body = 'php://input', UserAgent $userAgent = null)
{
// Get our body from php://input
if ($body === 'php://input')
Expand Down
2 changes: 1 addition & 1 deletion system/Images/Handlers/BaseHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -662,7 +662,7 @@ public function fit(int $width, int $height = null, string $position = 'center')
*
* @return array
*/
protected function calcAspectRatio($width, $height = null, $origWidth, $origHeight): array
protected function calcAspectRatio($width, $height, $origWidth, $origHeight): array
{
// If $height is null, then we have it easy.
// Calc based on full image size and be done.
Expand Down
2 changes: 1 addition & 1 deletion system/Log/Handlers/ChromeLoggerHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion system/Log/Logger.php
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@ public function determineFile(): array
];

// Generate Backtrace info
$trace = \debug_backtrace(false);
$trace = \debug_backtrace(0);

// So we search from the bottom (earliest) of the stack frames
$stackFrames = \array_reverse($trace);
Expand Down
2 changes: 1 addition & 1 deletion system/Router/RouteCollection.php
Original file line number Diff line number Diff line change
Expand Up @@ -988,7 +988,7 @@ public function presenter(string $name, array $options = null): RouteCollectionI
*
* @return RouteCollectionInterface
*/
public function match(array $verbs = [], string $from, $to, array $options = null): RouteCollectionInterface
public function match(array $verbs = [], string $from = '', $to = '', array $options = null): RouteCollectionInterface
{
foreach ($verbs as $verb)
{
Expand Down
2 changes: 1 addition & 1 deletion system/Test/ReflectionHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
4 changes: 2 additions & 2 deletions system/Validation/Rules.php
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ public function required($str = null): bool
*
* @return boolean
*/
public function required_with($str = null, string $fields, array $data): bool
public function required_with($str, string $fields, array $data): bool
{
$fields = explode(',', $fields);

Expand Down Expand Up @@ -409,7 +409,7 @@ public function required_with($str = null, string $fields, array $data): bool
*
* @return boolean
*/
public function required_without($str = null, string $fields, array $data): bool
public function required_without($str, string $fields, array $data): bool
{
$fields = explode(',', $fields);

Expand Down
2 changes: 1 addition & 1 deletion system/Validation/Validation.php
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ public function check($value, string $rule, array $errors = []): bool
*
* @return boolean
*/
protected function processRules(string $field, string $label = null, $value, $rules = null, array $data): bool
protected function processRules(string $field, string $label = null, $value, $rules, array $data): bool
{
// If the if_exist rule is defined...
if (in_array('if_exist', $rules, true))
Expand Down
4 changes: 0 additions & 4 deletions tests/system/Cache/Handlers/FileHandlerTest.php
Original file line number Diff line number Diff line change
@@ -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
{

Expand Down
4 changes: 2 additions & 2 deletions tests/system/Helpers/URLHelperTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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/');
Expand Down Expand Up @@ -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/');
Expand Down

0 comments on commit ed5939c

Please sign in to comment.