Completed
Pull Request — final (#444)
by
unknown
02:12
created
src/phpFastCache/Core/MemcacheDriverCollisionDetectorTrait.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@
 block discarded – undo
27 27
                 return true;
28 28
             } else if (constant($CONSTANT_NAME) !== $driverName) {
29 29
                 trigger_error('Memcache collision detected, you used both Memcache and Memcached driver in your script, this may leads to unexpected behaviours',
30
-                  E_USER_WARNING);
30
+                    E_USER_WARNING);
31 31
 
32 32
                 return false;
33 33
             }
Please login to merge, or discard this patch.
src/phpFastCache/Cache/ItemBaseTrait.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -349,7 +349,7 @@  discard block
 block discarded – undo
349 349
     public function removeTag($tagName)
350 350
     {
351 351
         if (($key = array_search($tagName, $this->tags)) !== false) {
352
-            unset($this->tags[ $key ]);
352
+            unset($this->tags[$key]);
353 353
             $this->removedTags[] = $tagName;
354 354
         }
355 355
 
@@ -392,7 +392,7 @@  discard block
 block discarded – undo
392 392
     final public function __debugInfo()
393 393
     {
394 394
         $info = get_object_vars($this);
395
-        $info[ 'driver' ] = 'object(' . get_class($info[ 'driver' ]) . ')';
395
+        $info['driver'] = 'object(' . get_class($info['driver']) . ')';
396 396
 
397 397
         return (array) $info;
398 398
     }
Please login to merge, or discard this patch.
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -129,21 +129,21 @@
 block discarded – undo
129 129
     public function expiresAt($expiration)
130 130
     {
131 131
         $_php_ver = (float) PHP_VERSION;
132
-		if ($_php_ver >= 5.5) {
132
+        if ($_php_ver >= 5.5) {
133 133
 		    
134 134
             if ($expiration instanceof \DateTimeInterface) {
135
-                     $this->expirationDate = $expiration;
136
-             } else {
135
+                        $this->expirationDate = $expiration;
136
+                } else {
137 137
             throw new \InvalidArgumentException('$expiration must be an object implementing the DateTimeInterface');
138
-             }
138
+                }
139 139
             
140
-		} else if ($_php_ver <= 5.4) {
141
-			if ($expiration instanceof \DateTime) {
142
-                     $this->expirationDate = $expiration;
143
-             } else {
140
+        } else if ($_php_ver <= 5.4) {
141
+            if ($expiration instanceof \DateTime) {
142
+                        $this->expirationDate = $expiration;
143
+                } else {
144 144
             throw new \InvalidArgumentException('$expiration must be an object implementing the DateTime');
145
-             }
146
-		} 
145
+                }
146
+        } 
147 147
         
148 148
         
149 149
 
Please login to merge, or discard this patch.
src/phpFastCache/Drivers/Cookie/Item.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@
 block discarded – undo
42 42
             $this->driver->setItem($this);
43 43
         } else {
44 44
             throw new \InvalidArgumentException(sprintf('$key must be a string, got type "%s" instead.',
45
-              gettype($key)));
45
+                gettype($key)));
46 46
         }
47 47
     }
48 48
 
Please login to merge, or discard this patch.
src/phpFastCache/Cache/DriverBaseTrait.php 3 patches
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -214,9 +214,9 @@
 block discarded – undo
214 214
     public function driverPreWrap(ExtendedCacheItemInterface $item)
215 215
     {
216 216
         return [
217
-          self::DRIVER_DATA_WRAPPER_INDEX => $item->get(),
218
-          self::DRIVER_TIME_WRAPPER_INDEX => $item->getExpirationDate(),
219
-          self::DRIVER_TAGS_WRAPPER_INDEX => $item->getTags(),
217
+            self::DRIVER_DATA_WRAPPER_INDEX => $item->get(),
218
+            self::DRIVER_TIME_WRAPPER_INDEX => $item->getExpirationDate(),
219
+            self::DRIVER_TAGS_WRAPPER_INDEX => $item->getTags(),
220 220
         ];
221 221
     }
222 222
 
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
         if (is_array($config_name)) {
61 61
             $this->config = array_merge($this->config, $config_name);
62 62
         } else {
63
-            $this->config[ $config_name ] = $value;
63
+            $this->config[$config_name] = $value;
64 64
         }
