Moved static elements behind class constants

Author: shudd3r

src/FixerFactory.php

@@ -87,8 +87,10 @@ public static function createFor(string $launchFile): Config
         self::$rules['ordered_class_elements']['order'] = [
             'use_trait', 'case',
             'constant_public', 'constant_protected', 'constant_private',
+            'property_public_static', 'property_protected_static', 'property_private_static',
+            'method_public_static', 'method_protected_static', 'method_private_static',
             'property_public', 'property_protected', 'property_private',
-            'construct', 'destruct', 'magic', 'phpunit',
+            'construct', 'phpunit', 'magic', 'destruct',
             'method_public', 'method_protected', 'method_private'
         ];
 

tests/Fixtures/FixerTestRunner.php

@@ -23,16 +23,6 @@
 
 class FixerTestRunner
 {
-    private array $fixers;
-
-    /**
-     * @param FixerInterface[] $fixers
-     */
-    public function __construct(array $fixers)
-    {
-        $this->fixers = $fixers;
-    }
-
     public static function withConfig(ConfigInterface $config): self
     {
         $fixerFactory = new FixerFactory();
@@ -47,6 +37,16 @@ public static function withConfig(ConfigInterface $config): self
         return new self($fixers);
     }
 
+    private array $fixers;
+
+    /**
+     * @param FixerInterface[] $fixers
+     */
+    public function __construct(array $fixers)
+    {
+        $this->fixers = $fixers;
+    }
+
     /**
      * @see Runner::fixFile()
      *

tests/Fixtures/code-samples/Fixer/expected-ClassOrder.php

@@ -21,44 +21,44 @@ class ClassOrder
 
     public static $publicStatic;
 
-    public ?string $publicValue = null;
-
     protected static $staticValue;
 
-    private $value;
-
-    public function __construct()
+    public static function instance(): self
     {
+        return new self();
     }
 
-    public function setUpBeforeClass(): void
+    public static function doPublicStatic(): void
     {
     }
 
-    private function setUp()
+    protected static function doProtectedStatic(): int
     {
+        return 1;
     }
 
-    public static function instance(): self
+    public ?string $publicValue = null;
+
+    private $value;
+
+    public function __construct()
     {
-        return new self();
     }
 
-    public static function doPublicStatic(): void
+    public function setUpBeforeClass(): void
     {
     }
 
-    public function doPublic(): void
+    private function setUp()
     {
     }
 
-    protected function doProtected()
+    public function doPublic(): void
     {
     }
 
-    protected static function doProtectedStatic(): int
+    protected function doProtected()
     {
-        return 1;
     }
 
     private function doPrivate()

tests/Fixtures/code-samples/Fixer/expected-ExampleClass.php

@@ -25,6 +25,24 @@ abstract class ExampleClass implements SomeInterface
 {
     public const CONSTANT = 'string';
 
+    /**
+     * Creates from array.
+     *
+     * @param array $arr
+     *
+     * @return MyClass
+     */
+    public static function fromArray(array $arr): self
+    {
+        return new self(implode('.', $arr));
+    }
+
+    // Non-constructor method - no return type
+    public static function withHelloString()
+    {
+        return new self('Hello World!');
+    }
+
     public array $field = [
         'key'   => 1,
         'other' => 'value'
@@ -44,24 +62,6 @@ public function __construct(string $variable = '')
 
     abstract public function somethingAbstract();
 
-    /**
-     * Creates from array.
-     *
-     * @param array $arr
-     *
-     * @return MyClass
-     */
-    public static function fromArray(array $arr): self
-    {
-        return new self(implode('.', $arr));
-    }
-
-    // Non-constructor method - no return type
-    public static function withHelloString()
-    {
-        return new self('Hello World!');
-    }
-
     public function getVariable()
     {
         return empty($this->variable)

tests/Fixtures/code-samples/Fixer/expected-MethodChainsClass.php

@@ -20,6 +20,11 @@ class MethodChainsClass implements ArrayAccess
 {
     public const TEST = 1;
 
+    public static function withSomething(Name $variable)
+    {
+        return new self('string', $variable);
+    }
+
     protected $inheritedValues = [
         'key'       => 'value',
         'longerKey' => 'another value'
@@ -36,11 +41,6 @@ public function __construct(string $something, Name $variable)
         $this->variable  = $variable;
     }
 
-    public static function withSomething(Name $variable)
-    {
-        return new self('string', $variable);
-    }
-
     public function offsetExists($offset)
     {
         return array_key_exists($offset, $this->anotherVariable);

tests/Fixtures/code-samples/Fixer/expected-align.php

@@ -38,10 +38,10 @@ class Some
 {
     public const VAR      = '20';
     public const VARIABLE = 'foo bar baz';
-    public $var = 10;
 
     public static $stat;
     public static $fooBar;
+    public $var = 10;
     protected $some = 23;
     protected $x    = true;
     private $test = 22;