refactor: upgrade to PHP 8.0 by rector

codeigniter4 · Sep 23, 2023 · 770bc20 · 770bc20
1 parent bca38ca
commit 770bc20
Show file tree

Hide file tree

Showing 119 changed files with 432 additions and 653 deletions.
diff --git a/app/Views/errors/cli/error_exception.php b/app/Views/errors/cli/error_exception.php
@@ -4,7 +4,7 @@
 
 // The main Exception
 CLI::newLine();
-CLI::write('[' . get_class($exception) . ']', 'light_gray', 'red');
+CLI::write('[' . $exception::class . ']', 'light_gray', 'red');
 CLI::newLine();
 CLI::write($message);
 CLI::newLine();
@@ -41,20 +41,11 @@
  $function .= $padClass . $error['function'];
  }
 
- $args = implode(', ', array_map(static function ($value) {
- switch (true) {
- case is_object($value):
- return 'Object(' . get_class($value) . ')';
-
- case is_array($value):
- return count($value) ? '[...]' : '[]';
-
- case $value === null:
- return 'null'; // return the lowercased version
-
- default:
- return var_export($value, true);
- }
+ $args = implode(', ', array_map(static fn ($value) => match (true) {
+ is_object($value) => 'Object(' . $value::class . ')',
+ is_array($value) => count($value) ? '[...]' : '[]',
+ $value === null => 'null',
+ default => var_export($value, true),
  }, array_values($error['args'] ?? [])));
 
  $function .= '(' . $args . ')';

diff --git a/app/Views/errors/html/error_exception.php b/app/Views/errors/html/error_exception.php
@@ -90,7 +90,7 @@
  <?php
  $params = null;
  // Reflection by name is not available for closure function
- if (substr($row['function'], -1) !== '}') {
+ if (!str_ends_with($row['function'], '}')) {
  $mirror = isset($row['class']) ? new ReflectionMethod($row['class'], $row['function']) : new ReflectionFunction($row['function']);
  $params = $mirror->getParameters();
  }

diff --git a/system/Autoloader/Autoloader.php b/system/Autoloader/Autoloader.php
@@ -274,15 +274,15 @@ public function loadClass(string $class): void
  */
  protected function loadInNamespace(string $class)
  {
- if (strpos($class, '\\') === false) {
+ if (! str_contains($class, '\\')) {
  return false;
  }
 
  foreach ($this->prefixes as $namespace => $directories) {
  foreach ($directories as $directory) {
  $directory = rtrim($directory, '\\/');
 
- if (strpos($class, $namespace) === 0) {
+ if (str_starts_with($class, $namespace)) {
  $filePath = $directory . str_replace('\\', DIRECTORY_SEPARATOR, substr($class, strlen($namespace))) . '.php';
  $filename = $this->includeFile($filePath);
 
@@ -412,7 +412,7 @@ private function loadComposerNamespaces(ClassLoader $composer, array $composerPa
 
  foreach ($srcPaths as $path) {
  foreach ($installPaths as $installPath) {
- if ($installPath === substr($path, 0, strlen($installPath))) {
+ if (str_starts_with($path, $installPath)) {
  $add = true;
  break 2;
  }

diff --git a/system/Autoloader/FileLocator.php b/system/Autoloader/FileLocator.php
@@ -51,12 +51,12 @@ public function locateFile(string $file, ?string $folder = null, string $ext = '
  $file = $this->ensureExt($file, $ext);
 
  // Clears the folder name if it is at the beginning of the filename
- if (! empty($folder) && strpos($file, $folder) === 0) {
+ if (! empty($folder) && str_starts_with($file, $folder)) {
  $file = substr($file, strlen($folder . '/'));
  }
 
  // Is not namespaced? Try the application folder.
- if (strpos($file, '\\') === false) {
+ if (! str_contains($file, '\\')) {
  return $this->legacyLocate($file, $folder);
  }
 
@@ -101,7 +101,7 @@ public function locateFile(string $file, ?string $folder = null, string $ext = '
  // If we have a folder name, then the calling function
  // expects this file to be within that folder, like 'Views',
  // or 'libraries'.
- if (! empty($folder) && strpos($path . $filename, '/' . $folder . '/') === false) {
+ if (! empty($folder) && ! str_contains($path . $filename, '/' . $folder . '/')) {
  $path .= trim($folder, '/') . '/';
  }
 
@@ -184,7 +184,7 @@ public function search(string $path, string $ext = 'php', bool $prioritizeApp =
 
  if ($prioritizeApp) {
  $foundPaths[] = $fullPath;
- } elseif (strpos($fullPath, APPPATH) === 0) {
+ } elseif (str_starts_with($fullPath, APPPATH)) {
  $appPaths[] = $fullPath;
  } else {
  $foundPaths[] = $fullPath;
@@ -208,7 +208,7 @@ protected function ensureExt(string $path, string $ext): string
  if ($ext) {
  $ext = '.' . $ext;
 
- if (substr($path, -strlen($ext)) !== $ext) {
+ if (! str_ends_with($path, $ext)) {
  $path .= $ext;
  }
  }

diff --git a/system/BaseModel.php b/system/BaseModel.php
@@ -587,7 +587,7 @@ public function find($id = null)
  */
  public function findColumn(string $columnName)
  {
- if (strpos($columnName, ',') !== false) {
+ if (str_contains($columnName, ',')) {
  throw DataException::forFindColumnHaveMultipleColumns();
  }
 
@@ -1317,19 +1317,12 @@ protected function setDate(?int $userData = null)
  */
  protected function intToDate(int $value)
  {
- switch ($this->dateFormat) {
- case 'int':
- return $value;
-
- case 'datetime':
- return date('Y-m-d H:i:s', $value);
-
- case 'date':
- return date('Y-m-d', $value);
-
- default:
- throw ModelException::forNoDateFormat(static::class);
- }
+ return match ($this->dateFormat) {
+ 'int' => $value,
+ 'datetime' => date('Y-m-d H:i:s', $value),
+ 'date' => date('Y-m-d', $value),
+ default => throw ModelException::forNoDateFormat(static::class),
+ };
  }
 
  /**
@@ -1346,19 +1339,12 @@ protected function intToDate(int $value)
  */
  protected function timeToDate(Time $value)
  {
- switch ($this->dateFormat) {
- case 'datetime':
- return $value->format('Y-m-d H:i:s');
-
- case 'date':
- return $value->format('Y-m-d');
-
- case 'int':
- return $value->getTimestamp();
-
- default:
- return (string) $value;
- }
+ return match ($this->dateFormat) {
+ 'datetime' => $value->format('Y-m-d H:i:s'),
+ 'date' => $value->format('Y-m-d'),
+ 'int' => $value->getTimestamp(),
+ default => (string) $value,
+ };
  }
 
  /**

diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php
@@ -598,7 +598,7 @@ public static function color(string $text, string $foreground, ?string $backgrou
  $newText = '';
 
  // Detect if color method was already in use with this text
- if (strpos($text, "\033[0m") !== false) {
+ if (str_contains($text, "\033[0m")) {
  $pattern = '/\\033\\[0;.+?\\033\\[0m/u';
 
  preg_match_all($pattern, $text, $matches);

diff --git a/system/CLI/Commands.php b/system/CLI/Commands.php
@@ -173,7 +173,7 @@ protected function getCommandAlternatives(string $name, array $collection): arra
  foreach (array_keys($collection) as $commandName) {
  $lev = levenshtein($name, $commandName);
 
- if ($lev <= strlen($commandName) / 3 || strpos($commandName, $name) !== false) {
+ if ($lev <= strlen($commandName) / 3 || str_contains($commandName, $name)) {
  $alternatives[$commandName] = $lev;
  }
  }

diff --git a/system/CLI/GeneratorTrait.php b/system/CLI/GeneratorTrait.php
@@ -254,7 +254,7 @@ protected function qualifyClassName(): string
  // Gets the namespace from input. Don't forget the ending backslash!
  $namespace = trim(str_replace('/', '\\', $this->getOption('namespace') ?? APP_NAMESPACE), '\\') . '\\';
 
- if (strncmp($class, $namespace, strlen($namespace)) === 0) {
+ if (str_starts_with($class, $namespace)) {
  return $class; // @codeCoverageIgnore
  }
 

diff --git a/system/Cache/Handlers/PredisHandler.php b/system/Cache/Handlers/PredisHandler.php
@@ -86,22 +86,11 @@ public function get(string $key)
  return null;
  }
 
- switch ($data['__ci_type']) {
- case 'array':
- case 'object':
- return unserialize($data['__ci_value']);
-
- case 'boolean':
- case 'integer':
- case 'double': // Yes, 'double' is returned and NOT 'float'
- case 'string':
- case 'NULL':
- return settype($data['__ci_value'], $data['__ci_type']) ? $data['__ci_value'] : null;
-
- case 'resource':
- default:
- return null;
- }
+ return match ($data['__ci_type']) {
+ 'array', 'object' => unserialize($data['__ci_value']),
+ 'boolean', 'integer', 'double', 'string', 'NULL' => settype($data['__ci_value'], $data['__ci_type']) ? $data['__ci_value'] : null,
+ default => null,
+ };
  }
 
  /**

diff --git a/system/Cache/Handlers/RedisHandler.php b/system/Cache/Handlers/RedisHandler.php
@@ -112,22 +112,11 @@ public function get(string $key)
  return null;
  }
 
- switch ($data['__ci_type']) {
- case 'array':
- case 'object':
- return unserialize($data['__ci_value']);
-
- case 'boolean':
- case 'integer':
- case 'double': // Yes, 'double' is returned and NOT 'float'
- case 'string':
- case 'NULL':
- return settype($data['__ci_value'], $data['__ci_type']) ? $data['__ci_value'] : null;
-
- case 'resource':
- default:
- return null;
- }
+ return match ($data['__ci_type']) {
+ 'array', 'object' => unserialize($data['__ci_value']),
+ 'boolean', 'integer', 'double', 'string', 'NULL' => settype($data['__ci_value'], $data['__ci_type']) ? $data['__ci_value'] : null,
+ default => null,
+ };
  }
 
  /**

diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
@@ -868,7 +868,7 @@ protected function startController()
  $this->benchmark->start('controller_constructor');
 
  // Is it routed to a Closure?
- if (is_object($this->controller) && (get_class($this->controller) === 'Closure')) {
+ if (is_object($this->controller) && ($this->controller::class === 'Closure')) {
  $controller = $this->controller;
 
  return $controller(...$this->router->params());
@@ -1040,7 +1040,7 @@ public function storePreviousURL($uri)
  }
 
  // Ignore non-HTML responses
- if (strpos($this->response->getHeaderLine('Content-Type'), 'text/html') === false) {
+ if (! str_contains($this->response->getHeaderLine('Content-Type'), 'text/html')) {
  return;
  }
 

diff --git a/system/Commands/Database/CreateDatabase.php b/system/Commands/Database/CreateDatabase.php
@@ -107,7 +107,7 @@ public function run(array $params)
  $config->{$group}['database'] = $name;
 
  if ($name !== ':memory:') {
- $dbName = strpos($name, DIRECTORY_SEPARATOR) === false ? WRITEPATH . $name : $name;
+ $dbName = ! str_contains($name, DIRECTORY_SEPARATOR) ? WRITEPATH . $name : $name;
 
  if (is_file($dbName)) {
  CLI::error("Database \"{$dbName}\" already exists.", 'light_gray', 'red');

diff --git a/system/Commands/Encryption/GenerateKey.php b/system/Commands/Encryption/GenerateKey.php
@@ -166,7 +166,7 @@ protected function writeNewEncryptionKeyToFile(string $oldKey, string $newKey):
  $oldFileContents = (string) file_get_contents($envFile);
  $replacementKey = "\nencryption.key = {$newKey}";
 
- if (strpos($oldFileContents, 'encryption.key') === false) {
+ if (! str_contains($oldFileContents, 'encryption.key')) {
  return file_put_contents($envFile, $replacementKey, FILE_APPEND) !== false;
  }
 

diff --git a/system/Commands/Utilities/Publish.php b/system/Commands/Utilities/Publish.php
@@ -83,13 +83,13 @@ public function run(array $params)
  foreach ($publishers as $publisher) {
  if ($publisher->publish()) {
  CLI::write(lang('Publisher.publishSuccess', [
- get_class($publisher),
+ $publisher::class,
  count($publisher->getPublished()),
  $publisher->getDestination(),
  ]), 'green');
  } else {
  CLI::error(lang('Publisher.publishFailure', [
- get_class($publisher),
+ $publisher::class,
  $publisher->getDestination(),
  ]), 'light_gray', 'red');
 

diff --git a/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReader.php b/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReader.php
@@ -67,7 +67,7 @@ public function read(string $class, string $defaultController = 'Home', string $
  $methodName = $method->getName();
 
  foreach ($this->httpMethods as $httpVerb) {
- if (strpos($methodName, $httpVerb) === 0) {
+ if (str_starts_with($methodName, $httpVerb)) {
  // Remove HTTP verb prefix.
  $methodInUri = lcfirst(substr($methodName, strlen($httpVerb)));
 

diff --git a/system/Commands/Utilities/Routes/FilterFinder.php b/system/Commands/Utilities/Routes/FilterFinder.php
@@ -58,12 +58,12 @@ public function find(string $uri): array
  $this->filters->initialize($uri);
 
  return $this->filters->getFilters();
- } catch (RedirectException $e) {
+ } catch (RedirectException) {
  return [
  'before' => [],
  'after' => [],
  ];
- } catch (PageNotFoundException $e) {
+ } catch (PageNotFoundException) {
  return [
  'before' => ['<unknown>'],
  'after' => ['<unknown>'],