65 65
     }
66 66
 
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
      */
180 180
     public function driverUnwrapData(array $wrapper)
181 181
     {
182
-        return $wrapper[ self::DRIVER_DATA_WRAPPER_INDEX ];
182
+        return $wrapper[self::DRIVER_DATA_WRAPPER_INDEX];
183 183
     }
184 184
 
185 185
     /**
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
      */
189 189
     public function driverUnwrapTags(array $wrapper)
190 190
     {
191
-        return $wrapper[ self::DRIVER_TAGS_WRAPPER_INDEX ];
191
+        return $wrapper[self::DRIVER_TAGS_WRAPPER_INDEX];
192 192
     }
193 193
 
194 194
 
@@ -198,7 +198,7 @@  discard block
 block discarded – undo
198 198
      */
199 199
     public function driverUnwrapTime(array $wrapper)
200 200
     {
201
-        return $wrapper[ self::DRIVER_TIME_WRAPPER_INDEX ];
201
+        return $wrapper[self::DRIVER_TIME_WRAPPER_INDEX];
202 202
     }
203 203
 
204 204
     /**
@@ -223,7 +223,7 @@  discard block
 block discarded – undo
223 223
          * on tags item, it can leads
224 224
          * to an infinite recursive calls
225 225
          */
226
-        if(strpos($item->getKey(), self::DRIVER_TAGS_KEY_PREFIX ) === 0){
226
+        if (strpos($item->getKey(), self::DRIVER_TAGS_KEY_PREFIX) === 0) {
227 227
             throw new \LogicException('Trying to set tag(s) to an Tag item index: ' . $item->getKey());
228 228
         }
229 229
 
@@ -266,7 +266,7 @@  discard block
 block discarded – undo
266 266
         foreach ($tagsItems as $tagsItem) {
267 267
             $data = (array) $tagsItem->get();
268 268
 
269
-            unset($data[ $item->getKey() ]);
269
+            unset($data[$item->getKey()]);
270 270
             $tagsItem->set($data);
271 271
 
272 272
             /**
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -64,7 +64,7 @@
 block discarded – undo
64 64
     }
65 65
 
66 66
     /**
67
-     * @param $file
67
+     * @param string $file
68 68
      * @return string
69 69
      * @throws \Exception
70 70
      */
Please login to merge, or discard this patch.
src/phpFastCache/Drivers/Leveldb/Driver.php 3 patches
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -176,9 +176,9 @@
 block discarded – undo
176 176
     public function getStats()
177 177
     {
178 178
         return (new driverStatistic())
179
-          ->setData(implode(', ', array_keys($this->itemInstances)))
180
-          ->setInfo('Number of files used to build the cache: ' . Directory::getFileCount($this->getLeveldbFile()))
181
-          ->setSize(Directory::dirSize($this->getLeveldbFile()));
179
+            ->setData(implode(', ', array_keys($this->itemInstances)))
180
+            ->setInfo('Number of files used to build the cache: ' . Directory::getFileCount($this->getLeveldbFile()))
181
+            ->setSize(Directory::dirSize($this->getLeveldbFile()));
182 182
     }
183 183
 
184 184
     /**
Please login to merge, or discard this patch.
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -17,7 +17,6 @@
 block discarded – undo
17 17
 use LevelDB as LeveldbClient;
18 18
 use phpFastCache\Core\DriverAbstract;
19 19
 use phpFastCache\Core\PathSeekerTrait;
20
-use phpFastCache\Core\StandardPsr6StructureTrait;
21 20
 use phpFastCache\Entities\driverStatistic;
22 21
 use phpFastCache\Exceptions\phpFastCacheDriverCheckException;
23 22
 use phpFastCache\Exceptions\phpFastCacheDriverException;
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -126,7 +126,7 @@
 block discarded – undo
126 126
     }
127 127
 
128 128
     /**
129
-     * @return bool
129
+     * @return boolean|null
130 130
      */
131 131
     protected function driverConnect()
132 132
     {
Please login to merge, or discard this patch.
src/phpFastCache/Drivers/Files/Driver.php 4 patches
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -254,9 +254,9 @@
 block discarded – undo
254 254
         }
255 255
 
256 256
         $stat->setData(implode(', ', array_keys($this->itemInstances)))
257
-          ->setRawData([])
258
-          ->setSize(Directory::dirSize($path))
259
-          ->setInfo('Number of files used to build the cache: ' . Directory::getFileCount($path));
257
+            ->setRawData([])
258
+            ->setSize(Directory::dirSize($path))
259
+            ->setInfo('Number of files used to build the cache: ' . Directory::getFileCount($path));
260 260
 
261 261
         return $stat;
262 262
     }
Please login to merge, or discard this patch.
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -16,7 +16,6 @@
 block discarded – undo
16 16
 
17 17
 use phpFastCache\Core\DriverAbstract;
18 18
 use phpFastCache\Core\PathSeekerTrait;
19
-use phpFastCache\Core\StandardPsr6StructureTrait;
20 19
 use phpFastCache\Entities\driverStatistic;
21 20
 use phpFastCache\Exceptions\phpFastCacheDriverCheckException;
22 21
 use phpFastCache\Exceptions\phpFastCacheDriverException;
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -77,7 +77,7 @@
 block discarded – undo
77 77
             /**
78 78
              * Skip if Existing Caching in Options
79 79
              */
80
-            if (isset($this->config[ 'skipExisting' ]) && $this->config[ 'skipExisting' ] == true && file_exists($file_path)) {
80
+            if (isset($this->config['skipExisting']) && $this->config['skipExisting'] == true && file_exists($file_path)) {
81 81
                 $content = $this->readfile($file_path);
82 82
                 $old = $this->decode($content);
83 83
                 $toWrite = false;
Please login to merge, or discard this patch.
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
 
61 61
     /**
62 62
      * @param \Psr\Cache\CacheItemInterface $item
63
-     * @return mixed
63
+     * @return boolean|null
64 64
      * @throws \InvalidArgumentException
65 65
      */
66 66
     protected function driverWrite(CacheItemInterface $item)
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
166 166
     /**
167 167
      * @param string $optionName
168 168
      * @param mixed $optionValue
169
-     * @return bool
169
+     * @return boolean|null
170 170
      * @throws \InvalidArgumentException
171 171
      */
172 172
     public static function isValidOption($optionName, $optionValue)
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
194 194
     }
195 195
 
196 196
     /**
197
-     * @return array
197
+     * @return string[]
198 198
      */
199 199
     public static function getValidOptions()
200 200
     {
@@ -202,7 +202,7 @@  discard block
 block discarded – undo
202 202
     }
203 203
 
204 204
     /**
205
-     * @return array
205
+     * @return string[]
206 206
      */
207 207
     public static function getRequiredOptions()
208 208
     {
Please login to merge, or discard this patch.
src/phpFastCache/Util/Directory.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -83,8 +83,8 @@
 block discarded – undo
83 83
 
84 84
         $files = new RecursiveIteratorIterator
85 85
         (
86
-          new RecursiveDirectoryIterator($source, RecursiveDirectoryIterator::SKIP_DOTS),
87
-          RecursiveIteratorIterator::CHILD_FIRST
86
+            new RecursiveDirectoryIterator($source, RecursiveDirectoryIterator::SKIP_DOTS),
87
+            RecursiveIteratorIterator::CHILD_FIRST
88 88
         );
89 89
         
90 90
         foreach ($files as $fileinfo) {
Please login to merge, or discard this patch.
Spacing   +3 added lines, -4 removed lines patch added patch discarded remove patch
@@ -85,8 +85,7 @@  discard block
 block discarded – undo
85 85
             return unlink($source);
86 86
         }
87 87
 
88
-        $files = new RecursiveIteratorIterator
89
-        (
88
+        $files = new RecursiveIteratorIterator(
90 89
           new RecursiveDirectoryIterator($source, RecursiveDirectoryIterator::SKIP_DOTS),
91 90
           RecursiveIteratorIterator::CHILD_FIRST
92 91
         );
@@ -99,7 +98,7 @@  discard block
 block discarded – undo
99 98
                 if (self::rrmdir($fileinfo->getRealPath()) === false) {
100 99
                     return false;
101 100
                 }
102
-            } else if(unlink($fileinfo->getRealPath()) === false) {
101
+            } else if (unlink($fileinfo->getRealPath()) === false) {
103 102
                 return false;
104 103
             }
105 104
         }
@@ -136,7 +135,7 @@  discard block
 block discarded – undo
136 135
         /**
137 136
          * Allows to dereference char
138 137
          */
139
-        $__FILE__ = preg_replace('~^(([a-z0-9\-]+)://)~', '', __FILE__);// remove file protocols such as "phar://" etc.
138
+        $__FILE__ = preg_replace('~^(([a-z0-9\-]+)://)~', '', __FILE__); // remove file protocols such as "phar://" etc.
140 139
         $prefix = $__FILE__[0] === DIRECTORY_SEPARATOR ? DIRECTORY_SEPARATOR : '';
141 140
         return $prefix . implode(DIRECTORY_SEPARATOR, $absolutes);
142 141
     }
Please login to merge, or discard this patch.
src/phpFastCache/Drivers/Redis/Driver.php 2 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -159,9 +159,9 @@
 block discarded – undo
159 159
         $date = (new \DateTime())->setTimestamp(time() - $info[ 'uptime_in_seconds' ]);
160 160
 
161 161
         return (new driverStatistic())
162
-          ->setData(implode(', ', array_keys($this->itemInstances)))
163
-          ->setRawData($info)
164
-          ->setSize($info[ 'used_memory' ])
165
-          ->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.", $info[ 'redis_version' ], $date->format(DATE_RFC2822)));
162
+            ->setData(implode(', ', array_keys($this->itemInstances)))
163
+            ->setRawData($info)
164
+            ->setSize($info[ 'used_memory' ])
165
+            ->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.", $info[ 'redis_version' ], $date->format(DATE_RFC2822)));
166 166
     }
