djsmithme / Cache

Tests/Cache/Storage/FileStorageTest.php

Indentation +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
      * Test that clear is called.
      */
     public function testClear(){
-       $this->assertEquals($this->cacheStorage->clear(), true);
+        $this->assertEquals($this->cacheStorage->clear(), true);
     }
 
     /**

Spacing +25 added lines, -25 removed lines

@@ -29,8 +29,8 @@ 
      */
     public function setUp()
     {
-        $this->testDir = __DIR__ . '/cacheTest';
-        $this->cacheStorage = new FileStorage( $this->testDir, new \DateInterval('P1M'));
+        $this->testDir = __DIR__.'/cacheTest';
+        $this->cacheStorage = new FileStorage($this->testDir, new \DateInterval('P1M'));
     }
 
     /**
@@ -45,7 +45,7 @@ 
     /**
      * Test that CacheException is thrown if directory is not valid/writable.
      */
-    public function testUnwritableDirectory(){
+    public function testUnwritableDirectory() {
 
         $this->expectException(CacheException::class);
         $this->cacheStorage = new FileStorage('php://memory', new \DateInterval('P1M'));
@@ -54,67 +54,67 @@ 
     /**
      * Test that set is called.
      */
-    public function testSet(){
-        $actual = $this->cacheStorage->set('key','value',60*60);
+    public function testSet() {
+        $actual = $this->cacheStorage->set('key', 'value', 60 * 60);
         $this->assertEquals(true, $actual);
     }
 
     /**
      * Test has when not value is found.
      */
-    public function testHasNoValue(){
+    public function testHasNoValue() {
         $this->assertEquals($this->cacheStorage->has('someRandomKey'), false);
     }
 
     /**
      * Test has when value is found.
      */
-    public function testHas(){
-        $this->cacheStorage->set('foo','bar');
+    public function testHas() {
+        $this->cacheStorage->set('foo', 'bar');
         $this->assertEquals($this->cacheStorage->has('foo'), true);
     }
 
     /**
      * Test has when value is found but has expired.
      */
-    public function testHasExpired(){
-        $this->cacheStorage->set('expired','bar', -1200);
+    public function testHasExpired() {
+        $this->cacheStorage->set('expired', 'bar', -1200);
         $this->assertEquals($this->cacheStorage->has('expired'), false);
     }
 
     /**
      * Test that clear is called.
      */
-    public function testClear(){
+    public function testClear() {
        $this->assertEquals($this->cacheStorage->clear(), true);
     }
 
     /**
      * Test that get returns a found key.
      */
-    public function testGet(){
+    public function testGet() {
         $expected = 'bat';
-        $this->cacheStorage->set('baz',$expected);
+        $this->cacheStorage->set('baz', $expected);
         $actual = $this->cacheStorage->get('baz');
         $this->assertEquals($expected, $actual);
     }
 
-    public function testDelete(){
+    public function testDelete() {
         $this->cacheStorage->delete('baz');
     }
 
-    public function testCreateCacheItem(){
+    public function testCreateCacheItem() {
 
         $reflector = new \ReflectionClass(FileStorage::class);
         $method = $reflector->getMethod('_createCacheItem');
         $method->setAccessible(true);
 
-        $key= 'my-key_+';
+        $key = 'my-key_+';
         $value = 'my-value';
         $ttl = 60 * 60 * 7;
 
         $expected = [
-            'file' => $this->testDir . DIRECTORY_SEPARATOR . implode('.',[$key, FileStorage::EXTENSION]),
+            'file' => $this->testDir.DIRECTORY_SEPARATOR.implode('.', [$key, FileStorage::EXTENSION]),
             'data' => json_encode([$ttl, $value])
         ];
 
@@ -122,7 +122,7 @@ 
         $this->assertEquals($expected, $actual);
     }
 
-    public function testCreateCacheItemInvalidKey(){
+    public function testCreateCacheItemInvalidKey() {
 
         $this->expectException(InvalidArgumentException::class);
         $reflector = new \ReflectionClass(FileStorage::class);
@@ -134,18 +134,18 @@ 
         $method->invokeArgs($this->cacheStorage, [$key, $value, $ttl]);
     }
 
-    public function testFetchCacheNoItem(){
+    public function testFetchCacheNoItem() {
         $reflector = new \ReflectionClass(FileStorage::class);
         $method = $reflector->getMethod('_fetchCacheFile');
         $method->setAccessible(true);
-        $key= 'unknown';
+        $key = 'unknown';
         $actual = $method->invokeArgs($this->cacheStorage, [$key]);
         $this->assertEquals(false, $actual);
     }
 
-    public function testFetchCacheValid(){
+    public function testFetchCacheValid() {
 
-        $key= 'my-item';
+        $key = 'my-item';
         $ttl = 60 * 60;
         $value = 'some-value';
 
@@ -163,8 +163,8 @@ 
         $this->assertEquals($expected, $actual);
     }
 
-    public function testFetchCacheExpired(){
-        $key= 'my-item';
+    public function testFetchCacheExpired() {
+        $key = 'my-item';
         $ttl = -1500;
         $value = 'some-value';
         $this->cacheStorage->set($key, $value, $ttl);
@@ -182,7 +182,7 @@ 
     {
         $dir = $this->testDir;
 
-        if (is_dir( $dir)){
+        if (is_dir($dir)) {
             array_map('unlink', glob("$dir/*.*"));
         }
         \rmdir($dir);

Src/Cache/Storage/FileStorage.php

Indentation +4 added lines, -4 removed lines

@@ -99,10 +99,10 @@
      * @return bool
      */
     public function has($key){
-       if ($this->_fetchCacheFile($key)){
-         return true;
-       }
-       return false;
+        if ($this->_fetchCacheFile($key)){
+            return true;
+        }
+        return false;
     }
 
     /**

Spacing +21 added lines, -21 removed lines

@@ -45,13 +45,13 @@ 
      */
     public function __construct($directory, DateInterval $ttl)
     {
-        if (!is_string($directory)){
+        if (!is_string($directory)) {
             throw new InvalidArgumentException('Directory must be a valid string');
         }
 
         $this->dir = $directory;
 
-        if(!@mkdir($this->dir, 0755) && !is_dir($this->dir)){
+        if (!@mkdir($this->dir, 0755) && !is_dir($this->dir)) {
             throw new CacheException('unable to create directory');
         }
 
@@ -75,9 +75,9 @@ 
         $ttl = time() + $this->getTtlTimestamp($ttl);
         $cacheItem = $this->_createCacheItem($key, $value, $ttl);
 
-        if (null !== $value){
-            \file_put_contents($cacheItem['file'],$cacheItem['data']);
-            if (!file_exists($cacheItem['file'])){
+        if (null !== $value) {
+            \file_put_contents($cacheItem['file'], $cacheItem['data']);
+            if (!file_exists($cacheItem['file'])) {
                 return false;
             }
         }
@@ -98,8 +98,8 @@ 
      *
      * @return bool
      */
-    public function has($key){
-       if ($this->_fetchCacheFile($key)){
+    public function has($key) {
+       if ($this->_fetchCacheFile($key)) {
          return true;
        }
        return false;
@@ -113,8 +113,8 @@ 
      * @return mixed The value of the item from the cache, or $default in case of cache miss.
      *
      */
-    public function get($key){
-        if ($this->has($key)){
+    public function get($key) {
+        if ($this->has($key)) {
             return $this->previousRequest[1];
         }
         return null;
@@ -137,14 +137,14 @@ 
      *
      * @return bool True on success and false on failure.
      */
-    public function clear(){
-        if (is_dir( $this->dir )){
+    public function clear() {
+        if (is_dir($this->dir)) {
             array_map('unlink', glob("$this->dir/*.*"));
         }
 
         $data = glob("$this->dir/*.*");
 
-        if (!empty($data)){
+        if (!empty($data)) {
             return false;
         }
 
@@ -158,20 +158,20 @@ 
      * @return bool|mixed
      * @internal
      */
-    private function _fetchCacheFile($key){
+    private function _fetchCacheFile($key) {
 
-        $cacheFile = implode('.',[$key, FileStorage::EXTENSION]);
-        $cacheLocation = $this->dir . DIRECTORY_SEPARATOR . $cacheFile;
+        $cacheFile = implode('.', [$key, FileStorage::EXTENSION]);
+        $cacheLocation = $this->dir.DIRECTORY_SEPARATOR.$cacheFile;
         $this->previousRequest = false;
 
-        if (file_exists($cacheLocation)){
+        if (file_exists($cacheLocation)) {
 
             $data = \file_get_contents($cacheLocation);
             $cacheData = json_decode($data, TRUE);
             $this->previousRequest = $cacheData;
 
             //cache has expired
-            if ( $cacheData[0] < time() ){
+            if ($cacheData[0] < time()) {
                 \unlink($cacheLocation);
                 $this->previousRequest = false;
             }
@@ -188,16 +188,16 @@ 
      * @return array
      * @throws InvalidArgumentException
      */
-    private function _createCacheItem($key, $value, $ttl){
+    private function _createCacheItem($key, $value, $ttl) {
 
-        if (preg_match('/[\\/\\*\\\\\?.]+/i', $key)){
+        if (preg_match('/[\\/\\*\\\\\?.]+/i', $key)) {
             throw new InvalidArgumentException('$key must be a valid string');
         }
 
-        $filename = implode('.',[(string)$key, FileStorage::EXTENSION]);
+        $filename = implode('.', [(string)$key, FileStorage::EXTENSION]);
 
         return [
-            'file' => $this->dir . DIRECTORY_SEPARATOR . $filename,
+            'file' => $this->dir.DIRECTORY_SEPARATOR.$filename,
             'data' => json_encode([$ttl, $value])
         ];
     }

Tests/Cache/CacheTest.php

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 use Ds\Cache\Cache;
 use Ds\Cache\CacheStorageInterface;
-use Ds\Cache\NullStorage;
 use Psr\SimpleCache\InvalidArgumentException;
 use Tests\Cache\Mock\IteratorMock;
 

Spacing +29 added lines, -29 removed lines

@@ -40,7 +40,7 @@ 
     {
         $key = 21021000;
         $this->expectException(InvalidArgumentException::class);
-        $this->cache->set($key,'value');
+        $this->cache->set($key, 'value');
     }
 
     /**
@@ -206,7 +206,7 @@ 
     /**
      *
      */
-    public function testGetMultiple(){
+    public function testGetMultiple() {
 
         $expected = [
             'foo' => 'fooValue',
@@ -216,7 +216,7 @@ 
 
         $i = 0;
 
-        foreach ($expected as $key => $value){
+        foreach ($expected as $key => $value) {
 
             $this->storageMock->expects($this->at($i))
                 ->method('get')
@@ -236,7 +236,7 @@ 
     /**
      *
      */
-    public function testSetMultiple(){
+    public function testSetMultiple() {
 
         $keys = [
             'foo' => 'fooValue',
@@ -250,7 +250,7 @@ 
         $i = 0;
         $expires = 60 * 60;
 
-        foreach ($keys as $key => $value){
+        foreach ($keys as $key => $value) {
             $this->storageMock->expects($this->at($i))
                 ->method('set')
                 ->with(
@@ -262,14 +262,14 @@ 
             $i++;
         }
 
-        $actual = $this->cache->setMultiple($keys,$expires);
+        $actual = $this->cache->setMultiple($keys, $expires);
         $this->assertEquals($expected, $actual);
     }
 
     /**
      *
      */
-    public function testSetMultipleWithFailure(){
+    public function testSetMultipleWithFailure() {
 
         $keys = [
             'foo' => 'fooValue',
@@ -283,11 +283,11 @@ 
         $i = 0;
         $expires = 60 * 60;
 
-        foreach ($keys as $key => $value){
+        foreach ($keys as $key => $value) {
 
             $status = $addStatus;
 
-            if ($i === 1){
+            if ($i === 1) {
                 $status = false;
             }
 
@@ -302,20 +302,20 @@ 
             $i++;
         }
 
-        $actual = $this->cache->setMultiple($keys,$expires);
+        $actual = $this->cache->setMultiple($keys, $expires);
         $this->assertEquals($expected, $actual);
     }
 
     /**
      *
      */
-    public function testDeleteMultiple(){
+    public function testDeleteMultiple() {
 
-        $keys = ['foo','bar','baz'];
+        $keys = ['foo', 'bar', 'baz'];
         $deleteStatus = true;
         $expected = true;
 
-        foreach ($keys as $i => $key){
+        foreach ($keys as $i => $key) {
             $this->storageMock->expects($this->at($i))
                 ->method('delete')
                 ->with(
@@ -331,15 +331,15 @@ 
     /**
      *
      */
-    public function testDeleteMultipleFailure(){
+    public function testDeleteMultipleFailure() {
 
-        $keys = ['foo','bar','baz'];
+        $keys = ['foo', 'bar', 'baz'];
         $expected = false;
         $deleteStatus = true;
 
-        foreach ($keys as $i => $key){
+        foreach ($keys as $i => $key) {
 
-            if ($i === 1){
+            if ($i === 1) {
                 $deleteStatus = false;
             }
 
@@ -358,7 +358,7 @@ 
     /**
      * Test that storage clear is called.
      */
-    public function testclear(){
+    public function testclear() {
         $this->storageMock->expects($this->once())
             ->method('clear');
         $this->cache->clear();
@@ -367,7 +367,7 @@ 
     /**
      * Test that array has keys.
      */
-    public function testArrayHasKeys(){
+    public function testArrayHasKeys() {
         $data = ['a' => 'foo', 'b' => 'bar'];
 
         $reflector = new \ReflectionClass('\Ds\Cache\Cache');
@@ -381,9 +381,9 @@ 
     /**
      * Test exception thrown when array is missing keys.
      */
-    public function testArrayHasNoKeys(){
+    public function testArrayHasNoKeys() {
         $this->expectException(InvalidArgumentException::class);
-        $data = ['foo','bar'];
+        $data = ['foo', 'bar'];
         $reflector = new \ReflectionClass(Cache::class);
         $method = $reflector->getMethod('_hasKeys');
         $method->setAccessible(true);
@@ -393,8 +393,8 @@ 
     /**
      * Test array contains a failure.
      */
-    public function testHasFailure(){
-        $results = [true,true,true,false,true];
+    public function testHasFailure() {
+        $results = [true, true, true, false, true];
         $reflector = new \ReflectionClass('\Ds\Cache\Cache');
         $method = $reflector->getMethod('_hasFailure');
         $method->setAccessible(true);
@@ -406,8 +406,8 @@ 
     /**
      *
      */
-    public function testHasNoFailure(){
-        $results = [true,true,true,true,true];
+    public function testHasNoFailure() {
+        $results = [true, true, true, true, true];
         $reflector = new \ReflectionClass('\Ds\Cache\Cache');
         $method = $reflector->getMethod('_hasFailure');
         $method->setAccessible(true);
@@ -419,8 +419,8 @@ 
     /**
      * Test that array is Traversable
      */
-    public function testIsTraversable(){
-        $data = ['a','b','c','d'];
+    public function testIsTraversable() {
+        $data = ['a', 'b', 'c', 'd'];
         $reflector = new \ReflectionClass('\Ds\Cache\Cache');
         $method = $reflector->getMethod('_isTraversable');
         $method->setAccessible(true);
@@ -432,7 +432,7 @@ 
     /**
      * Test that string is not Traversable
      */
-    public function testIsNotTraversable(){
+    public function testIsNotTraversable() {
         $this->expectException(InvalidArgumentException::class);
         $data = 'some-random-string';
         $reflector = new \ReflectionClass('\Ds\Cache\Cache');
@@ -444,7 +444,7 @@ 
     /**
      * Test that instance of Iterator is traversable
      */
-    public function testIsTraversableIterator(){
+    public function testIsTraversableIterator() {
         $iterator = new IteratorMock();
         $reflector = new \ReflectionClass('\Ds\Cache\Cache');
         $method = $reflector->getMethod('_isTraversable');

Tests/Cache/Mock/IteratorMock.php

Spacing +6 added lines, -6 removed lines

@@ -9,10 +9,10 @@
  *
  * @package Tests\Cache\Mock
  */
-class IteratorMock implements \Iterator{
-    public function current(){}
-    public function next(){}
-    public function key(){}
-    public function valid(){}
-    public function rewind(){}
+class IteratorMock implements \Iterator {
+    public function current() {}
+    public function next() {}
+    public function key() {}
+    public function valid() {}
+    public function rewind() {}
 }

Tests/Cache/Mock/AbstractStorageMock.php

Spacing +6 added lines, -6 removed lines

@@ -11,10 +11,10 @@
  *
  * @package Tests\Cache\Mock
  */
-class AbstractStorageMock extends AbstractStorage{
-    public function set($key, $value, $ttl = null){}
-    public function has($key){}
-    public function get($key){}
-    public function delete($key){}
-    public function clear(){}
+class AbstractStorageMock extends AbstractStorage {
+    public function set($key, $value, $ttl = null) {}
+    public function has($key) {}
+    public function get($key) {}
+    public function delete($key) {}
+    public function clear() {}
 }
\ No newline at end of file