Merge pull request #5265 from paulbalandan/ordered_class_elements

Enable `ordered_class_elements` rule

Author: paulbalandan

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

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

.php-cs-fixer.dist.php

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

tests/_support/Publishers/TestPublisher.php

@@ -15,14 +15,6 @@
 
 final class TestPublisher extends Publisher
 {
-    /**
-     * Fakes an error on the given file.
-     */
-    public static function setResult(bool $result)
-    {
-        self::$result = $result;
-    }
-
     /**
      * Return value for publish()
      *
@@ -44,6 +36,14 @@ public static function setResult(bool $result)
      */
     protected $destination = WRITEPATH;
 
+    /**
+     * Fakes an error on the given file.
+     */
+    public static function setResult(bool $result)
+    {
+        self::$result = $result;
+    }
+
     /**
      * Fakes a publish event so no files are actually copied.
      */

tests/system/Cache/Handlers/FileHandlerTest.php

@@ -20,6 +20,7 @@
 final class FileHandlerTest extends AbstractHandlerTest
 {
     private static $directory = 'FileHandler';
+    private $config;
 
     private static function getKeyArray()
     {
@@ -30,8 +31,6 @@ private static function getKeyArray()
         ];
     }
 
-    private $config;
-
     protected function setUp(): void
     {
         parent::setUp();

tests/system/Cache/Handlers/MemcachedHandlerTest.php

@@ -22,6 +22,8 @@
  */
 final class MemcachedHandlerTest extends AbstractHandlerTest
 {
+    private $config;
+
     private static function getKeyArray()
     {
         return [
@@ -31,8 +33,6 @@ private static function getKeyArray()
         ];
     }
 
-    private $config;
-
     protected function setUp(): void
     {
         parent::setUp();

tests/system/Cache/Handlers/PredisHandlerTest.php

@@ -21,6 +21,8 @@
  */
 final class PredisHandlerTest extends AbstractHandlerTest
 {
+    private $config;
+
     private static function getKeyArray()
     {
         return [
@@ -30,8 +32,6 @@ private static function getKeyArray()
         ];
     }
 
-    private $config;
-
     protected function setUp(): void
     {
         parent::setUp();

tests/system/Cache/Handlers/RedisHandlerTest.php

@@ -21,6 +21,8 @@
  */
 final class RedisHandlerTest extends AbstractHandlerTest
 {
+    private $config;
+
     private static function getKeyArray()
     {
         return [
@@ -30,8 +32,6 @@ private static function getKeyArray()
         ];
     }
 
-    private $config;
-
     protected function setUp(): void
     {
         parent::setUp();