167 167
 }
168 168
\ No newline at end of file
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -122,11 +122,11 @@  discard block
 block discarded – undo
122 122
         } else {
123 123
             $this->instance = $this->instance ?: new RedisClient();
124 124
 
125
-            $host = isset($this->config[ 'host' ]) ? $this->config[ 'host' ] : '127.0.0.1';
126
-            $port = isset($this->config[ 'port' ]) ? (int) $this->config[ 'port' ] : '6379';
127
-            $password = isset($this->config[ 'password' ]) ? $this->config[ 'password' ] : '';
128
-            $database = isset($this->config[ 'database' ]) ? $this->config[ 'database' ] : '';
129
-            $timeout = isset($this->config[ 'timeout' ]) ? $this->config[ 'timeout' ] : '';
125
+            $host = isset($this->config['host']) ? $this->config['host'] : '127.0.0.1';
126
+            $port = isset($this->config['port']) ? (int) $this->config['port'] : '6379';
127
+            $password = isset($this->config['password']) ? $this->config['password'] : '';
128
+            $database = isset($this->config['database']) ? $this->config['database'] : '';
129
+            $timeout = isset($this->config['timeout']) ? $this->config['timeout'] : '';
130 130
 
131 131
             if (!$this->instance->connect($host, (int) $port, (int) $timeout)) {
132 132
                 return false;
@@ -156,12 +156,12 @@  discard block
 block discarded – undo
156 156
     {
157 157
         // used_memory
158 158
         $info = $this->instance->info();
159
-        $date = (new \DateTime())->setTimestamp(time() - $info[ 'uptime_in_seconds' ]);
159
+        $date = (new \DateTime())->setTimestamp(time() - $info['uptime_in_seconds']);
160 160
 
161 161
         return (new driverStatistic())
162 162
           ->setData(implode(', ', array_keys($this->itemInstances)))
163 163
           ->setRawData($info)
164
-          ->setSize($info[ 'used_memory' ])
165
-          ->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.", $info[ 'redis_version' ], $date->format(DATE_RFC2822)));
164
+          ->setSize($info['used_memory'])
165
+          ->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.", $info['redis_version'], $date->format(DATE_RFC2822)));
166 166
     }
167 167
 }
168 168
\ No newline at end of file
Please login to merge, or discard this patch.
src/phpFastCache/Drivers/Memcached/Driver.php 2 patches
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
         $servers = (!empty($this->config[ 'memcache' ]) && is_array($this->config[ 'memcache' ]) ? $this->config[ 'memcache' ] : []);
131 131
         if (count($servers) < 1) {
132 132
             $servers = [
133
-              ['127.0.0.1', 11211],
133
+                ['127.0.0.1', 11211],
134 134
             ];
135 135
         }
136 136
 
@@ -160,9 +160,9 @@  discard block
 block discarded – undo
160 160
         $date = (new \DateTime())->setTimestamp(time() - $stats[ 'uptime' ]);
161 161
 
162 162
         return (new driverStatistic())
163
-          ->setData(implode(', ', array_keys($this->itemInstances)))
164
-          ->setInfo(sprintf("The memcache daemon v%s is up since %s.\n For more information see RawData.", $stats[ 'version' ], $date->format(DATE_RFC2822)))
165
-          ->setRawData($stats)
166
-          ->setSize($stats[ 'bytes' ]);
163
+            ->setData(implode(', ', array_keys($this->itemInstances)))
164
+            ->setInfo(sprintf("The memcache daemon v%s is up since %s.\n For more information see RawData.", $stats[ 'version' ], $date->format(DATE_RFC2822)))
165
+            ->setRawData($stats)
166
+            ->setSize($stats[ 'bytes' ]);
167 167
     }
