Upgrade coding standard

Author: natanfelles

composer.json

@@ -42,7 +42,7 @@
     },
     "require-dev": {
         "ext-xdebug": "*",
-        "aplus/coding-standard": "^2.0",
+        "aplus/coding-standard": "^2.8",
         "ergebnis/composer-normalize": "^2.25",
         "jetbrains/phpstorm-attributes": "^1.0",
         "phpmd/phpmd": "^2.13",

src/SaveHandler.php

@@ -41,7 +41,7 @@ abstract class SaveHandler implements \SessionHandlerInterface, \SessionUpdateTi
      *
      * @var false|string
      */
-    protected string | false $lockId = false;
+    protected false | string $lockId = false;
     /**
      * Tells if the session exists (if was read).
      *
@@ -70,7 +70,7 @@ abstract class SaveHandler implements \SessionHandlerInterface, \SessionUpdateTi
     public function __construct(
         #[SensitiveParameter]
         array $config = [],
-        Logger $logger = null
+        ?Logger $logger = null
     ) {
         $this->prepareConfig($config);
         $this->logger = $logger;
@@ -298,7 +298,7 @@ abstract public function destroy($id) : bool;
      * @return false|int Returns the number of deleted session data for success,
      * false for failure
      */
-    abstract public function gc($max_lifetime) : int | false;
+    abstract public function gc($max_lifetime) : false | int;
 
     /**
      * Acquire a lock for a session id.

src/SaveHandlers/DatabaseHandler.php

@@ -299,7 +299,7 @@ public function destroy($id) : bool
         return true;
     }
 
-    public function gc($max_lifetime) : int | false
+    public function gc($max_lifetime) : false | int
     {
         try {
             $this->database ??= new Database($this->config);

src/SaveHandlers/FilesHandler.php

@@ -187,7 +187,7 @@ public function destroy($id) : bool
         return !\is_file($filename) || \unlink($filename);
     }
 
-    public function gc($max_lifetime) : int | false
+    public function gc($max_lifetime) : false | int
     {
         $dirHandle = \opendir($this->config['directory']);
         if ($dirHandle === false) {

src/SaveHandlers/MemcachedHandler.php

@@ -246,7 +246,7 @@ public function destroy($id) : bool
             && $this->memcached->getResultCode() !== Memcached::RES_NOTFOUND);
     }
 
-    public function gc($max_lifetime) : int | false
+    public function gc($max_lifetime) : false | int
     {
         return 0;
     }

src/SaveHandlers/RedisHandler.php

@@ -223,7 +223,7 @@ public function destroy($id) : bool
         return true;
     }
 
-    public function gc($max_lifetime) : int | false
+    public function gc($max_lifetime) : false | int
     {
         return 0;
     }

src/Session.php

@@ -34,7 +34,7 @@ class Session
      * @param array<string,int|string> $options
      * @param SaveHandler|null $handler
      */
-    public function __construct(array $options = [], SaveHandler $handler = null)
+    public function __construct(array $options = [], ?SaveHandler $handler = null)
     {
         $this->setOptions($options);
         if ($handler) {
@@ -553,7 +553,7 @@ public function removeTemp(string $key) : static
      * $newId is set, it is accepted but not validated. When session_start is
      * called, the id is only used if it is valid
      */
-    public function id(string $newId = null) : string | false
+    public function id(?string $newId = null) : false | string
     {
         if ($newId !== null && $this->isActive()) {
             throw new LogicException(
@@ -571,7 +571,7 @@ public function id(string $newId = null) : string | false
      * @return false|int Returns the number of deleted session data for success,
      * false for failure
      */
-    public function gc() : int | false
+    public function gc() : false | int
     {
         return @\session_gc();
     }

tests/Debug/SessionCollectorTest.php

@@ -39,7 +39,7 @@ protected function setUp() : void
      *
      * @return Session
      */
-    protected function makeSession(array $options = [], SaveHandler $handler = null) : Session
+    protected function makeSession(array $options = [], ?SaveHandler $handler = null) : Session
     {
         $session = new Session($options, $handler);
         $session->setDebugCollector($this->collector);
@@ -208,7 +208,7 @@ public function destroy($id) : bool
                 return true;
             }
 
-            public function gc($maxLifetime) : int | false
+            public function gc($maxLifetime) : false | int
             {
                 return 0;
             }

tests/SaveHandlers/DatabaseHandlerTest.php

@@ -148,7 +148,7 @@ public function unlock() : bool
     public function testFailToUnlock() : void
     {
         $handler = new class($this->config) extends DatabaseHandler {
-            public string | false $lockId;
+            public false | string $lockId;
 
             public function unlock() : bool
             {

tests/SaveHandlers/MemcachedHandlerTest.php

@@ -144,7 +144,7 @@ public function testFailToWrite() : void
     public function testUnlocked() : void
     {
         $handler = new class($this->config) extends MemcachedHandler {
-            public string | false $lockId;
+            public false | string $lockId;
 
             public function unlock() : bool
             {
@@ -160,7 +160,7 @@ public function testReplaceLock() : void
     {
         $handler = new class($this->config, $this->logger) extends MemcachedHandler {
             public ?Memcached $memcached;
-            public string | false $lockId;
+            public false | string $lockId;
 
             public function lock(string $id) : bool
             {
@@ -176,7 +176,7 @@ public function lock(string $id) : bool
     public function testFailToDestroy() : void
     {
         $handler = new class($this->config) extends MemcachedHandler {
-            public string | false $lockId;
+            public false | string $lockId;
         };
         $handler->lockId = false;
         self::assertFalse($handler->destroy('foo'));