Merge pull request #5668 from paulbalandan/latest-cs

Permit use of lates php-cs-fixer v3.6

Author: kenjis

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

@@ -30,17 +30,7 @@
         __DIR__ . '/admin/starter/builds',
     ]);
 
-$overrides = [
-    'ordered_class_elements' => [
-        'order' => [
-            'use_trait',
-            'constant',
-            'property',
-            'method',
-        ],
-        'sort_algorithm' => 'none',
-    ],
-];
+$overrides = [];
 
 $options = [
     'cacheFile'    => 'build/.no-header.php-cs-fixer.cache',

.php-cs-fixer.dist.php

@@ -34,17 +34,7 @@
         __DIR__ . '/spark',
     ]);
 
-$overrides = [
-    'ordered_class_elements' => [
-        'order' => [
-            'use_trait',
-            'constant',
-            'property',
-            'method',
-        ],
-        'sort_algorithm' => 'none',
-    ],
-];
+$overrides = [];
 
 $options = [
     'cacheFile'    => 'build/.php-cs-fixer.cache',

admin/framework/composer.json

@@ -17,7 +17,7 @@
     "require-dev": {
         "codeigniter/coding-standard": "^1.1",
         "fakerphp/faker": "^1.9",
-        "friendsofphp/php-cs-fixer": "^3.1",
+        "friendsofphp/php-cs-fixer": "^3.6",
         "mikey179/vfsstream": "^1.6",
         "nexusphp/cs-config": "^3.3",
         "phpunit/phpunit": "^9.1",

composer.json

@@ -17,7 +17,7 @@
     "require-dev": {
         "codeigniter/coding-standard": "^1.1",
         "fakerphp/faker": "^1.9",
-        "friendsofphp/php-cs-fixer": "3.4.*",
+        "friendsofphp/php-cs-fixer": "^3.6",
         "mikey179/vfsstream": "^1.6",
         "nexusphp/cs-config": "^3.3",
         "nexusphp/tachycardia": "^1.0",

spark

@@ -1,6 +1,15 @@
 #!/usr/bin/env php
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 /*
  * --------------------------------------------------------------------
  * CodeIgniter command-line tools

system/Test/Mock/MockSecurityConfig.php

@@ -11,7 +11,7 @@
 
 namespace CodeIgniter\Test\Mock;
 
-use Config\Security as Security;
+use Config\Security;
 
 /**
  * @deprecated

tests/system/Config/ServicesTest.php

@@ -43,7 +43,7 @@
 use CodeIgniter\View\Parser;
 use Config\App;
 use Config\Exceptions;
-use Tests\Support\Config\Services as Services;
+use Tests\Support\Config\Services;
 
 /**
  * @internal

tests/system/Cookie/CookieStoreTest.php

@@ -107,7 +107,7 @@ public function testCookieDispatching(): void
         $prod = $cookies['prod']->getOptions();
 
         /**
-         * @var MockObject&CookieStore $store
+         * @var CookieStore&MockObject $store
          */
         $store = $this->getMockBuilder(CookieStore::class)
             ->setConstructorArgs([$cookies])

tests/system/Helpers/SecurityHelperTest.php

@@ -14,7 +14,7 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockSecurity;
 use Config\App;
-use Tests\Support\Config\Services as Services;
+use Tests\Support\Config\Services;
 
 /**
  * @internal

tests/system/Log/Handlers/ErrorlogHandlerTest.php

@@ -35,7 +35,7 @@ public function testErrorLoggingWithErrorLog(): void
     }
 
     /**
-     * @return MockObject&ErrorlogHandler
+     * @return ErrorlogHandler&MockObject
      */
     private function getMockedHandler(array $config = [])
     {