Completed
Pull Request — final (#332)
by Georges
02:53
created
tests/AttachingDetachingMethods.test.php 2 patches
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))
37
+    if (!$driverInstance->isAttached($itemDetached))
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.
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.
src/phpFastCache/Core/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.
src/phpFastCache/Core/StandardPsr6StructureTrait.php 2 patches
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
                         $item->setHit(true);
73 73
                     }
74 74
                 } else {
75
-                    $item->expiresAfter(abs((int) $this->getConfig()[ 'defaultTtl' ]));
75
+                    $item->expiresAfter(abs((int) $this->getConfig()['defaultTtl']));
76 76
                 }
77 77
 
78 78
             }
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
             throw new \InvalidArgumentException(sprintf('$key must be a string, got type "%s" instead.', gettype($key)));
81 81
         }
82 82
 
83
-        return $this->itemInstances[ $key ];
83
+        return $this->itemInstances[$key];
84 84
     }
85 85
 
86 86
     /**
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
     public function setItem(CacheItemInterface $item)
92 92
     {
93 93
         if ($this->getClassNamespace() . '\\Item' === get_class($item)) {
94
-            $this->itemInstances[ $item->getKey() ] = $item;
94
+            $this->itemInstances[$item->getKey()] = $item;
95 95
 
96 96
             return $this;
97 97
         } else {
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
     {
109 109
         $collection = [];
110 110
         foreach ($keys as $key) {
111
-            $collection[ $key ] = $this->getItem($key);
111
+            $collection[$key] = $this->getItem($key);
112 112
         }
113 113
 
114 114
         return $collection;
@@ -190,8 +190,8 @@  discard block
 block discarded – undo
190 190
          * @var ExtendedCacheItemInterface $item
191 191
          */
192 192
         if (!array_key_exists($item->getKey(), $this->itemInstances)) {
193
-            $this->itemInstances[ $item->getKey() ] = $item;
194
-        } else if(spl_object_hash($item) !== spl_object_hash($this->itemInstances[ $item->getKey() ])){
193
+            $this->itemInstances[$item->getKey()] = $item;
194
+        } else if (spl_object_hash($item) !== spl_object_hash($this->itemInstances[$item->getKey()])) {
195 195
             throw new \RuntimeException('Spl object hash mismatches ! You probably tried to save a detached item which has been already retrieved from cache.');
196 196
         }
197 197
 
@@ -214,12 +214,12 @@  discard block
 block discarded – undo
214 214
     public function saveDeferred(CacheItemInterface $item)
215 215
     {
216 216
         if (!array_key_exists($item->getKey(), $this->itemInstances)) {
217
-            $this->itemInstances[ $item->getKey() ] = $item;
218
-        }else if(spl_object_hash($item) !== spl_object_hash($this->itemInstances[ $item->getKey() ])){
217
+            $this->itemInstances[$item->getKey()] = $item;
218
+        } else if (spl_object_hash($item) !== spl_object_hash($this->itemInstances[$item->getKey()])) {
219 219
             throw new \RuntimeException('Spl object hash mismatches ! You probably tried to save a detached item which has been already retrieved from cache.');
220 220
         }
221 221
 
222
-        return $this->deferredList[ $item->getKey() ] = $item;
222
+        return $this->deferredList[$item->getKey()] = $item;
223 223
     }
224 224
 
225 225
     /**
@@ -232,7 +232,7 @@  discard block
 block discarded – undo
232 232
         foreach ($this->deferredList as $key => $item) {
233 233
             $result = $this->save($item);
234 234
             if ($return !== false) {
235
-                unset($this->deferredList[ $key ]);
235
+                unset($this->deferredList[$key]);
236 236
                 $return = $result;
237 237
             }
238 238
         }
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -215,7 +215,7 @@
 block discarded – undo
215 215
     {
216 216
         if (!array_key_exists($item->getKey(), $this->itemInstances)) {
217 217
             $this->itemInstances[ $item->getKey() ] = $item;
218
-        }else if(spl_object_hash($item) !== spl_object_hash($this->itemInstances[ $item->getKey() ])){
218
+        } else if(spl_object_hash($item) !== spl_object_hash($this->itemInstances[ $item->getKey() ])){
219 219
             throw new \RuntimeException('Spl object hash mismatches ! You probably tried to save a detached item which has been already retrieved from cache.');
220 220
         }
221 221
 
Please login to merge, or discard this patch.