o2system / session

src/Handlers/FileHandler.php

Spacing +3 added lines, -3 removed lines

@@ -80,7 +80,7 @@ 
      */

     public function open($save_path, $name)

     {

-        $this->path = $this->config[ 'filePath' ];

+        $this->path = $this->config['filePath'];

 

         if ($this->isSupported() === false) {

             if ($this->logger instanceof LoggerInterface) {

@@ -92,7 +92,7 @@ 
 

         $this->filePath = $this->path

             . $name . '-' // we'll use the session cookie name as a prefix to avoid collisions

-            . ($this->config[ 'match' ]->ip ? md5($_SERVER[ 'REMOTE_ADDR' ]) . '-' : '');

+            . ($this->config['match']->ip ? md5($_SERVER['REMOTE_ADDR']) . '-' : '');

 

         return $this->success;

     }

@@ -211,7 +211,7 @@ 
 

         while (($file = readdir($directory)) !== false) {

             // If the filename doesn't match this pattern, it's either not a session file or is not ours

-            if ( ! preg_match('/[' . $this->config[ 'name' ] . '-]+[0-9-a-f]+/', $file)

+            if ( ! preg_match('/[' . $this->config['name'] . '-]+[0-9-a-f]+/', $file)

                 || ! is_file($this->path . '/' . $file)

                 || ($mtime = filemtime($this->path . '/' . $file)) === false

                 || $mtime > $ts

src/Handlers/RedisHandler.php

Indentation +1 added lines, -1 removed lines

@@ -88,7 +88,7 @@
                 $this->logger->error('SESSION_E_PLATFORM_UNSUPPORTED', ['Redis']);

             }

 

-           z

+            z

         }

 

         try {

src/Session.php

Spacing +94 added lines, -94 removed lines

@@ -112,7 +112,7 @@ 
      */

     public function setLogger(LoggerInterface $logger)

     {

-        $this->logger =& $logger;

+        $this->logger = & $logger;

 

         // Load Session Language

         language()->loadFile('session');

@@ -156,12 +156,12 @@ 
         session_set_save_handler($this->handler, true);

 

         // Sanitize the cookie, because apparently PHP doesn't do that for userspace handlers

-        if (isset($_COOKIE[ $this->config[ 'name' ] ]) && (

-                ! is_string($_COOKIE[ $this->config[ 'name' ] ]) || ! preg_match('#\A' . $this->sidRegexp . '\z#',

-                    $_COOKIE[ $this->config[ 'name' ] ])

+        if (isset($_COOKIE[$this->config['name']]) && (

+                ! is_string($_COOKIE[$this->config['name']]) || ! preg_match('#\A' . $this->sidRegexp . '\z#',

+                    $_COOKIE[$this->config['name']])

             )

         ) {

-            unset($_COOKIE[ $this->config[ 'name' ] ]);

+            unset($_COOKIE[$this->config['name']]);

         }

 

         /**

@@ -176,37 +176,37 @@ 
         $this->initializeVariables();

 

         // Sanitize the cookie, because apparently PHP doesn't do that for userspace handlers

-        if (isset($_COOKIE[ $this->config[ 'name' ] ]) && (

-                ! is_string($this->config[ 'name' ]) ||

-                ! preg_match('#\A' . $this->sidRegexp . '\z#', $_COOKIE[ $this->config[ 'name' ] ]

+        if (isset($_COOKIE[$this->config['name']]) && (

+                ! is_string($this->config['name']) ||

+                ! preg_match('#\A' . $this->sidRegexp . '\z#', $_COOKIE[$this->config['name']]

                 )

             )

         ) {

-            unset($_COOKIE[ $this->config[ 'name' ] ]);

+            unset($_COOKIE[$this->config['name']]);

         }

 

         // Is session ID auto-regeneration configured? (ignoring ajax requests)

-        if ((empty($_SERVER[ 'HTTP_X_REQUESTED_WITH' ]) ||

-                strtolower($_SERVER[ 'HTTP_X_REQUESTED_WITH' ]) !== 'xmlhttprequest') &&

-            ($regenerateTime = $this->config[ 'regenerate' ]->lifetime) > 0

+        if ((empty($_SERVER['HTTP_X_REQUESTED_WITH']) ||

+                strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) !== 'xmlhttprequest') &&

+            ($regenerateTime = $this->config['regenerate']->lifetime) > 0

         ) {

-            if ( ! isset($_SESSION[ 'last_regenerate' ])) {

-                $_SESSION[ 'last_regenerate' ] = time();

-            } elseif ($_SESSION[ 'last_regenerate' ] < (time() - $regenerateTime)) {

+            if ( ! isset($_SESSION['last_regenerate'])) {

+                $_SESSION['last_regenerate'] = time();

+            } elseif ($_SESSION['last_regenerate'] < (time() - $regenerateTime)) {

                 $this->regenerate();

             }

         }

         // Another work-around ... PHP doesn't seem to send the session cookie

         // unless it is being currently created or regenerated

-        elseif (isset($_COOKIE[ $this->config[ 'name' ] ]) && $_COOKIE[ $this->config[ 'name' ] ] === session_id()

+        elseif (isset($_COOKIE[$this->config['name']]) && $_COOKIE[$this->config['name']] === session_id()

         ) {

             setcookie(

-                $this->config[ 'name' ],

+                $this->config['name'],

                 session_id(),

-                (empty($this->config[ 'lifetime' ]) ? 0 : time() + $this->config[ 'lifetime' ]),

-                $this->config[ 'cookie' ]->path,

-                '.' . ltrim($this->config[ 'cookie' ]->domain, '.'),

-                $this->config[ 'cookie' ]->secure,

+                (empty($this->config['lifetime']) ? 0 : time() + $this->config['lifetime']),

+                $this->config['cookie']->path,

+                '.' . ltrim($this->config['cookie']->domain, '.'),

+                $this->config['cookie']->secure,

                 true

             );

         }

@@ -227,23 +227,23 @@ 
      */

     private function setConfiguration()

     {

-        ini_set('session.name', $this->config[ 'name' ]);

+        ini_set('session.name', $this->config['name']);

 

-        if (empty($this->config[ 'lifetime' ])) {

-            $this->config[ 'lifetime' ] = (int)ini_get('session.gc_maxlifetime');

+        if (empty($this->config['lifetime'])) {

+            $this->config['lifetime'] = (int)ini_get('session.gc_maxlifetime');

         } else {

-            ini_set('session.gc_maxlifetime', (int)$this->config[ 'lifetime' ]);

+            ini_set('session.gc_maxlifetime', (int)$this->config['lifetime']);

         }

 

-        if (empty($this->config[ 'cookie' ]->domain)) {

-            $this->config[ 'cookie' ]->domain = (isset($_SERVER[ 'HTTP_HOST' ]) ? $_SERVER[ 'HTTP_HOST' ]

-                : (isset($_SERVER[ 'SERVER_NAME' ]) ? $_SERVER[ 'SERVER_NAME' ] : null));

+        if (empty($this->config['cookie']->domain)) {

+            $this->config['cookie']->domain = (isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST']

+                : (isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : null));

         }

 

-        $this->config[ 'cookie' ]->domain = ltrim($this->config[ 'cookie' ]->domain, '.');

+        $this->config['cookie']->domain = ltrim($this->config['cookie']->domain, '.');

 

-        ini_set('session.cookie_domain', '.' . $this->config[ 'cookie' ]->domain);

-        ini_set('session.cookie_path', $this->config[ 'cookie' ]->path);

+        ini_set('session.cookie_domain', '.' . $this->config['cookie']->domain);

+        ini_set('session.cookie_path', $this->config['cookie']->path);

 

         // Security is king

         ini_set('session.cookie_lifetime', 0);

@@ -330,25 +330,25 @@ 
      */

     private function initializeVariables()

     {

-        if (empty($_SESSION[ 'system_variables' ])) {

+        if (empty($_SESSION['system_variables'])) {

             return;

         }

 

         $currentTime = time();

 

-        foreach ($_SESSION[ 'system_variables' ] as $key => &$value) {

+        foreach ($_SESSION['system_variables'] as $key => &$value) {

             if ($value === 'new') {

-                $_SESSION[ 'system_variables' ][ $key ] = 'old';

+                $_SESSION['system_variables'][$key] = 'old';

             }

             // Hacky, but 'old' will (implicitly) always be less than time() ;)

             // DO NOT move this above the 'new' check!

             elseif ($value < $currentTime) {

-                unset($_SESSION[ $key ], $_SESSION[ 'system_variables' ][ $key ]);

+                unset($_SESSION[$key], $_SESSION['system_variables'][$key]);

             }

         }

 

-        if (empty($_SESSION[ 'system_variables' ])) {

-            unset($_SESSION[ 'system_variables' ]);

+        if (empty($_SESSION['system_variables'])) {

+            unset($_SESSION['system_variables']);

         }

     }

 

@@ -361,8 +361,8 @@ 
      */

     public function regenerate()

     {

-        $_SESSION[ 'last_regenerate' ] = time();

-        session_regenerate_id($this->config[ 'regenerate' ]->destroy);

+        $_SESSION['last_regenerate'] = time();

+        session_regenerate_id($this->config['regenerate']->destroy);

     }

 

     //--------------------------------------------------------------------

@@ -396,12 +396,12 @@ 
     public function stop()

     {

         setcookie(

-            $this->config[ 'name' ],

+            $this->config['name'],

             session_id(),

             1,

-            $this->config[ 'cookie' ]->path,

-            '.' . ltrim($this->config[ 'cookie' ]->domain, '.'),

-            $this->config[ 'cookie' ]->secure,

+            $this->config['cookie']->path,

+            '.' . ltrim($this->config['cookie']->domain, '.'),

+            $this->config['cookie']->secure,

             true

         );

 

@@ -460,7 +460,7 @@ 
      */

     public function offsetExists($offset)

     {

-        return (bool)isset($_SESSION[ $offset ]);

+        return (bool)isset($_SESSION[$offset]);

     }

 

     // ------------------------------------------------------------------------

@@ -495,14 +495,14 @@ 
     public function &__get($offset)

     {

         if ($offset === 'id') {

-            $_SESSION[ 'id' ] = session_id();

+            $_SESSION['id'] = session_id();

         }

 

-        if ( ! isset($_SESSION[ $offset ])) {

-            $_SESSION[ $offset ] = null;

+        if ( ! isset($_SESSION[$offset])) {

+            $_SESSION[$offset] = null;

         }

 

-        return $_SESSION[ $offset ];

+        return $_SESSION[$offset];

     }

 

     // ------------------------------------------------------------------------

@@ -542,7 +542,7 @@ 
      */

     public function offsetSet($offset, $value)

     {

-        $_SESSION[ $offset ] =& $value;

+        $_SESSION[$offset] = & $value;

     }

 

     // ------------------------------------------------------------------------

@@ -580,8 +580,8 @@ 
      */

     public function offsetUnset($offset)

     {

-        if (isset($_SESSION[ $offset ])) {

-            unset($_SESSION[ $offset ]);

+        if (isset($_SESSION[$offset])) {

+            unset($_SESSION[$offset]);

         }

     }

 

@@ -644,13 +644,13 @@ 
     {

         if (is_array($offset)) {

             foreach ($offset as $key => &$value) {

-                $_SESSION[ $key ] = $value;

+                $_SESSION[$key] = $value;

             }

 

             return;

         }

 

-        $_SESSION[ $offset ] =& $value;

+        $_SESSION[$offset] = & $value;

     }

 

     //--------------------------------------------------------------------

@@ -668,26 +668,26 @@ 
     {

         if (is_array($offset)) {

             for ($i = 0, $c = count($offset); $i < $c; $i++) {

-                if ( ! isset($_SESSION[ $offset[ $i ] ])) {

+                if ( ! isset($_SESSION[$offset[$i]])) {

                     return false;

                 }

             }

 

             $new = array_fill_keys($offset, 'new');

 

-            $_SESSION[ 'system_variables' ] = isset($_SESSION[ 'system_variables' ]) ? array_merge(

-                $_SESSION[ 'system_variables' ],

+            $_SESSION['system_variables'] = isset($_SESSION['system_variables']) ? array_merge(

+                $_SESSION['system_variables'],

                 $new

             ) : $new;

 

             return true;

         }

 

-        if ( ! isset($_SESSION[ $offset ])) {

+        if ( ! isset($_SESSION[$offset])) {

             return false;

         }

 

-        $_SESSION[ 'system_variables' ][ $offset ] = 'new';

+        $_SESSION['system_variables'][$offset] = 'new';

 

         return true;

     }

@@ -725,10 +725,10 @@ 
     public function offsetGet($offset)

     {

         if ($offset === 'id') {

-            $_SESSION[ 'id' ] = session_id();

+            $_SESSION['id'] = session_id();

         }

 

-        return (isset($_SESSION[ $offset ])) ? $_SESSION[ $offset ] : false;

+        return (isset($_SESSION[$offset])) ? $_SESSION[$offset] : false;

     }

 

     //--------------------------------------------------------------------

@@ -746,15 +746,15 @@ 
     public function getFlash($offset = null)

     {

         if (isset($offset)) {

-            return (isset($_SESSION[ 'system_variables' ], $_SESSION[ 'system_variables' ][ $offset ], $_SESSION[ $offset ]) &&

-                ! is_int($_SESSION[ 'system_variables' ][ $offset ])) ? $_SESSION[ $offset ] : null;

+            return (isset($_SESSION['system_variables'], $_SESSION['system_variables'][$offset], $_SESSION[$offset]) &&

+                ! is_int($_SESSION['system_variables'][$offset])) ? $_SESSION[$offset] : null;

         }

 

         $flashVariables = [];

 

-        if ( ! empty($_SESSION[ 'system_variables' ])) {

-            foreach ($_SESSION[ 'system_variables' ] as $offset => &$value) {

-                is_int($value) OR $flashVariables[ $offset ] = $_SESSION[ $offset ];

+        if ( ! empty($_SESSION['system_variables'])) {

+            foreach ($_SESSION['system_variables'] as $offset => &$value) {

+                is_int($value) OR $flashVariables[$offset] = $_SESSION[$offset];

             }

         }

 

@@ -786,23 +786,23 @@ 
      */

     public function unsetFlash($offset)

     {

-        if (empty($_SESSION[ 'system_variables' ])) {

+        if (empty($_SESSION['system_variables'])) {

             return;

         }

 

         is_array($offset) OR $offset = [$offset];

 

         foreach ($offset as $key) {

-            if (isset($_SESSION[ 'system_variables' ][ $key ]) && ! is_int(

-                    $_SESSION[ 'system_variables' ][ $key ]

+            if (isset($_SESSION['system_variables'][$key]) && ! is_int(

+                    $_SESSION['system_variables'][$key]

                 )

             ) {

-                unset($_SESSION[ 'system_variables' ][ $key ]);

+                unset($_SESSION['system_variables'][$key]);

             }

         }

 

-        if (empty($_SESSION[ 'system_variables' ])) {

-            unset($_SESSION[ 'system_variables' ]);

+        if (empty($_SESSION['system_variables'])) {

+            unset($_SESSION['system_variables']);

         }

     }

 

@@ -817,13 +817,13 @@ 
      */

     public function getFlashOffsets()

     {

-        if ( ! isset($_SESSION[ 'system_variables' ])) {

+        if ( ! isset($_SESSION['system_variables'])) {

             return [];

         }

 

         $offsets = [];

-        foreach (array_keys($_SESSION[ 'system_variables' ]) as $offset) {

-            is_int($_SESSION[ 'system_variables' ][ $offset ]) OR $offsets[] = $offset;

+        foreach (array_keys($_SESSION['system_variables']) as $offset) {

+            is_int($_SESSION['system_variables'][$offset]) OR $offsets[] = $offset;

         }

 

         return $offsets;

@@ -875,26 +875,26 @@ 
                     $value += time();

                 }

 

-                if ( ! isset($_SESSION[ $key ])) {

+                if ( ! isset($_SESSION[$key])) {

                     return false;

                 }

 

-                $temp[ $key ] = $value;

+                $temp[$key] = $value;

             }

 

-            $_SESSION[ 'system_variables' ] = isset($_SESSION[ 'system_variables' ]) ? array_merge(

-                $_SESSION[ 'system_variables' ],

+            $_SESSION['system_variables'] = isset($_SESSION['system_variables']) ? array_merge(

+                $_SESSION['system_variables'],

                 $temp

             ) : $temp;

 

             return true;

         }

 

-        if ( ! isset($_SESSION[ $offset ])) {

+        if ( ! isset($_SESSION[$offset])) {

             return false;

         }

 

-        $_SESSION[ 'system_variables' ][ $offset ] = $ttl;

+        $_SESSION['system_variables'][$offset] = $ttl;

 

         return true;

     }

@@ -913,15 +913,15 @@ 
     public function getTemp($offset = null)

     {

         if (isset($offset)) {

-            return (isset($_SESSION[ 'system_variables' ], $_SESSION[ 'system_variables' ][ $offset ], $_SESSION[ $offset ]) &&

-                is_int($_SESSION[ 'system_variables' ][ $offset ])) ? $_SESSION[ $offset ] : null;

+            return (isset($_SESSION['system_variables'], $_SESSION['system_variables'][$offset], $_SESSION[$offset]) &&

+                is_int($_SESSION['system_variables'][$offset])) ? $_SESSION[$offset] : null;

         }

 

         $tempVariables = [];

 

-        if ( ! empty($_SESSION[ 'system_variables' ])) {

-            foreach ($_SESSION[ 'system_variables' ] as $offset => &$value) {

-                is_int($value) && $tempVariables[ $offset ] = $_SESSION[ $offset ];

+        if ( ! empty($_SESSION['system_variables'])) {

+            foreach ($_SESSION['system_variables'] as $offset => &$value) {

+                is_int($value) && $tempVariables[$offset] = $_SESSION[$offset];

             }

         }

 

@@ -939,23 +939,23 @@ 
      */

     public function unsetTemp($offset)

     {

-        if (empty($_SESSION[ 'system_variables' ])) {

+        if (empty($_SESSION['system_variables'])) {

             return;

         }

 

         is_array($offset) OR $offset = [$offset];

 

         foreach ($offset as $key) {

-            if (isset($_SESSION[ 'system_variables' ][ $key ]) && is_int(

-                    $_SESSION[ 'system_variables' ][ $key ]

+            if (isset($_SESSION['system_variables'][$key]) && is_int(

+                    $_SESSION['system_variables'][$key]

                 )

             ) {

-                unset($_SESSION[ 'system_variables' ][ $key ]);

+                unset($_SESSION['system_variables'][$key]);

             }

         }

 

-        if (empty($_SESSION[ 'system_variables' ])) {

-            unset($_SESSION[ 'system_variables' ]);

+        if (empty($_SESSION['system_variables'])) {

+            unset($_SESSION['system_variables']);

         }

     }

 

@@ -970,13 +970,13 @@ 
      */

     public function getTempOffsets()

     {

-        if ( ! isset($_SESSION[ 'system_variables' ])) {

+        if ( ! isset($_SESSION['system_variables'])) {

             return [];

         }

 

         $offsets = [];

-        foreach (array_keys($_SESSION[ 'system_variables' ]) as $offset) {

-            is_int($_SESSION[ 'system_variables' ][ $offset ]) && $offsets[] = $offset;

+        foreach (array_keys($_SESSION['system_variables']) as $offset) {

+            is_int($_SESSION['system_variables'][$offset]) && $offsets[] = $offset;

         }

 

         return $offsets;

src/Abstracts/AbstractHandler.php

Spacing +6 added lines, -6 removed lines

@@ -109,7 +109,7 @@ 
     {

         $this->config = $config;

         $this->config->offsetUnset('handler');

-        $this->setPrefixKey($this->config[ 'name' ]);

+        $this->setPrefixKey($this->config['name']);

 

         if (is_php('7')) {

             $this->success = true;

@@ -147,7 +147,7 @@ 
      */

     public function setLogger(LoggerInterface $logger)

     {

-        $this->logger =& $logger;

+        $this->logger = & $logger;

     }

 

     /**

@@ -333,12 +333,12 @@ 
     protected function destroyCookie()

     {

         return setcookie(

-            $this->config[ 'name' ],

+            $this->config['name'],

             null,

             1,

-            $this->config[ 'cookie' ]->path,

-            '.' . ltrim($this->config[ 'cookie' ]->domain, '.'),

-            $this->config[ 'cookie' ]->secure,

+            $this->config['cookie']->path,

+            '.' . ltrim($this->config['cookie']->domain, '.'),

+            $this->config['cookie']->secure,

             true

         );

     }