Completed
Pull Request — v5.1 (#346)
by
unknown
05:08 queued 02:29
created
tests/AbstractProxy.test.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -42,10 +42,10 @@
 block discarded – undo
42 42
 if (!is_object($driverInstance->getItem('test'))) {
43 43
     echo '[FAIL] $driverInstance->getItem() returned an invalid var type:' . gettype($driverInstance) . "\n";
44 44
     $status = 1;
45
-}else if(!($driverInstance->getItem('test') instanceof ExtendedCacheItemInterface)){
45
+} else if (!($driverInstance->getItem('test') instanceof ExtendedCacheItemInterface)) {
46 46
     echo '[FAIL] $driverInstance->getItem() returned an invalid class that does not implements ExtendedCacheItemInterface: ' . get_class($driverInstance) . "\n";
47 47
     $status = 1;
48
-}else{
48
+} else {
49 49
     echo '[PASS] $driverInstance->getItem() returned a valid class that implements ExtendedCacheItemInterface: ' . get_class($driverInstance) . "\n";
50 50
 }
51 51
 
Please login to merge, or discard this patch.
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -42,10 +42,10 @@
 block discarded – undo
42 42
 if (!is_object($driverInstance->getItem('test'))) {
43 43
     echo '[FAIL] $driverInstance->getItem() returned an invalid var type:' . gettype($driverInstance) . "\n";
44 44
     $status = 1;
45
-}else if(!($driverInstance->getItem('test') instanceof ExtendedCacheItemInterface)){
45
+} else if(!($driverInstance->getItem('test') instanceof ExtendedCacheItemInterface)){
46 46
     echo '[FAIL] $driverInstance->getItem() returned an invalid class that does not implements ExtendedCacheItemInterface: ' . get_class($driverInstance) . "\n";
47 47
     $status = 1;
48
-}else{
48
+} else{
49 49
     echo '[PASS] $driverInstance->getItem() returned a valid class that implements ExtendedCacheItemInterface: ' . get_class($driverInstance) . "\n";
50 50
 }
51 51
 
Please login to merge, or discard this patch.
src/phpFastCache/Entities/driverStatistic.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
     }
53 53
 
54 54
     /**
55
-     * @return int|bool Return size in octet or false if no information available
55
+     * @return string Return size in octet or false if no information available
56 56
      */
57 57
     public function getSize()
58 58
     {
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
     }
61 61
 
62 62
     /**
63
-     * @return mixed
63
+     * @return string
64 64
      */
65 65
     public function getData()
66 66
     {
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
     }
69 69
 
70 70
     /**
71
-     * @param $info
71
+     * @param string $info
72 72
      * @return $this
73 73
      */
74 74
     public function setInfo($info)
Please login to merge, or discard this patch.
src/phpFastCache/Core/Pool/ExtendedCacheItemPoolTrait.php 3 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -334,7 +334,7 @@
 block discarded – undo
334 334
 
335 335
     /**
336 336
      * @internal This method de-register an item from $this->itemInstances
337
-     * @param CacheItemInterface|string $item
337
+     * @param CacheItemInterface $item
338 338
      * @throws \InvalidArgumentException
339 339
      */
340 340
     protected function deregisterItem($item)
Please login to merge, or discard this patch.
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
      */
48 48
     public function getItemsAsJsonString(array $keys = [], $option = 0, $depth = 512)
