refactor: upgrade to PHP 8.0 with rector

.github/workflows/test-coding-standards.yml

@@ -25,8 +25,8 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - '7.4'
           - '8.0'
+          - '8.1'
 
     steps:
       - name: Checkout

.github/workflows/test-phpunit.yml

@@ -50,7 +50,6 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - '7.4'
           - '8.0'
           - '8.1'
           - '8.2'
@@ -79,7 +78,6 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - '7.4'
           - '8.0'
           - '8.1'
           - '8.2'
@@ -92,7 +90,7 @@ jobs:
         mysql-version:
           - '5.7'
         include:
-          - php-version: '7.4'
+          - php-version: '8.0'
             db-platform: MySQLi
             mysql-version: '8.0'
           - php-version: '8.2'
@@ -120,7 +118,6 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - '7.4'
           - '8.0'
           - '8.1'
           - '8.2'
@@ -148,7 +145,6 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - '7.4'
           - '8.0'
           - '8.1'
           - '8.2'

.github/workflows/test-rector.yml

@@ -40,7 +40,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['7.4', '8.0']
+        php-versions: ['8.0', '8.1']
         paths:
           - app
           - system

README.md

@@ -86,7 +86,7 @@ Made with [contrib.rocks](https://contrib.rocks).
 
 ## Server Requirements
 
-PHP version 7.4 or higher is required, with the following extensions installed:
+PHP version 8.0 or higher is required, with the following extensions installed:
 
 - [intl](http://php.net/manual/en/intl.requirements.php)
 - [mbstring](http://php.net/manual/en/mbstring.installation.php)

admin/framework/README.md

@@ -42,7 +42,7 @@ Please read the [*Contributing to CodeIgniter*](https://github.com/codeigniter4/
 
 ## Server Requirements
 
-PHP version 7.4 or higher is required, with the following extensions installed:
+PHP version 8.0 or higher is required, with the following extensions installed:
 
 - [intl](http://php.net/manual/en/intl.requirements.php)
 - [mbstring](http://php.net/manual/en/mbstring.installation.php)

admin/framework/composer.json

@@ -5,7 +5,7 @@
     "homepage": "https://codeigniter.com",
     "license": "MIT",
     "require": {
-        "php": "^7.4 || ^8.0",
+        "php": "^8.0",
         "ext-intl": "*",
         "ext-json": "*",
         "ext-mbstring": "*",

admin/starter/.github/workflows/phpunit.yml

@@ -2,7 +2,7 @@ name: PHPUnit
 
 on:
   pull_request:
-    branches: 
+    branches:
       - develop
 
 jobs:
@@ -11,7 +11,7 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: ['7.4', '8.0']
+        php-versions: ['8.0', '8.1']
 
     runs-on: ubuntu-latest
 

admin/starter/README.md

@@ -50,7 +50,7 @@ Problems with it can be raised on our forum, or as issues in the main repository
 
 ## Server Requirements
 
-PHP version 7.4 or higher is required, with the following extensions installed:
+PHP version 8.0 or higher is required, with the following extensions installed:
 
 - [intl](http://php.net/manual/en/intl.requirements.php)
 - [mbstring](http://php.net/manual/en/mbstring.installation.php)

admin/starter/composer.json

@@ -5,7 +5,7 @@
     "homepage": "https://codeigniter.com",
     "license": "MIT",
     "require": {
-        "php": "^7.4 || ^8.0",
+        "php": "^8.0",
         "codeigniter4/framework": "^4.0"
     },
     "require-dev": {

admin/userguide/composer.json

@@ -5,7 +5,7 @@
     "homepage": "https://codeigniter.com",
     "license": "MIT",
     "require": {
-        "php": "^7.4 || ^8.0",
+        "php": "^8.0",
         "codeigniter4/framework": "^4"
     },
     "support": {

composer.json

@@ -5,7 +5,7 @@
     "homepage": "https://codeigniter.com",
     "license": "MIT",
     "require": {
-        "php": "^7.4 || ^8.0",
+        "php": "^8.0",
         "ext-intl": "*",
         "ext-json": "*",
         "ext-mbstring": "*",

contributing/pull_request.md

@@ -136,7 +136,7 @@ See [Contribution CSS](./css.md).
 
 ### Compatibility
 
-CodeIgniter4 requires [PHP 7.4](https://php.net/releases/7_4_0.php).
+CodeIgniter4 requires [PHP 8.0](https://php.net/releases/8_0_0.php).
 
 ### Backwards Compatibility
 

public/index.php

@@ -1,7 +1,7 @@
 <?php
 
 // Check PHP version.
-$minPhpVersion = '7.4'; // If you update this, don't forget to update `spark`.
+$minPhpVersion = '8.0'; // If you update this, don't forget to update `spark`.
 if (version_compare(PHP_VERSION, $minPhpVersion, '<')) {
     $message = sprintf(
         'Your PHP version must be %s or higher to run CodeIgniter. Current version: %s',

spark

@@ -27,7 +27,7 @@ if (strpos(PHP_SAPI, 'cgi') === 0) {
 }
 
 // Check PHP version.
-$minPhpVersion = '7.4'; // If you update this, don't forget to update `public/index.php`.
+$minPhpVersion = '8.0'; // If you update this, don't forget to update `public/index.php`.
 if (version_compare(PHP_VERSION, $minPhpVersion, '<')) {
     $message = sprintf(
         'Your PHP version must be %s or higher to run CodeIgniter. Current version: %s',

system/Autoloader/Autoloader.php

@@ -275,15 +275,15 @@ public function loadClass(string $class)
      */
     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);
 
@@ -344,11 +344,7 @@ public function sanitizeFilename(string $filename): string
             );
         }
         if ($result === false) {
-            if (version_compare(PHP_VERSION, '8.0.0', '>=')) {
-                $message = preg_last_error_msg();
-            } else {
-                $message = 'Regex error. error code: ' . preg_last_error();
-            }
+            $message = preg_last_error_msg();
 
             throw new RuntimeException($message . '. filename: "' . $filename . '"');
         }
@@ -404,7 +400,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;
                     }

system/Autoloader/FileLocator.php

@@ -44,12 +44,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);
         }
 
@@ -71,7 +71,7 @@ public function locateFile(string $file, ?string $folder = null, string $ext = '
         $namespaces = $this->autoloader->getNamespace();
 
         foreach (array_keys($namespaces) as $namespace) {
-            if (substr($file, 0, strlen($namespace)) === $namespace) {
+            if (str_starts_with($file, $namespace)) {
                 // There may be sub-namespaces of the same vendor,
                 // so overwrite them with namespaces found later.
                 $paths = $namespaces[$namespace];
@@ -94,7 +94,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, '/') . '/';
             }
 
@@ -177,7 +177,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;
@@ -201,7 +201,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;
             }
         }

system/BaseModel.php

@@ -581,7 +581,7 @@ public function find($id = null)
      */
     public function findColumn(string $columnName)
     {
-        if (strpos($columnName, ',') !== false) {
+        if (str_contains($columnName, ',')) {
             throw DataException::forFindColumnHaveMultipleColumns();
         }
 

system/CLI/CLI.php

@@ -579,7 +579,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);

system/CLI/Commands.php

@@ -171,7 +171,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;
             }
         }

system/CLI/GeneratorTrait.php

@@ -253,7 +253,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
         }
 

system/Cache/Handlers/PredisHandler.php

@@ -81,22 +81,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,
+        };
     }
 
     /**

system/Cache/Handlers/RedisHandler.php

@@ -107,22 +107,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,
+        };
     }
 
     /**

system/CodeIgniter.php

@@ -877,7 +877,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());
@@ -1069,7 +1069,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;
         }
 

system/Commands/Database/CreateDatabase.php

@@ -110,7 +110,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');

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;
         }
 

system/Commands/Generators/CellGenerator.php

@@ -90,7 +90,7 @@ public function run(array $params)
 
         $view = array_pop($segments);
         $view = str_replace('Cell', '', decamelize($view));
-        if (strpos($view, '_cell') === false) {
+        if (! str_contains($view, '_cell')) {
             $view .= '_cell';
         }
         $segments[] = $view;