168 168
 }
169 169
\ No newline at end of file
Please login to merge, or discard this patch.
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
      */
128 128
     protected function driverConnect()
129 129
     {
130
-        $servers = (!empty($this->config[ 'memcache' ]) && is_array($this->config[ 'memcache' ]) ? $this->config[ 'memcache' ] : []);
130
+        $servers = (!empty($this->config['memcache']) && is_array($this->config['memcache']) ? $this->config['memcache'] : []);
131 131
         if (count($servers) < 1) {
132 132
             $servers = [
133 133
               ['127.0.0.1', 11211],
@@ -136,11 +136,11 @@  discard block
 block discarded – undo
136 136
 
137 137
         foreach ($servers as $server) {
138 138
             try {
139
-                if (!$this->instance->addServer($server[ 0 ], $server[ 1 ])) {
139
+                if (!$this->instance->addServer($server[0], $server[1])) {
140 140
                     $this->fallback = true;
141 141
                 }
142
-                if(!empty($server[ 'sasl_user' ]) && !empty($server[ 'sasl_password'])){
143
-                    $this->instance->setSaslAuthData($server[ 'sasl_user' ], $server[ 'sasl_password']);
142
+                if (!empty($server['sasl_user']) && !empty($server['sasl_password'])) {
143
+                    $this->instance->setSaslAuthData($server['sasl_user'], $server['sasl_password']);
144 144
                 }
145 145
             } catch (\Exception $e) {
146 146
                 $this->fallback = true;
@@ -160,16 +160,16 @@  discard block
 block discarded – undo
160 160
     public function getStats()
161 161
     {
162 162
         $stats = (array) $this->instance->getStats();
163
-        $stats[ 'uptime' ] = (isset($stats[ 'uptime' ]) ? $stats[ 'uptime' ] : 0);
164
-        $stats[ 'version' ] = (isset($stats[ 'version' ]) ? $stats[ 'version' ] : 'UnknownVersion');
165
-        $stats[ 'bytes' ] = (isset($stats[ 'bytes' ]) ? $stats[ 'version' ] : 0);
163
+        $stats['uptime'] = (isset($stats['uptime']) ? $stats['uptime'] : 0);
164
+        $stats['version'] = (isset($stats['version']) ? $stats['version'] : 'UnknownVersion');
165
+        $stats['bytes'] = (isset($stats['bytes']) ? $stats['version'] : 0);
166 166
 
167
-        $date = (new \DateTime())->setTimestamp(time() - $stats[ 'uptime' ]);
167
+        $date = (new \DateTime())->setTimestamp(time() - $stats['uptime']);
168 168
 
169 169
         return (new driverStatistic())
170 170
           ->setData(implode(', ', array_keys($this->itemInstances)))
171
-          ->setInfo(sprintf("The memcache daemon v%s is up since %s.\n For more information see RawData.", $stats[ 'version' ], $date->format(DATE_RFC2822)))
171
+          ->setInfo(sprintf("The memcache daemon v%s is up since %s.\n For more information see RawData.", $stats['version'], $date->format(DATE_RFC2822)))
172 172
           ->setRawData($stats)
173
-          ->setSize($stats[ 'bytes' ]);
173
+          ->setSize($stats['bytes']);
174 174
     }
175 175
 }
176 176
\ No newline at end of file
Please login to merge, or discard this patch.