spiral / framework

src/Session/tests/FactoryTest.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 {
     public function tearDown(): void
     {
-        if ((int)session_status() === PHP_SESSION_ACTIVE) {
+        if ((int)session_status() === PHP_SESSION_ACTIVE){
             session_abort();
         }
     }

Braces +2 added lines, -1 removed lines

@@ -24,7 +24,8 @@
 {
     public function tearDown(): void
     {
-        if ((int)session_status() === PHP_SESSION_ACTIVE) {
+        if ((int)session_status() === PHP_SESSION_ACTIVE)
+        {
             session_abort();
         }
     }

src/Session/tests/SessionTest.php

Spacing +2 added lines, -2 removed lines

@@ -51,7 +51,7 @@ 
 
     public function tearDown(): void
     {
-        if ((int)session_status() === PHP_SESSION_ACTIVE) {
+        if ((int)session_status() === PHP_SESSION_ACTIVE){
             session_abort();
         }
     }
@@ -125,7 +125,7 @@ 
         $this->assertSame('default', $section->getName());
 
         $section->set('key', 'value');
-        foreach ($section as $key => $value) {
+        foreach ($section as $key => $value){
             $this->assertSame('key', $key);
             $this->assertSame('value', $value);
         }

Braces +4 added lines, -2 removed lines

@@ -51,7 +51,8 @@ 
 
     public function tearDown(): void
     {
-        if ((int)session_status() === PHP_SESSION_ACTIVE) {
+        if ((int)session_status() === PHP_SESSION_ACTIVE)
+        {
             session_abort();
         }
     }
@@ -125,7 +126,8 @@ 
         $this->assertSame('default', $section->getName());
 
         $section->set('key', 'value');
-        foreach ($section as $key => $value) {
+        foreach ($section as $key => $value)
+        {
             $this->assertSame('key', $key);
             $this->assertSame('value', $value);
         }

src/Session/src/SessionSection.php

Spacing +2 added lines, -2 removed lines

@@ -127,7 +127,7 @@ 
      */
     public function get(string $name, $default = null)
     {
-        if (!$this->has($name)) {
+        if (!$this->has($name)){
             return $default;
         }
 
@@ -202,7 +202,7 @@ 
     {
         $this->session->resume();
 
-        if (!isset($_SESSION[$this->name])) {
+        if (!isset($_SESSION[$this->name])){
             $_SESSION[$this->name] = [];
         }
     }

Braces +4 added lines, -2 removed lines

@@ -127,7 +127,8 @@ 
      */
     public function get(string $name, $default = null)
     {
-        if (!$this->has($name)) {
+        if (!$this->has($name))
+        {
             return $default;
         }
 
@@ -202,7 +203,8 @@ 
     {
         $this->session->resume();
 
-        if (!isset($_SESSION[$this->name])) {
+        if (!isset($_SESSION[$this->name]))
+        {
             $_SESSION[$this->name] = [];
         }
     }

src/Session/src/Handler/FileHandler.php

Spacing +2 added lines, -2 removed lines

@@ -62,8 +62,8 @@
      */
     public function gc($maxlifetime): void
     {
-        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

@@ -62,8 +62,10 @@
      */
     public function gc($maxlifetime): void
     {
-        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 +4 added lines, -4 removed lines

@@ -48,15 +48,15 @@
      */
     public function initSession(string $clientSignature, string $id = null): SessionInterface
     {
-        if ((int)session_status() === PHP_SESSION_ACTIVE) {
+        if ((int)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(), $e->getCode(), $e);
             }
 

Braces +9 added lines, -4 removed lines

@@ -48,15 +48,20 @@
      */
     public function initSession(string $clientSignature, string $id = null): SessionInterface
     {
-        if ((int)session_status() === PHP_SESSION_ACTIVE) {
+        if ((int)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(), $e->getCode(), $e);
             }
 

src/Session/src/Session.php

Spacing +13 added lines, -13 removed lines

@@ -72,7 +72,7 @@ 
         $this->clientSignature = $clientSignature;
         $this->lifetime = $lifetime;
 
-        if (!empty($id) && $this->validID($id)) {
+        if (!empty($id) && $this->validID($id)){
             $this->id = $id;
         }
     }
@@ -103,24 +103,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) {
+        }catch (\Throwable $e){
             throw new SessionException('Unable to start session', $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();
@@ -131,7 +131,7 @@ 
         $this->started = true;
 
         //Ensure that session is valid
-        if (!$this->validSession()) {
+        if (!$this->validSession()){
             $this->invalidateSession();
         }
     }
@@ -170,7 +170,7 @@ 
      */
     public function commit(): bool
     {
-        if (!$this->isStarted()) {
+        if (!$this->isStarted()){
             return false;
         }
 
@@ -185,7 +185,7 @@ 
      */
     public function abort(): bool
     {
-        if (!$this->isStarted()) {
+        if (!$this->isStarted()){
             return false;
         }
 
@@ -228,17 +228,17 @@ 
         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;
         }
 
-        if (!hash_equals($_SESSION[self::CLIENT_SIGNATURE], $this->clientSignature)) {
+        if (!hash_equals($_SESSION[self::CLIENT_SIGNATURE], $this->clientSignature)){
             //Signatures do not match
             return false;
         }

Braces +26 added lines, -12 removed lines

@@ -72,7 +72,8 @@ 
         $this->clientSignature = $clientSignature;
         $this->lifetime = $lifetime;
 
-        if (!empty($id) && $this->validID($id)) {
+        if (!empty($id) && $this->validID($id))
+        {
             $this->id = $id;
         }
     }
@@ -103,24 +104,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', $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();
@@ -131,7 +140,8 @@ 
         $this->started = true;
 
         //Ensure that session is valid
-        if (!$this->validSession()) {
+        if (!$this->validSession())
+        {
             $this->invalidateSession();
         }
     }
@@ -170,7 +180,8 @@ 
      */
     public function commit(): bool
     {
-        if (!$this->isStarted()) {
+        if (!$this->isStarted())
+        {
             return false;
         }
 
@@ -185,7 +196,8 @@ 
      */
     public function abort(): bool
     {
-        if (!$this->isStarted()) {
+        if (!$this->isStarted())
+        {
             return false;
         }
 
@@ -233,12 +245,14 @@ 
             return false;
         }
 
-        if ($_SESSION[self::SESSION_CREATED] < time() - $this->lifetime) {
+        if ($_SESSION[self::SESSION_CREATED] < time() - $this->lifetime)
+        {
             //Session expired
             return false;
         }
 
-        if (!hash_equals($_SESSION[self::CLIENT_SIGNATURE], $this->clientSignature)) {
+        if (!hash_equals($_SESSION[self::CLIENT_SIGNATURE], $this->clientSignature))
+        {
             //Signatures do not match
             return false;
         }

src/Session/src/Config/SessionConfig.php

Spacing +3 added lines, -3 removed lines

@@ -64,15 +64,15 @@
      */
     public function getHandler(): ?Autowire
     {
-        if (empty($this->config['handler'])) {
+        if (empty($this->config['handler'])){
             return null;
         }
 
-        if ($this->config['handler'] instanceof Autowire) {
+        if ($this->config['handler'] instanceof Autowire){
             return $this->config['handler'];
         }
 
-        if (class_exists($this->config['handler'])) {
+        if (class_exists($this->config['handler'])){
             return new Autowire($this->config['handler']);
         }
 

Braces +6 added lines, -3 removed lines

@@ -64,15 +64,18 @@
      */
     public function getHandler(): ?Autowire
     {
-        if (empty($this->config['handler'])) {
+        if (empty($this->config['handler']))
+        {
             return null;
         }
 
-        if ($this->config['handler'] instanceof Autowire) {
+        if ($this->config['handler'] instanceof Autowire)
+        {
             return $this->config['handler'];
         }
 
-        if (class_exists($this->config['handler'])) {
+        if (class_exists($this->config['handler']))
+        {
             return new Autowire($this->config['handler']);
         }