spiral / framework

src/Session/src/Session.php

Spacing +14 added lines, -14 removed lines

@@ -42,8 +42,8 @@ 
         private readonly string $clientSignature,
         private readonly int $lifetime,
         string $id = null
-    ) {
-        if (!empty($id) && $this->validID($id)) {
+    ){
+        if (!empty($id) && $this->validID($id)){
             $this->id = $id;
         }
     }
@@ -65,24 +65,24 @@ 
 
     public function resume(): void
     {
-        if ($this->isStarted()) {
+        if ($this->isStarted()){
             return;
         }
 
-        if (!empty($this->id)) {
+        if (!empty($this->id)){
             \session_id($this->id);
-        } else {
+        }else{
             // always new id
             \session_id(\session_create_id());
         }
 
-        try {
+        try{
             \session_start(['use_cookies' => false]);
-        } catch (\Throwable $e) {
-            throw new SessionException('Unable to start session', (int) $e->getCode(), $e);
+        }catch (\Throwable $e){
+            throw new SessionException('Unable to start session', (int)$e->getCode(), $e);
         }
 
-        if (empty($this->id)) {
+        if (empty($this->id)){
             //Sign newly created session
             $_SESSION[self::CLIENT_SIGNATURE] = $this->clientSignature;
             $_SESSION[self::SESSION_CREATED] = \time();
@@ -93,7 +93,7 @@ 
         $this->started = true;
 
         //Ensure that session is valid
-        if (!$this->validSession()) {
+        if (!$this->validSession()){
             $this->invalidateSession();
         }
     }
@@ -123,7 +123,7 @@ 
 
     public function commit(): bool
     {
-        if (!$this->isStarted()) {
+        if (!$this->isStarted()){
             return false;
         }
 
@@ -135,7 +135,7 @@ 
 
     public function abort(): bool
     {
-        if (!$this->isStarted()) {
+        if (!$this->isStarted()){
             return false;
         }
 
@@ -171,12 +171,12 @@ 
         if (
             !\array_key_exists(self::CLIENT_SIGNATURE, $_SESSION)
             || !\array_key_exists(self::SESSION_CREATED, $_SESSION)
-        ) {
+        ){
             //Missing session signature or timestamp!
             return false;
         }
 
-        if ($_SESSION[self::SESSION_CREATED] < \time() - $this->lifetime) {
+        if ($_SESSION[self::SESSION_CREATED] < \time() - $this->lifetime){
             //Session expired
             return false;
         }

Braces +24 added lines, -11 removed lines

@@ -43,7 +43,8 @@ 
         private readonly int $lifetime,
         string $id = null
     ) {
-        if (!empty($id) && $this->validID($id)) {
+        if (!empty($id) && $this->validID($id))
+        {
             $this->id = $id;
         }
     }
@@ -65,24 +66,32 @@ 
 
     public function resume(): void
     {
-        if ($this->isStarted()) {
+        if ($this->isStarted())
+        {
             return;
         }
 
-        if (!empty($this->id)) {
+        if (!empty($this->id))
+        {
             \session_id($this->id);
-        } else {
+        }
+        else
+        {
             // always new id
             \session_id(\session_create_id());
         }
 
-        try {
+        try
+        {
             \session_start(['use_cookies' => false]);
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             throw new SessionException('Unable to start session', (int) $e->getCode(), $e);
         }
 
-        if (empty($this->id)) {
+        if (empty($this->id))
+        {
             //Sign newly created session
             $_SESSION[self::CLIENT_SIGNATURE] = $this->clientSignature;
             $_SESSION[self::SESSION_CREATED] = \time();
@@ -93,7 +102,8 @@ 
         $this->started = true;
 
         //Ensure that session is valid
-        if (!$this->validSession()) {
+        if (!$this->validSession())
+        {
             $this->invalidateSession();
         }
     }
@@ -123,7 +133,8 @@ 
 
     public function commit(): bool
     {
-        if (!$this->isStarted()) {
+        if (!$this->isStarted())
+        {
             return false;
         }
 
@@ -135,7 +146,8 @@ 
 
     public function abort(): bool
     {
-        if (!$this->isStarted()) {
+        if (!$this->isStarted())
+        {
             return false;
         }
 
@@ -176,7 +188,8 @@ 
             return false;
         }
 
-        if ($_SESSION[self::SESSION_CREATED] < \time() - $this->lifetime) {
+        if ($_SESSION[self::SESSION_CREATED] < \time() - $this->lifetime)
+        {
             //Session expired
             return false;
         }

src/Session/src/Handler/FileHandler.php

Spacing +3 added lines, -3 removed lines

@@ -14,7 +14,7 @@ 
     public function __construct(
         private readonly FilesInterface $files,
         private readonly string $directory
-    ) {
+    ){
     }
 
     public function close(): bool
@@ -35,8 +35,8 @@ 
      */
     public function gc(int $maxlifetime): int
     {
-        foreach ($this->files->getFiles($this->directory) as $filename) {
-            if ($this->files->time($filename) < \time() - $maxlifetime) {
+        foreach ($this->files->getFiles($this->directory) as $filename){
+            if ($this->files->time($filename) < \time() - $maxlifetime){
                 $this->files->delete($filename);
             }
         }

Braces +4 added lines, -2 removed lines

@@ -35,8 +35,10 @@
      */
     public function gc(int $maxlifetime): int
     {
-        foreach ($this->files->getFiles($this->directory) as $filename) {
-            if ($this->files->time($filename) < \time() - $maxlifetime) {
+        foreach ($this->files->getFiles($this->directory) as $filename)
+        {
+            if ($this->files->time($filename) < \time() - $maxlifetime)
+            {
                 $this->files->delete($filename);
             }
         }

src/Session/src/SessionFactory.php

Spacing +6 added lines, -6 removed lines

@@ -19,21 +19,21 @@
     public function __construct(
         private readonly SessionConfig $config,
         private readonly FactoryInterface $factory
-    ) {
+    ){
     }
 
     public function initSession(string $clientSignature, string $id = null): SessionInterface
     {
-        if (\session_status() === PHP_SESSION_ACTIVE) {
+        if (\session_status() === PHP_SESSION_ACTIVE){
             throw new MultipleSessionException('Unable to initiate session, session already started');
         }
 
         // Initiating proper session handler
-        if ($this->config->getHandler() !== null) {
-            try {
+        if ($this->config->getHandler() !== null){
+            try{
                 $handler = $this->config->getHandler()->resolve($this->factory);
-            } catch (\Throwable | ContainerExceptionInterface $e) {
-                throw new SessionException($e->getMessage(), (int) $e->getCode(), $e);
+            }catch (\Throwable | ContainerExceptionInterface $e){
+                throw new SessionException($e->getMessage(), (int)$e->getCode(), $e);
             }
 
             \session_set_save_handler($handler, true);

Braces +9 added lines, -4 removed lines

@@ -24,15 +24,20 @@
 
     public function initSession(string $clientSignature, string $id = null): SessionInterface
     {
-        if (\session_status() === PHP_SESSION_ACTIVE) {
+        if (\session_status() === PHP_SESSION_ACTIVE)
+        {
             throw new MultipleSessionException('Unable to initiate session, session already started');
         }
 
         // Initiating proper session handler
-        if ($this->config->getHandler() !== null) {
-            try {
+        if ($this->config->getHandler() !== null)
+        {
+            try
+            {
                 $handler = $this->config->getHandler()->resolve($this->factory);
-            } catch (\Throwable | ContainerExceptionInterface $e) {
+            }
+            catch (\Throwable | ContainerExceptionInterface $e)
+            {
                 throw new SessionException($e->getMessage(), (int) $e->getCode(), $e);
             }
 

src/Serializer/tests/Serializer/PhpSerializerTest.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 
         $this->assertSame('a:2:{i:0;s:4:"some";i:1;s:8:"elements";}', $serializer->serialize(['some', 'elements']));
         $this->assertSame(['some', 'elements'], $serializer->unserialize('a:2:{i:0;s:4:"some";i:1;s:8:"elements";}'));
-        $this->assertSame(['some', 'elements'], $serializer->unserialize(new class() implements \Stringable {
+        $this->assertSame(['some', 'elements'], $serializer->unserialize(new class() implements \Stringable{
             public function __toString(): string
             {
                 return 'a:2:{i:0;s:4:"some";i:1;s:8:"elements";}';

src/Serializer/tests/Serializer/JsonSerializerTest.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 
         $this->assertSame('["some","elements"]', $serializer->serialize(['some', 'elements']));
         $this->assertSame(['some', 'elements'], $serializer->unserialize('["some","elements"]'));
-        $this->assertSame(['some', 'elements'], $serializer->unserialize(new class() implements \Stringable {
+        $this->assertSame(['some', 'elements'], $serializer->unserialize(new class() implements \Stringable{
             public function __toString(): string
             {
                 return '["some","elements"]';

src/Serializer/src/Serializer/PhpSerializer.php

Spacing +8 added lines, -8 removed lines

@@ -10,33 +10,33 @@
 
 final class PhpSerializer implements SerializerInterface
 {
-    public function serialize(mixed $payload): string|\Stringable
+    public function serialize(mixed $payload): string | \Stringable
     {
         return \serialize($payload);
     }
 
-    public function unserialize(\Stringable|string $payload, object|string|null $type = null): mixed
+    public function unserialize(\Stringable | string $payload, object | string | null $type = null): mixed
     {
-        if (\is_object($type)) {
+        if (\is_object($type)){
             $type = $type::class;
         }
 
-        if (\is_string($type) && !\class_exists($type) && !\interface_exists($type)) {
+        if (\is_string($type) && !\class_exists($type) && !\interface_exists($type)){
             throw new InvalidArgumentException(\sprintf('Class or interface `%s` doesn\'t exist.', $type));
         }
 
         return $this->runUnserialize($payload, $type);
     }
 
-    private function runUnserialize(\Stringable|string $payload, ?string $type = null): mixed
+    private function runUnserialize(\Stringable | string $payload, ?string $type = null): mixed
     {
-        $result = \unserialize((string) $payload, $type ? [] : ['allowed_classes' => false]);
+        $result = \unserialize((string)$payload, $type ? [] : ['allowed_classes' => false]);
 
-        if ($result === false) {
+        if ($result === false){
             throw new UnserializeException('Failed to unserialize data.');
         }
 
-        if ($type !== null && !$result instanceof $type) {
+        if ($type !== null && !$result instanceof $type){
             throw new InvalidArgumentException(\sprintf(
                 'Data received after unserializing must be of type: `%s`, received `%s`',
                 $type,

Braces +8 added lines, -4 removed lines

@@ -17,11 +17,13 @@ 
 
     public function unserialize(\Stringable|string $payload, object|string|null $type = null): mixed
     {
-        if (\is_object($type)) {
+        if (\is_object($type))
+        {
             $type = $type::class;
         }
 
-        if (\is_string($type) && !\class_exists($type) && !\interface_exists($type)) {
+        if (\is_string($type) && !\class_exists($type) && !\interface_exists($type))
+        {
             throw new InvalidArgumentException(\sprintf('Class or interface `%s` doesn\'t exist.', $type));
         }
 
@@ -32,11 +34,13 @@ 
     {
         $result = \unserialize((string) $payload, $type ? [] : ['allowed_classes' => false]);
 
-        if ($result === false) {
+        if ($result === false)
+        {
             throw new UnserializeException('Failed to unserialize data.');
         }
 
-        if ($type !== null && !$result instanceof $type) {
+        if ($type !== null && !$result instanceof $type)
+        {
             throw new InvalidArgumentException(\sprintf(
                 'Data received after unserializing must be of type: `%s`, received `%s`',
                 $type,

src/Serializer/src/Serializer/CallbackSerializer.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
         return ($this->serializeCallback)($payload);
     }
 
-    public function unserialize(string|\Stringable $payload, string|object|null $type = null): mixed
+    public function unserialize(string | \Stringable $payload, string | object | null $type = null): mixed
     {
         return ($this->unserializeCallback)($payload, $type);
     }

src/Serializer/src/Serializer/JsonSerializer.php

Spacing +8 added lines, -8 removed lines

@@ -14,11 +14,11 @@ 
     /**
      * @throws SerializeException
      */
-    public function serialize(mixed $payload): string|\Stringable
+    public function serialize(mixed $payload): string | \Stringable
     {
-        try {
+        try{
             return \json_encode($payload, JSON_THROW_ON_ERROR);
-        } catch (\JsonException $e) {
+        }catch (\JsonException $e){
             throw new SerializeException($e->getMessage(), $e->getCode(), $e);
         }
     }
@@ -26,17 +26,17 @@ 
     /**
      * @throws \JsonException
      */
-    public function unserialize(\Stringable|string $payload, object|string|null $type = null): mixed
+    public function unserialize(\Stringable | string $payload, object | string | null $type = null): mixed
     {
-        if ($type !== null) {
+        if ($type !== null){
             throw new InvalidArgumentException(
                 \sprintf('Serializer `%s` does not support data hydration to an object.', self::class)
             );
         }
 
-        try {
-            return \json_decode((string) $payload, true, 512, JSON_THROW_ON_ERROR);
-        } catch (\JsonException $e) {
+        try{
+            return \json_decode((string)$payload, true, 512, JSON_THROW_ON_ERROR);
+        }catch (\JsonException $e){
             throw new UnserializeException($e->getMessage(), $e->getCode(), $e);
         }
     }

Braces +12 added lines, -5 removed lines

@@ -16,9 +16,12 @@ 
      */
     public function serialize(mixed $payload): string|\Stringable
     {
-        try {
+        try
+        {
             return \json_encode($payload, JSON_THROW_ON_ERROR);
-        } catch (\JsonException $e) {
+        }
+        catch (\JsonException $e)
+        {
             throw new SerializeException($e->getMessage(), $e->getCode(), $e);
         }
     }
@@ -28,15 +31,19 @@ 
      */
     public function unserialize(\Stringable|string $payload, object|string|null $type = null): mixed
     {
-        if ($type !== null) {
+        if ($type !== null)
+        {
             throw new InvalidArgumentException(
                 \sprintf('Serializer `%s` does not support data hydration to an object.', self::class)
             );
         }
 
-        try {
+        try
+        {
             return \json_decode((string) $payload, true, 512, JSON_THROW_ON_ERROR);
-        } catch (\JsonException $e) {
+        }
+        catch (\JsonException $e)
+        {
             throw new UnserializeException($e->getMessage(), $e->getCode(), $e);
         }
     }

src/Serializer/src/SerializerInterface.php

Spacing +2 added lines, -2 removed lines

@@ -6,7 +6,7 @@
 
 interface SerializerInterface
 {
-    public function serialize(mixed $payload): string|\Stringable;
+    public function serialize(mixed $payload): string | \Stringable;
 
-    public function unserialize(string|\Stringable $payload, string|object|null $type = null): mixed;
+    public function unserialize(string | \Stringable $payload, string | object | null $type = null): mixed;
 }