Merge remote-tracking branch 'upstream/develop' into 4.6

Author: kenjis

.php-cs-fixer.dist.php

@@ -28,8 +28,6 @@
         'ThirdParty',
         'Validation/Views',
     ])
-    ->notPath([
-    ])
     ->notName('#Foobar.php$#')
     ->append([
         __FILE__,
@@ -41,12 +39,7 @@
         __DIR__ . '/spark',
     ]);
 
-$overrides = [
-    // for updating to coding-standard
-    'modernize_strpos'    => true,
-    'ordered_attributes'  => ['order' => [], 'sort_algorithm' => 'alpha'],
-    'php_unit_attributes' => true,
-];
+$overrides = [];
 
 $options = [
     'cacheFile'    => 'build/.php-cs-fixer.cache',

.php-cs-fixer.no-header.php

@@ -11,12 +11,12 @@
  * the LICENSE file that was distributed with this source code.
  */
 
-use CodeIgniter\CodingStandard\CodeIgniter4;
-use Nexus\CsConfig\Factory;
-use Nexus\CsConfig\Fixer\Comment\NoCodeSeparatorCommentFixer;
-use Nexus\CsConfig\FixerGenerator;
+use PhpCsFixer\ConfigInterface;
 use PhpCsFixer\Finder;
 
+/** @var ConfigInterface $config */
+$config = require __DIR__ . '/.php-cs-fixer.dist.php';
+
 $finder = Finder::create()
     ->files()
     ->in([
@@ -30,19 +30,10 @@
     ]);
 
 $overrides = [
-    // for updating to coding-standard
-    'modernize_strpos'    => true,
-    'ordered_attributes'  => ['order' => [], 'sort_algorithm' => 'alpha'],
-    'php_unit_attributes' => true,
-];
-
-$options = [
-    'cacheFile'    => 'build/.php-cs-fixer.no-header.cache',
-    'finder'       => $finder,
-    'customFixers' => FixerGenerator::create('vendor/nexusphp/cs-config/src/Fixer', 'Nexus\\CsConfig\\Fixer'),
-    'customRules'  => [
-        NoCodeSeparatorCommentFixer::name() => true,
-    ],
+    'header_comment' => false,
 ];
 
-return Factory::create(new CodeIgniter4(), $overrides, $options)->forProjects();
+return $config
+    ->setFinder($finder)
+    ->setCacheFile('build/.php-cs-fixer.no-header.cache')
+    ->setRules(array_merge($config->getRules(), $overrides));

.php-cs-fixer.tests.php

@@ -11,47 +11,29 @@
  * the LICENSE file that was distributed with this source code.
  */
 
-use CodeIgniter\CodingStandard\CodeIgniter4;
-use Nexus\CsConfig\Factory;
-use Nexus\CsConfig\Fixer\Comment\NoCodeSeparatorCommentFixer;
-use Nexus\CsConfig\FixerGenerator;
+use PhpCsFixer\ConfigInterface;
 use PhpCsFixer\Finder;
 
+/** @var ConfigInterface $config */
+$config = require __DIR__ . '/.php-cs-fixer.dist.php';
+
 $finder = Finder::create()
     ->files()
     ->in([
         __DIR__ . '/tests',
     ])
-    ->exclude([
-    ])
     ->notPath([
         '_support/View/Cells/multiplier.php',
         '_support/View/Cells/colors.php',
         '_support/View/Cells/addition.php',
     ])
-    ->notName('#Foobar.php$#')
-    ->append([
-    ]);
+    ->notName('#Foobar.php$#');
 
 $overrides = [
     'void_return' => true,
-    // for updating to coding-standard
-    'modernize_strpos'    => true,
-    'ordered_attributes'  => ['order' => [], 'sort_algorithm' => 'alpha'],
-    'php_unit_attributes' => true,
-];
-
-$options = [
-    'cacheFile'    => 'build/.php-cs-fixer.tests.cache',
-    'finder'       => $finder,
-    'customFixers' => FixerGenerator::create('vendor/nexusphp/cs-config/src/Fixer', 'Nexus\\CsConfig\\Fixer'),
-    'customRules'  => [
-        NoCodeSeparatorCommentFixer::name() => true,
-    ],
 ];
 
-return Factory::create(new CodeIgniter4(), $overrides, $options)->forLibrary(
-    'CodeIgniter 4 framework',
-    'CodeIgniter Foundation',
-    'admin@codeigniter.com'
-);
+return $config
+    ->setFinder($finder)
+    ->setCacheFile('build/.php-cs-fixer.tests.cache')
+    ->setRules(array_merge($config->getRules(), $overrides));

.php-cs-fixer.user-guide.php

@@ -11,12 +11,12 @@
  * the LICENSE file that was distributed with this source code.
  */
 
-use CodeIgniter\CodingStandard\CodeIgniter4;
-use Nexus\CsConfig\Factory;
-use Nexus\CsConfig\Fixer\Comment\NoCodeSeparatorCommentFixer;
-use Nexus\CsConfig\FixerGenerator;
+use PhpCsFixer\ConfigInterface;
 use PhpCsFixer\Finder;
 
+/** @var ConfigInterface $config */
+$config = require __DIR__ . '/.php-cs-fixer.dist.php';
+
 $finder = Finder::create()
     ->files()
     ->in([
@@ -32,26 +32,17 @@
 
 $overrides = [
     'echo_tag_syntax'              => false,
+    'header_comment'               => false,
     'php_unit_internal_class'      => false,
     'no_unused_imports'            => false,
     'class_attributes_separation'  => false,
     'fully_qualified_strict_types' => [
         'import_symbols'                        => false,
         'leading_backslash_in_global_namespace' => true,
     ],
-    // for updating to coding-standard
-    'modernize_strpos'    => true,
-    'ordered_attributes'  => ['order' => [], 'sort_algorithm' => 'alpha'],
-    'php_unit_attributes' => true,
-];
-
-$options = [
-    'cacheFile'    => 'build/.php-cs-fixer.user-guide.cache',
-    'finder'       => $finder,
-    'customFixers' => FixerGenerator::create('vendor/nexusphp/cs-config/src/Fixer', 'Nexus\\CsConfig\\Fixer'),
-    'customRules'  => [
-        NoCodeSeparatorCommentFixer::name() => true,
-    ],
 ];
 
-return Factory::create(new CodeIgniter4(), $overrides, $options)->forProjects();
+return $config
+    ->setFinder($finder)
+    ->setCacheFile('build/.php-cs-fixer.user-guide.cache')
+    ->setRules(array_merge($config->getRules(), $overrides));

admin/css/debug-toolbar/toolbar.scss

@@ -95,6 +95,7 @@
     }
 
     h2 {
+        font-weight: bold;
         font-size: $base-size;
         margin: 0;
         padding: 5px 0 10px 0;
@@ -292,6 +293,8 @@
 
     // The tabs container
     .tab {
+        height: fit-content;
+        text-align: left;
         bottom: 35px;
         display: none;
         left: 0;
@@ -306,6 +309,8 @@
 
     // The "Timeline" tab
     .timeline {
+        position: static;
+        display: table;
         margin-left: 0;
         width: 100%;
 

composer.json

@@ -32,7 +32,7 @@
         "phpunit/phpcov": "^9.0.2",
         "phpunit/phpunit": "^10.5.16",
         "predis/predis": "^1.1 || ^2.0",
-        "rector/rector": "1.2.0",
+        "rector/rector": "1.2.1",
         "vimeo/psalm": "^5.0"
     },
     "replace": {

phpstan-baseline.php

@@ -7393,12 +7393,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Helpers/test_helper.php',
 ];
-$ignoreErrors[] = [
-	// identifier: empty.notAllowed
-	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Helpers/text_helper.php',
-];
 $ignoreErrors[] = [
 	// identifier: missingType.iterableValue
 	'message' => '#^Function strip_slashes\\(\\) has parameter \\$str with no value type specified in iterable type array\\.$#',

system/Config/BaseService.php

@@ -76,6 +76,7 @@
 use Config\Optimize;
 use Config\Pager as ConfigPager;
 use Config\Services as AppServices;
+use Config\Session as ConfigSession;
 use Config\Toolbar as ConfigToolbar;
 use Config\Validation as ConfigValidation;
 use Config\View as ConfigView;
@@ -130,7 +131,7 @@
  * @method static Router                     router(RouteCollectionInterface $routes = null, Request $request = null, $getShared = true)
  * @method static RouteCollection            routes($getShared = true)
  * @method static Security                   security(App $config = null, $getShared = true)
- * @method static Session                    session(App $config = null, $getShared = true)
+ * @method static Session                    session(ConfigSession $config = null, $getShared = true)
  * @method static SiteURIFactory             siteurifactory(App $config = null, Superglobals $superglobals = null, $getShared = true)
  * @method static Superglobals               superglobals(array $server = null, array $get = null, bool $getShared = true)
  * @method static Throttler                  throttler($getShared = true)

system/Config/Services.php

@@ -51,6 +51,7 @@
 use CodeIgniter\Router\RouteCollectionInterface;
 use CodeIgniter\Router\Router;
 use CodeIgniter\Security\Security;
+use CodeIgniter\Session\Handlers\BaseHandler as SessionBaseHandler;
 use CodeIgniter\Session\Handlers\Database\MySQLiHandler;
 use CodeIgniter\Session\Handlers\Database\PostgreHandler;
 use CodeIgniter\Session\Handlers\DatabaseHandler;
@@ -88,6 +89,7 @@
 use Config\Toolbar as ToolbarConfig;
 use Config\Validation as ValidationConfig;
 use Config\View as ViewConfig;
+use InvalidArgumentException;
 use Locale;
 
 /**
@@ -674,17 +676,24 @@ public static function session(?SessionConfig $config = null, bool $getShared =
 
         if ($driverName === DatabaseHandler::class) {
             $DBGroup = $config->DBGroup ?? config(Database::class)->defaultGroup;
-            $db      = Database::connect($DBGroup);
 
-            $driver = $db->getPlatform();
+            $driverPlatform = Database::connect($DBGroup)->getPlatform();
 
-            if ($driver === 'MySQLi') {
+            if ($driverPlatform === 'MySQLi') {
                 $driverName = MySQLiHandler::class;
-            } elseif ($driver === 'Postgre') {
+            } elseif ($driverPlatform === 'Postgre') {
                 $driverName = PostgreHandler::class;
             }
         }
 
+        if (! class_exists($driverName) || ! is_a($driverName, SessionBaseHandler::class, true)) {
+            throw new InvalidArgumentException(sprintf(
+                'Invalid session handler "%s" provided.',
+                $driverName
+            ));
+        }
+
+        /** @var SessionBaseHandler $driver */
         $driver = new $driverName($config, AppServices::get('request')->getIPAddress());
         $driver->setLogger($logger);
 

system/Debug/Toolbar/Views/toolbar.css

@@ -60,6 +60,7 @@
   margin-right: 5px;
 }
 #debug-bar h2 {
+  font-weight: bold;
   font-size: 16px;
   margin: 0;
   padding: 5px 0 10px 0;
@@ -213,6 +214,8 @@
   white-space: nowrap;
 }
 #debug-bar .tab {
+  height: fit-content;
+  text-align: left;
   bottom: 35px;
   display: none;
   left: 0;
@@ -225,6 +228,8 @@
   z-index: 9999;
 }
 #debug-bar .timeline {
+  position: static;
+  display: table;
   margin-left: 0;
   width: 100%;
 }