49 49
     {
50
-        $callback = function(CacheItemInterface $item){
50
+        $callback = function(CacheItemInterface $item) {
51 51
             return $item->get();
52 52
         };
53 53
         return json_encode(array_map($callback, array_values($this->getItems($keys))), $option, $depth);
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
                  *
76 76
                  * #headache
77 77
                  */
78
-                return array_filter($this->getItems(array_unique(array_keys($items))), function(ExtendedCacheItemInterface $item){
78
+                return array_filter($this->getItems(array_unique(array_keys($items))), function(ExtendedCacheItemInterface $item) {
79 79
                     return $item->isHit();
80 80
                 });
81 81
             } else {
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
      */
118 118
     public function getItemsByTagsAsJsonString(array $tagNames, $option = 0, $depth = 512)
119 119
     {
120
-        $callback = function(CacheItemInterface $item){
120
+        $callback = function(CacheItemInterface $item) {
121 121
             return $item->get();
122 122
         };
123 123
 
@@ -302,7 +302,7 @@  discard block
 block discarded – undo
302 302
      */
303 303
     public function detachItem(CacheItemInterface $item)
304 304
     {
305
-        if(isset($this->itemInstances[$item->getKey()])){
305
+        if (isset($this->itemInstances[$item->getKey()])) {
306 306
             $this->deregisterItem($item);
307 307
         }
308 308
     }
@@ -324,9 +324,9 @@  discard block
 block discarded – undo
324 324
      */
325 325
     public function attachItem(CacheItemInterface $item)
326 326
     {
327
-        if(isset($this->itemInstances[$item->getKey()]) && spl_object_hash($item) !== spl_object_hash($this->itemInstances[ $item->getKey() ])){
327
+        if (isset($this->itemInstances[$item->getKey()]) && spl_object_hash($item) !== spl_object_hash($this->itemInstances[$item->getKey()])) {
328 328
             throw new \LogicException('The item already exists and cannot be overwritten because the Spl object hash mismatches ! You probably tried to re-attach a detached item which has been already retrieved from cache.');
329
-        }else{
329
+        } else {
330 330
             $this->itemInstances[$item->getKey()] = $item;
331 331
         }
332 332
     }
@@ -339,15 +339,15 @@  discard block
 block discarded – undo
339 339
      */
340 340
     protected function deregisterItem($item)
341 341
     {
342
-        if($item instanceof CacheItemInterface){
343
-            unset($this->itemInstances[ $item->getKey() ]);
342
+        if ($item instanceof CacheItemInterface) {
343
+            unset($this->itemInstances[$item->getKey()]);
344 344
 
345
-        }else if(is_string($item)){
346
-            unset($this->itemInstances[ $item ]);
347
-        }else{
345
+        } else if (is_string($item)) {
346
+            unset($this->itemInstances[$item]);
347
+        } else {
348 348
             throw new \InvalidArgumentException('Invalid type for $item variable');
349 349
         }
350
-        if(gc_enabled()){
350
+        if (gc_enabled()) {
351 351
             gc_collect_cycles();
352 352
         }
353 353
     }
@@ -363,8 +363,8 @@  discard block
 block discarded – undo
363 363
      */
364 364
     public function isAttached(CacheItemInterface $item)
365 365
     {
366
-        if(isset($this->itemInstances[$item->getKey()])){
367
-            return spl_object_hash($item) === spl_object_hash($this->itemInstances[ $item->getKey() ]);
366
+        if (isset($this->itemInstances[$item->getKey()])) {
367
+            return spl_object_hash($item) === spl_object_hash($this->itemInstances[$item->getKey()]);
368 368
         }
369 369
         return null;
370 370
     }
Please login to merge, or discard this patch.
Braces   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -326,7 +326,7 @@  discard block
 block discarded – undo
326 326
     {
327 327
         if(isset($this->itemInstances[$item->getKey()]) && spl_object_hash($item) !== spl_object_hash($this->itemInstances[ $item->getKey() ])){
328 328
             throw new \LogicException('The item already exists and cannot be overwritten because the Spl object hash mismatches ! You probably tried to re-attach a detached item which has been already retrieved from cache.');
329
-        }else{
329
+        } else{
330 330
             $this->itemInstances[$item->getKey()] = $item;
331 331
         }
332 332
     }
@@ -342,9 +342,9 @@  discard block
 block discarded – undo
342 342
         if($item instanceof CacheItemInterface){
343 343
             unset($this->itemInstances[ $item->getKey() ]);
344 344
 
345
-        }else if(is_string($item)){
345
+        } else if(is_string($item)){
346 346
             unset($this->itemInstances[ $item ]);
347
-        }else{
347
+        } else{
348 348
             throw new \InvalidArgumentException('Invalid type for $item variable');
349 349
         }
350 350
         if(gc_enabled()){
Please login to merge, or discard this patch.
tests/AttachingDetachingMethods.test.php 2 patches
Braces   +4 added lines, -5 removed lines patch added patch discarded remove patch
@@ -24,10 +24,10 @@  discard block
 block discarded – undo
24 24
 if (!is_object($driverInstance)) {
25 25
     echo '[FAIL] CacheManager::getInstance() returned an invalid variable type:' . gettype($driverInstance) . "\n";
26 26
     $status = 1;
27
-}else if(!($driverInstance instanceof CacheItemPoolInterface)){
27
+} else if(!($driverInstance instanceof CacheItemPoolInterface)){
28 28
     echo '[FAIL] CacheManager::getInstance() returned an invalid class:' . get_class($driverInstance) . "\n";
29 29
     $status = 1;
30
-}else{
30
+} else{
31 31
     $key = 'test_attaching_detaching';
32 32
 
33 33
     $itemDetached = $driverInstance->getItem($key);
@@ -37,8 +37,7 @@  discard block
 block discarded – undo
37 37
     if(!$driverInstance->isAttached($itemDetached))
38 38
     {
39 39
         echo '[PASS] ExtendedCacheItemPoolInterface::isAttached() identified $itemDetached as being detached.' . "\n";
40
-    }
41
-    else
40
+    } else
42 41
     {
43 42
         echo '[FAIL] ExtendedCacheItemPoolInterface::isAttached() failed to identify $itemDetached as to be detached.' . "\n";
44 43
         $status = 1;
@@ -48,7 +47,7 @@  discard block
 block discarded – undo
48 47
         $driverInstance->attachItem($itemDetached);
49 48
         echo '[FAIL] ExtendedCacheItemPoolInterface::attachItem() attached $itemDetached without trowing an error.' . "\n";
50 49
         $status = 1;
51
-    }catch(\LogicException $e){
50
+    } catch(\LogicException $e){
52 51
         echo '[PASS] ExtendedCacheItemPoolInterface::attachItem() failed to attach $itemDetached by trowing a LogicException exception.' . "\n";
53 52
     }
54 53
 
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -24,17 +24,17 @@  discard block
 block discarded – undo
24 24
 if (!is_object($driverInstance)) {
25 25
     echo '[FAIL] CacheManager::getInstance() returned an invalid variable type:' . gettype($driverInstance) . "\n";
26 26
     $status = 1;
27
-}else if(!($driverInstance instanceof CacheItemPoolInterface)){
27
+} else if (!($driverInstance instanceof CacheItemPoolInterface)) {
28 28
     echo '[FAIL] CacheManager::getInstance() returned an invalid class:' . get_class($driverInstance) . "\n";
29 29
     $status = 1;
30
-}else{
30
+} else {
31 31
     $key = 'test_attaching_detaching';
32 32
 
33 33
     $itemDetached = $driverInstance->getItem($key);
34 34
     $driverInstance->detachItem($itemDetached);
35 35
     $itemAttached = $driverInstance->getItem($key);
36 36
 
37
-    if($driverInstance->isAttached($itemDetached) !== true)
37
+    if ($driverInstance->isAttached($itemDetached) !== true)
38 38
     {
39 39
         echo '[PASS] ExtendedCacheItemPoolInterface::isAttached() identified $itemDetached as being detached.' . "\n";
40 40
     }
@@ -44,11 +44,11 @@  discard block
 block discarded – undo
44 44
         $status = 1;
45 45
     }
46 46
 
47
-    try{
47
+    try {
48 48
         $driverInstance->attachItem($itemDetached);
49 49
         echo '[FAIL] ExtendedCacheItemPoolInterface::attachItem() attached $itemDetached without trowing an error.' . "\n";
50 50
         $status = 1;
51
-    }catch(\LogicException $e){
51
+    } catch (\LogicException $e) {
52 52
         echo '[PASS] ExtendedCacheItemPoolInterface::attachItem() failed to attach $itemDetached by trowing a LogicException exception.' . "\n";
53 53
     }
54 54
 
Please login to merge, or discard this patch.
src/phpFastCache/Drivers/Predis/Driver.php 2 patches
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -127,14 +127,14 @@  discard block
 block discarded – undo
127 127
     protected function driverConnect()
128 128
     {
129 129
         $server = isset($this->config[ 'redis' ]) ? $this->config[ 'redis' ] : [
130
-          'host' => '127.0.0.1',
131
-          'port' => '6379',
132
-          'password' => '',
133
-          'database' => '',
130
+            'host' => '127.0.0.1',
131
+            'port' => '6379',
132
+            'password' => '',
133
+            'database' => '',
134 134
         ];
135 135
 
136 136
         $config = [
137
-          'host' => $server[ 'host' ],
137
+            'host' => $server[ 'host' ],
138 138
         ];
139 139
 
140 140
         $port = isset($server[ 'port' ]) ? $server[ 'port' ] : '';
@@ -184,9 +184,9 @@  discard block
 block discarded – undo
184 184
         $date = (isset($info['Server'][ 'uptime_in_seconds' ]) ? (new \DateTime())->setTimestamp(time() - $info['Server'][ 'uptime_in_seconds' ]) : 'unknown date');
185 185
 
186 186
         return (new driverStatistic())
187
-          ->setData(implode(', ', array_keys($this->itemInstances)))
188
-          ->setRawData($this->instance->info())
189
-          ->setSize($size)
190
-          ->setInfo(sprintf("The Redis daemon v%s is up since %s.\n For more information see RawData. \n Driver size includes the memory allocation size.", $version, $date->format(DATE_RFC2822)));
187
+            ->setData(implode(', ', array_keys($this->itemInstances)))
188
+            ->setRawData($this->instance->info())
189
+            ->setSize($size)
190
+            ->setInfo(sprintf("The Redis daemon v%s is up since %s.\n For more information see RawData. \n Driver size includes the memory allocation size.", $version, $date->format(DATE_RFC2822)));
191 191
     }
192 192
 }
193 193
\ No newline at end of file
Please login to merge, or discard this patch.
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
      */
127 127
     protected function driverConnect()
128 128
     {
129
-        $server = isset($this->config[ 'redis' ]) ? $this->config[ 'redis' ] : [
129
+        $server = isset($this->config['redis']) ? $this->config['redis'] : [
130 130
           'host' => '127.0.0.1',
131 131
           'port' => '6379',
132 132
           'password' => '',
@@ -134,32 +134,32 @@  discard block
 block discarded – undo
134 134
         ];
135 135
 
136 136
         $config = [
137
-          'host' => $server[ 'host' ],
137
+          'host' => $server['host'],
138 138
         ];
139 139
 
140
-        $port = isset($server[ 'port' ]) ? $server[ 'port' ] : '';
140
+        $port = isset($server['port']) ? $server['port'] : '';
141 141
         if ($port != '') {
142
-            $config[ 'port' ] = $port;
142
+            $config['port'] = $port;
143 143
         }
144 144
 
145
-        $password = isset($server[ 'password' ]) ? $server[ 'password' ] : '';
145
+        $password = isset($server['password']) ? $server['password'] : '';
146 146
         if ($password != '') {
147
-            $config[ 'password' ] = $password;
147
+            $config['password'] = $password;
148 148
         }
149 149
 
150
-        $database = isset($server[ 'database' ]) ? $server[ 'database' ] : '';
150
+        $database = isset($server['database']) ? $server['database'] : '';
151 151
         if ($database != '') {
152
-            $config[ 'database' ] = $database;
152
+            $config['database'] = $database;
153 153
         }
154 154
 
155
-        $timeout = isset($server[ 'timeout' ]) ? $server[ 'timeout' ] : '';
155
+        $timeout = isset($server['timeout']) ? $server['timeout'] : '';
156 156
         if ($timeout != '') {
157
-            $config[ 'timeout' ] = $timeout;
157
+            $config['timeout'] = $timeout;
158 158
         }
159 159
 
160
-        $read_write_timeout = isset($server[ 'read_write_timeout' ]) ? $server[ 'read_write_timeout' ] : '';
160
+        $read_write_timeout = isset($server['read_write_timeout']) ? $server['read_write_timeout'] : '';
161 161
         if ($read_write_timeout != '') {
162
-            $config[ 'read_write_timeout' ] = $read_write_timeout;
162
+            $config['read_write_timeout'] = $read_write_timeout;
163 163
         }
164 164
 
165 165
         $this->instance = new PredisClient($config);
@@ -181,7 +181,7 @@  discard block
 block discarded – undo
181 181
         $info = $this->instance->info();
182 182
         $size = (isset($info['Memory']['used_memory']) ? $info['Memory']['used_memory'] : 0);
183 183
         $version = (isset($info['Server']['redis_version']) ? $info['Server']['redis_version'] : 0);
184
-        $date = (isset($info['Server'][ 'uptime_in_seconds' ]) ? (new \DateTime())->setTimestamp(time() - $info['Server'][ 'uptime_in_seconds' ]) : 'unknown date');
184
+        $date = (isset($info['Server']['uptime_in_seconds']) ? (new \DateTime())->setTimestamp(time() - $info['Server']['uptime_in_seconds']) : 'unknown date');
185 185
 
186 186
         return (new driverStatistic())
187 187
           ->setData(implode(', ', array_keys($this->itemInstances)))
Please login to merge, or discard this patch.
src/phpFastCache/Drivers/Devtrue/Driver.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -57,7 +57,7 @@
 block discarded – undo
57 57
 
58 58
     /**
59 59
      * @param \Psr\Cache\CacheItemInterface $item
60
-     * @return mixed
60
+     * @return boolean
61 61
      * @throws \InvalidArgumentException
62 62
      */
63 63
     public function driverWrite(CacheItemInterface $item)
Please login to merge, or discard this patch.
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -79,9 +79,9 @@  discard block
 block discarded – undo
79 79
     protected function driverRead(CacheItemInterface $item)
80 80
     {
81 81
         return [
82
-          self::DRIVER_DATA_WRAPPER_INDEX => true,
83
-          self::DRIVER_TAGS_WRAPPER_INDEX => [],
84
-          self::DRIVER_TIME_WRAPPER_INDEX => new \DateTime(),
82
+            self::DRIVER_DATA_WRAPPER_INDEX => true,
83
+            self::DRIVER_TAGS_WRAPPER_INDEX => [],
84
+            self::DRIVER_TIME_WRAPPER_INDEX => new \DateTime(),
85 85
         ];
86 86
     }
87 87
 
@@ -131,9 +131,9 @@  discard block
 block discarded – undo
131 131
     {
132 132
         $stat = new driverStatistic();
133 133
         $stat->setInfo('[Devtrue] A void info string')
134
-          ->setSize(0)
135
-          ->setData(implode(', ', array_keys($this->itemInstances)))
136
-          ->setRawData(true);
134
+            ->setSize(0)
135
+            ->setData(implode(', ', array_keys($this->itemInstances)))
136
+            ->setRawData(true);
137 137
 
138 138
         return $stat;
139 139
     }
Please login to merge, or discard this patch.
src/phpFastCache/Drivers/Zendshm/Driver.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -133,8 +133,8 @@
 block discarded – undo
133 133
         $stats = (array) zend_shm_cache_info();
134 134
         return (new driverStatistic())
135 135
             ->setData(implode(', ', array_keys($this->namespaces)))
136
-            ->setInfo(sprintf("The Zend memory have %d item(s) in cache.\n For more information see RawData.",$stats[ 'items_total' ]))
136
+            ->setInfo(sprintf("The Zend memory have %d item(s) in cache.\n For more information see RawData.", $stats['items_total']))
137 137
             ->setRawData($stats)
138
-            ->setSize($stats[ 'memory_total' ]);
138
+            ->setSize($stats['memory_total']);
139 139
     }
140 140
 }
141 141
\ No newline at end of file
Please login to merge, or discard this patch.