o2system / session

src/autoload.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
  * @param $className

  */

 spl_autoload_register(

-    function ($className) {

+    function($className) {

         if ($className === 'O2System\Session') {

             require __DIR__ . DIRECTORY_SEPARATOR . 'Session.php';

         } elseif (strpos($className, 'O2System\Session\\') === false) {

src/Abstracts/AbstractHandler.php

Spacing +6 added lines, -6 removed lines

@@ -97,7 +97,7 @@ 
     {

         $this->config = $config;

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

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

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

     }

 

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

@@ -127,7 +127,7 @@ 
      */

     public function setLogger(LoggerInterface $logger)

     {

-        $this->logger =& $logger;

+        $this->logger = & $logger;

     }

 

     /**

@@ -313,12 +313,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

         );

     }

src/Handlers/MemcacheHandler.php

Spacing +12 added lines, -12 removed lines

@@ -89,26 +89,26 @@ 
             return false;
         }
 
-        if (isset($this->config[ 'servers' ])) {
-            foreach ($this->config[ 'servers' ] as $server => $setup) {
-                isset($setup[ 'port' ]) OR $setup[ 'port' ] = 11211;
-                isset($setup[ 'weight' ]) OR $setup[ 'weight' ] = 1;
+        if (isset($this->config['servers'])) {
+            foreach ($this->config['servers'] as $server => $setup) {
+                isset($setup['port']) OR $setup['port'] = 11211;
+                isset($setup['weight']) OR $setup['weight'] = 1;
 
                 // Third parameter is persistance and defaults to TRUE.
                 $this->memcache->addServer(
-                    $setup[ 'host' ],
-                    $setup[ 'port' ],
+                    $setup['host'],
+                    $setup['port'],
                     true,
-                    $setup[ 'weight' ]
+                    $setup['weight']
                 );
             }
         } else {
             // Third parameter is persistance and defaults to TRUE.
             $this->memcache->addServer(
-                $this->config[ 'host' ],
-                $this->config[ 'port' ],
+                $this->config['host'],
+                $this->config['port'],
                 true,
-                $this->config[ 'weight' ]
+                $this->config['weight']
             );
         }
 
@@ -341,7 +341,7 @@ 
                     $this->prefixKey . $session_id,
                     $session_data,
                     false,
-                    $this->config[ 'lifetime' ]
+                    $this->config['lifetime']
                 )
                 ) {
                     $this->fingerprint = $fingerprint;
@@ -353,7 +353,7 @@ 
             }
 
             return $this->memcache->replace($this->prefixKey . $session_id, $session_data, false,
-                $this->config[ 'lifetime' ]);
+                $this->config['lifetime']);
         }
 
         return false;

src/Handlers/ApcuHandler.php

Spacing +2 added lines, -2 removed lines

@@ -283,7 +283,7 @@ 
             apcu_store($this->lockKey, time(), 300);
 
             if ($this->fingerprint !== ($fingerprint = md5($sessionData))) {
-                if (apcu_store($this->prefixKey . $session_id, $sessionData, $this->config[ 'lifetime' ])) {
+                if (apcu_store($this->prefixKey . $session_id, $sessionData, $this->config['lifetime'])) {
                     $this->fingerprint = $fingerprint;
 
                     return true;
@@ -292,7 +292,7 @@ 
                 return false;
             }
 
-            return apcu_store($this->prefixKey . $session_id, $sessionData, $this->config[ 'lifetime' ]);
+            return apcu_store($this->prefixKey . $session_id, $sessionData, $this->config['lifetime']);
         }
 
         return false;

src/Handlers/WincacheHandler.php

Spacing +2 added lines, -2 removed lines

@@ -286,7 +286,7 @@ 
                 if (wincache_ucache_set(

                     $this->prefixKey . $session_id,

                     $session_data,

-                    $this->config[ 'lifetime' ]

+                    $this->config['lifetime']

                 )) {

                     $this->fingerprint = $fingerprint;

 

@@ -296,7 +296,7 @@ 
                 return false;

             }

 

-            return wincache_ucache_set($this->prefixKey . $session_id, $session_data, $this->config[ 'lifetime' ]);

+            return wincache_ucache_set($this->prefixKey . $session_id, $session_data, $this->config['lifetime']);

         }

 

         return false;

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 true;

     }

@@ -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/MemcachedHandler.php

Spacing +12 added lines, -12 removed lines

@@ -90,22 +90,22 @@ 
             return false;

         }

 

-        if (isset($this->config[ 'servers' ])) {

-            foreach ($this->config[ 'servers' ] as $server => $setup) {

-                isset($setup[ 'port' ]) OR $setup[ 'port' ] = 11211;

-                isset($setup[ 'weight' ]) OR $setup[ 'weight' ] = 1;

+        if (isset($this->config['servers'])) {

+            foreach ($this->config['servers'] as $server => $setup) {

+                isset($setup['port']) OR $setup['port'] = 11211;

+                isset($setup['weight']) OR $setup['weight'] = 1;

 

                 $this->memcached->addServer(

-                    $setup[ 'host' ],

-                    $setup[ 'port' ],

-                    $setup[ 'weight' ]

+                    $setup['host'],

+                    $setup['port'],

+                    $setup['weight']

                 );

             }

         } else {

             $this->memcached->addServer(

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

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

-                $this->config[ 'weight' ]

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

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

+                $this->config['weight']

             );

         }

 

@@ -337,7 +337,7 @@ 
                 if ($this->memcached->set(

                     $this->prefixKey . $session_id,

                     $session_data,

-                    $this->config[ 'lifetime' ]

+                    $this->config['lifetime']

                 )

                 ) {

                     $this->fingerprint = $fingerprint;

@@ -348,7 +348,7 @@ 
                 return false;

             }

 

-            return $this->memcached->touch($this->prefixKey . $session_id, $this->config[ 'lifetime' ]);

+            return $this->memcached->touch($this->prefixKey . $session_id, $this->config['lifetime']);

         }

 

         return false;

src/Handlers/RedisHandler.php

Spacing +7 added lines, -7 removed lines

@@ -93,10 +93,10 @@ 
 

         try {

             if ( ! $this->redis->connect(

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

-                ($this->config[ 'host' ][ 0 ] === '/' ? 0

-                    : $this->config[ 'port' ]),

-                $this->config[ 'timeout' ]

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

+                ($this->config['host'][0] === '/' ? 0

+                    : $this->config['port']),

+                $this->config['timeout']

             )

             ) {

                 if ($this->logger instanceof LoggerInterface) {

@@ -106,7 +106,7 @@ 
                 return false;

             }

 

-            if (isset($this->config[ 'password' ]) AND ! $this->redis->auth($this->config[ 'password' ])) {

+            if (isset($this->config['password']) AND ! $this->redis->auth($this->config['password'])) {

                 if ($this->logger instanceof LoggerInterface) {

                     $this->logger->error('SESSION_E_REDIS_AUTHENTICATION_FAILED', ['Redis']);

                 }

@@ -350,7 +350,7 @@ 
             $this->redis->setTimeout($this->lockKey, 300);

 

             if ($this->fingerprint !== ($fingerprint = md5($session_data))) {

-                if ($this->redis->set($this->prefixKey . $session_id, $session_data, $this->config[ 'lifetime' ])) {

+                if ($this->redis->set($this->prefixKey . $session_id, $session_data, $this->config['lifetime'])) {

                     $this->fingerprint = $fingerprint;

 

                     return true;

@@ -359,7 +359,7 @@ 
                 return false;

             }

 

-            return $this->redis->setTimeout($this->prefixKey . $session_id, $this->config[ 'lifetime' ]);

+            return $this->redis->setTimeout($this->prefixKey . $session_id, $this->config['lifetime']);

         }

 

         return false;

src/DataStructures/Config.php

Spacing +27 added lines, -27 removed lines

@@ -32,33 +32,33 @@ 
     public function __construct(array $config)

     {

         // Define Session Name

-        $config[ 'name' ] = isset($config[ 'name' ]) ? $config[ 'name' ] : 'o2session';

+        $config['name'] = isset($config['name']) ? $config['name'] : 'o2session';

 

         // Define Session Match IP

-        $config[ 'match' ][ 'ip' ] = isset($config[ 'match' ][ 'ip' ]) ? $config[ 'match' ][ 'ip' ] : false;

+        $config['match']['ip'] = isset($config['match']['ip']) ? $config['match']['ip'] : false;

 

         // Re-Define Session Name base on Match IP

-        $config[ 'name' ] = $config[ 'name' ] . ':' . ($config[ 'match' ][ 'ip' ] ? $_SERVER[ 'REMOTE_ADDR' ] . ':' : '');

-        $config[ 'name' ] = rtrim($config[ 'name' ], ':');

+        $config['name'] = $config['name'] . ':' . ($config['match']['ip'] ? $_SERVER['REMOTE_ADDR'] . ':' : '');

+        $config['name'] = rtrim($config['name'], ':');

 

-        if (isset($config[ 'handler' ])) {

-            $config[ 'handler' ] = $config[ 'handler' ] === 'files' ? 'file' : $config[ 'handler' ];

+        if (isset($config['handler'])) {

+            $config['handler'] = $config['handler'] === 'files' ? 'file' : $config['handler'];

             // $config[ 'handler' ] = $config[ 'handler' ] === 'memcache' ? 'memcached' : $config[ 'handler' ];

         }

 

-        if ($config[ 'handler' ] === 'file') {

-            if (isset($config[ 'filePath' ])) {

-                $config[ 'filePath' ] = str_replace(['\\', '/'], DIRECTORY_SEPARATOR, $config[ 'filePath' ]);

+        if ($config['handler'] === 'file') {

+            if (isset($config['filePath'])) {

+                $config['filePath'] = str_replace(['\\', '/'], DIRECTORY_SEPARATOR, $config['filePath']);

 

-                if ( ! is_dir($config[ 'filePath' ])) {

+                if ( ! is_dir($config['filePath'])) {

                     if (defined('PATH_CACHE')) {

-                        $config[ 'filePath' ] = PATH_CACHE . $config[ 'filePath' ];

+                        $config['filePath'] = PATH_CACHE . $config['filePath'];

                     } else {

-                        $config[ 'filePath' ] = sys_get_temp_dir() . DIRECTORY_SEPARATOR . $config[ 'filePath' ];

+                        $config['filePath'] = sys_get_temp_dir() . DIRECTORY_SEPARATOR . $config['filePath'];

                     }

                 }

             } elseif (defined('PATH_CACHE')) {

-                $config[ 'filePath' ] = PATH_CACHE . 'sessions';

+                $config['filePath'] = PATH_CACHE . 'sessions';

             } else {

                 $this->path = sys_get_temp_dir() . DIRECTORY_SEPARATOR . implode(

                         DIRECTORY_SEPARATOR,

@@ -66,37 +66,37 @@ 
                     );

             }

 

-            $config[ 'filePath' ] = rtrim($config[ 'filePath' ], DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;

+            $config['filePath'] = rtrim($config['filePath'], DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;

 

-            if ( ! is_writable($config[ 'filePath' ])) {

-                if ( ! file_exists($config[ 'filePath' ])) {

-                    @mkdir($config[ 'filePath' ], 0777, true);

+            if ( ! is_writable($config['filePath'])) {

+                if ( ! file_exists($config['filePath'])) {

+                    @mkdir($config['filePath'], 0777, true);

                 }

             }

         }

 

-        if (empty($config[ 'cookie' ]) AND php_sapi_name() !== 'cli') {

-            $config[ 'cookie' ] = [

+        if (empty($config['cookie']) AND php_sapi_name() !== 'cli') {

+            $config['cookie'] = [

                 'name'     => 'o2session',

                 'lifetime' => 7200,

-                'domain'   => isset($_SERVER[ 'HTTP_HOST' ]) ? $_SERVER[ 'HTTP_HOST' ] : $_SERVER[ 'SERVER_NAME' ],

+                'domain'   => isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : $_SERVER['SERVER_NAME'],

                 'path'     => '/',

                 'secure'   => false,

                 'httpOnly' => false,

             ];

         }

 

-        if ( ! isset($config[ 'regenerate' ])) {

-            $config[ 'regenerate' ][ 'destroy' ] = false;

-            $config[ 'regenerate' ][ 'lifetime' ] = 600;

+        if ( ! isset($config['regenerate'])) {

+            $config['regenerate']['destroy'] = false;

+            $config['regenerate']['lifetime'] = 600;

         }

 

-        if ( ! isset($config[ 'lifetime' ])) {

-            $config[ 'lifetime' ] = $config[ 'cookie' ][ 'lifetime' ];

+        if ( ! isset($config['lifetime'])) {

+            $config['lifetime'] = $config['cookie']['lifetime'];

         }

 

-        if ( ! isset($config[ 'path' ])) {

-            $config[ 'path' ] = '/';

+        if ( ! isset($config['path'])) {

+            $config['path'] = '/';

         }

 

         parent::__construct($config, Config::CAMELCASE_OFFSET);