o2system / cache

src/autoload.php

Spacing +1 added lines, -1 removed lines

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

  */

 spl_autoload_register(

-    function ($className) {

+    function($className) {

         if (strpos($className, 'O2System\Cache\\') === false) {

             return;

         }

src/Datastructures/Config.php

Spacing +2 added lines, -2 removed lines

@@ -29,9 +29,9 @@
      */

     public function __construct(array $config)

     {

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

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

             foreach ($config as $poolOffset => $poolConfig) {

-                $config[ $poolOffset ] = new self($poolConfig);

+                $config[$poolOffset] = new self($poolConfig);

             }

         }

 

src/Adapters/Memcached/ItemPool.php

Spacing +6 added lines, -6 removed lines

@@ -57,10 +57,10 @@ 
             $allItems = $this->memcached->getAllKeys();

 

             foreach ($allItems as $server => $metadata) {

-                foreach ($metadata[ 'items' ] AS $itemKey => $itemMetadata) {

+                foreach ($metadata['items'] AS $itemKey => $itemMetadata) {

                     $cacheDump = $this->memcached->getExtendedStats('cachedump', (int)$itemKey);

 

-                    foreach ($cacheDump[ $server ] AS $cacheDumpItemKey => $cacheDumpItemMetadata) {

+                    foreach ($cacheDump[$server] AS $cacheDumpItemKey => $cacheDumpItemMetadata) {

                         $items[] = $this->getItem(str_replace($this->prefixKey, '', $cacheDumpItemKey));

                     }

                 }

@@ -101,7 +101,7 @@ 
         }

 

         $metadata = $this->memcached->get($this->prefixKey . $key);

-        $metadata = isset($metadata[ 0 ]) ? $metadata[ 0 ] : $metadata;

+        $metadata = isset($metadata[0]) ? $metadata[0] : $metadata;

 

         return new Item($key, $metadata);

     }

@@ -201,7 +201,7 @@ 
         }

 

         $keys = array_map(

-            function ($key) {

+            function($key) {

                 return $this->prefixKey . $key;

             },

             $keys

@@ -226,8 +226,8 @@ 
     public function save(CacheItemInterface $item)

     {

         $metadata = $item->getMetadata();

-        $metadata[ 'data' ] = $item->get();

+        $metadata['data'] = $item->get();

 

-        return $this->memcached->set($this->prefixKey . $item->getKey(), $metadata, $metadata[ 'ttl' ]);

+        return $this->memcached->set($this->prefixKey . $item->getKey(), $metadata, $metadata['ttl']);

     }

 }
\ No newline at end of file

src/Adapters/Memcached/Adapter.php

Spacing +23 added lines, -23 removed lines

@@ -105,10 +105,10 @@ 
                 'weight' => 1,

             ];

 

-            $this->memcached->addserver($this->config[ 'host' ], $this->config[ 'port' ]);

-        } elseif (isset($config[ 'servers' ])) {

-            foreach ($config[ 'servers' ] as $server) {

-                $this->config[ $server[ 'host' ] ] = array_merge(

+            $this->memcached->addserver($this->config['host'], $this->config['port']);

+        } elseif (isset($config['servers'])) {

+            foreach ($config['servers'] as $server) {

+                $this->config[$server['host']] = array_merge(

                     [

                         'host'   => '127.0.0.1',

                         'port'   => 11211,

@@ -118,13 +118,13 @@ 
                 );

 

                 if (array_key_exists('status', $server)) {

-                    if ($server[ 'status' ] === false) {

-                        $this->config[ $server[ 'host' ] ][ 'retryInterval' ] = -1;

+                    if ($server['status'] === false) {

+                        $this->config[$server['host']]['retryInterval'] = -1;

 

                         $this->memcached->addserver(

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

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

-                            $this->config[ $server[ 'host' ] ][ 'weight' ]

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

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

+                            $this->config[$server['host']]['weight']

                         );

 

                         continue;

@@ -132,9 +132,9 @@ 
                 }

 

                 $this->memcached->addserver(

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

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

-                    $this->config[ $server[ 'host' ] ][ 'weight' ]

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

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

+                    $this->config[$server['host']]['weight']

                 );

             }

         } else {

@@ -147,25 +147,25 @@ 
                 $config

             );

 

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

-                if ($this->config[ 'status' ] === false) {

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

+                if ($this->config['status'] === false) {

                     $this->memcached->addserver(

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

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

-                        $this->config[ 'weight' ]

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

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

+                        $this->config['weight']

                     );

                 } else {

                     $this->memcached->addserver(

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

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

-                        $this->config[ 'weight' ]

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

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

+                        $this->config['weight']

                     );

                 }

             } else {

                 $this->memcached->addserver(

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

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

-                    $this->config[ 'weight' ]

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

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

+                    $this->config['weight']

                 );

             }

         }

src/Adapters/Memcache/ItemPool.php

Spacing +6 added lines, -6 removed lines

@@ -57,10 +57,10 @@ 
             $allItems = $this->memcache->getExtendedStats('items');

 

             foreach ($allItems as $server => $metadata) {

-                foreach ($metadata[ 'items' ] AS $itemKey => $itemMetadata) {

+                foreach ($metadata['items'] AS $itemKey => $itemMetadata) {

                     $cacheDump = $this->memcache->getExtendedStats('cachedump', (int)$itemKey);

 

-                    foreach ($cacheDump[ $server ] AS $cacheDumpItemKey => $cacheDumpItemMetadata) {

+                    foreach ($cacheDump[$server] AS $cacheDumpItemKey => $cacheDumpItemMetadata) {

                         $items[] = $this->getItem(str_replace($this->prefixKey, '', $cacheDumpItemKey));

                     }

                 }

@@ -101,7 +101,7 @@ 
         }

 

         $metadata = $this->memcache->get($this->prefixKey . $key);

-        $metadata = isset($metadata[ 0 ]) ? $metadata[ 0 ] : $metadata;

+        $metadata = isset($metadata[0]) ? $metadata[0] : $metadata;

 

         return new Item($key, $metadata);

     }

@@ -193,17 +193,17 @@ 
     public function save(CacheItemInterface $item)

     {

         $metadata = $item->getMetadata();

-        $metadata[ 'data' ] = $item->get();

+        $metadata['data'] = $item->get();

 

         if (extension_loaded('zlib')) {

             return $this->memcache->set(

                 $this->prefixKey . $item->getKey(),

                 $metadata,

                 MEMCACHE_COMPRESSED,

-                $metadata[ 'ttl' ]

+                $metadata['ttl']

             );

         } else {

-            return $this->memcache->set($this->prefixKey . $item->getKey(), $metadata, 0, $metadata[ 'ttl' ]);

+            return $this->memcache->set($this->prefixKey . $item->getKey(), $metadata, 0, $metadata['ttl']);

         }

     }

 }
\ No newline at end of file

src/Adapters/Memcache/Adapter.php

Spacing +34 added lines, -34 removed lines

@@ -107,10 +107,10 @@ 
                 'weight'        => 1,

             ];

 

-            $this->memcache->addserver($this->config[ 'host' ], $this->config[ 'port' ]);

-        } elseif (isset($config[ 'servers' ])) {

-            foreach ($config[ 'servers' ] as $server) {

-                $this->config[ $server[ 'host' ] ] = array_merge(

+            $this->memcache->addserver($this->config['host'], $this->config['port']);

+        } elseif (isset($config['servers'])) {

+            foreach ($config['servers'] as $server) {

+                $this->config[$server['host']] = array_merge(

                     [

                         'host'       => '127.0.0.1',

                         'port'       => 11211,

@@ -122,16 +122,16 @@ 
                 );

 

                 if (array_key_exists('status', $server)) {

-                    if ($server[ 'status' ] === false) {

-                        $this->config[ $server[ 'host' ] ][ 'retryInterval' ] = -1;

+                    if ($server['status'] === false) {

+                        $this->config[$server['host']]['retryInterval'] = -1;

 

                         $this->memcache->addserver(

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

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

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

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

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

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

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

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

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

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

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

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

                             false

                         );

 

@@ -140,11 +140,11 @@ 
                 }

 

                 $this->memcache->addserver(

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

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

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

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

-                    $this->config[ $server[ 'host' ] ][ 'timeout' ]

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

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

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

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

+                    $this->config[$server['host']]['timeout']

                 );

             }

         } else {

@@ -159,33 +159,33 @@ 
                 $config

             );

 

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

-                if ($this->config[ 'status' ] === false) {

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

+                if ($this->config['status'] === false) {

                     $this->memcache->addserver(

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

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

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

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

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

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

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

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

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

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

                         -1,

                         false

                     );

                 } else {

                     $this->memcache->addserver(

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

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

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

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

-                        $this->config[ 'timeout' ]

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

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

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

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

+                        $this->config['timeout']

                     );

                 }

             } else {

                 $this->memcache->addserver(

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

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

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

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

-                    $this->config[ 'timeout' ]

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

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

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

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

+                    $this->config['timeout']

                 );

             }

         }

src/Adapters/File/ItemPool.php

Spacing +2 added lines, -2 removed lines

@@ -106,7 +106,7 @@ 
         if (is_file($filename)) {

             $metadata = unserialize(file_get_contents($filename));

 

-            if ($metadata[ 'ttl' ] > 0 AND time() > $metadata[ 'ctime' ] + $metadata[ 'ttl' ]) {

+            if ($metadata['ttl'] > 0 AND time() > $metadata['ctime'] + $metadata['ttl']) {

                 unlink($filename);

             }

 

@@ -229,7 +229,7 @@ 
     public function save(CacheItemInterface $item)

     {

         $metadata = $item->getMetadata();

-        $metadata[ 'data' ] = $item->get();

+        $metadata['data'] = $item->get();

         $metadata = serialize($metadata);

 

         $path = $this->path . $this->prefixKey . $item->getKey() . '.cache';

src/Adapters/File/Adapter.php

Spacing +13 added lines, -13 removed lines

@@ -76,19 +76,19 @@ 
      */

     public function connect(array $config)

     {

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

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

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

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

 

-            if (is_dir($config[ 'path' ])) {

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

+            if (is_dir($config['path'])) {

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

             } elseif (defined('PATH_CACHE')) {

-                if (is_dir($config[ 'path' ])) {

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

+                if (is_dir($config['path'])) {

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

                 } else {

-                    $this->path = PATH_CACHE . str_replace(PATH_CACHE, '', $config[ 'path' ]);

+                    $this->path = PATH_CACHE . str_replace(PATH_CACHE, '', $config['path']);

                 }

             } else {

-                $this->path = sys_get_temp_dir() . DIRECTORY_SEPARATOR . $config[ 'path' ];

+                $this->path = sys_get_temp_dir() . DIRECTORY_SEPARATOR . $config['path'];

             }

         } elseif (defined('PATH_CACHE')) {

             $this->path = PATH_CACHE;

@@ -246,14 +246,14 @@ 
 

         $cacheIterator = new \RegexIterator($directory, '/^.+\.cache/i', \RecursiveRegexIterator::GET_MATCH);

 

-        $stats[ 'path' ] = $this->path;

-        $stats[ 'files' ] = 0;

-        $stats[ 'size' ] = 0;

+        $stats['path'] = $this->path;

+        $stats['files'] = 0;

+        $stats['size'] = 0;

 

         foreach ($cacheIterator as $cacheFiles) {

             foreach ($cacheFiles as $cacheFile) {

-                $stats[ 'files' ]++;

-                $stats[ 'size' ] += filesize($cacheFile);

+                $stats['files']++;

+                $stats['size'] += filesize($cacheFile);

             }

         }

 

src/Adapters/Apc/ItemPool.php

Spacing +3 added lines, -3 removed lines

@@ -57,7 +57,7 @@ 
             $apcIterator = new \APCIterator('user');

 

             foreach ($apcIterator as $item) {

-                $items[] = new Item(str_replace($this->prefixKey, '', $item[ 'key' ]), $item[ 'value' ]);

+                $items[] = new Item(str_replace($this->prefixKey, '', $item['key']), $item['value']);

             }

         } elseif (count($keys)) {

             foreach ($keys as $key) {

@@ -188,8 +188,8 @@ 
     public function save(CacheItemInterface $item)

     {

         $metadata = $item->getMetadata();

-        $metadata[ 'data' ] = $item->get();

+        $metadata['data'] = $item->get();

 

-        return apc_store($this->prefixKey . $item->getKey(), $metadata, $metadata[ 'ttl' ]);

+        return apc_store($this->prefixKey . $item->getKey(), $metadata, $metadata['ttl']);

     }

 }
\ No newline at end of file