djsmithme / Cache

Tests/Cache/CacheTest.php

Spacing +37 added lines, -37 removed lines

@@ -39,7 +39,7 @@ 
     {
         $key = 21021000;
         $this->expectException(InvalidArgumentException::class);
-        $this->cache->set($key,'value');
+        $this->cache->set($key, 'value');
     }
 
     /**
@@ -205,7 +205,7 @@ 
     /**
      *
      */
-    public function testGetMultiple(){
+    public function testGetMultiple() {
 
         $expected = [
             'foo' => 'fooValue',
@@ -215,7 +215,7 @@ 
 
         $i = 0;
 
-        foreach ($expected as $key => $value){
+        foreach ($expected as $key => $value) {
 
             $this->storageMock->expects($this->at($i))
                 ->method('get')
@@ -235,7 +235,7 @@ 
     /**
      *
      */
-    public function testSetMultiple(){
+    public function testSetMultiple() {
 
         $keys = [
             'foo' => 'fooValue',
@@ -249,7 +249,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(
@@ -261,20 +261,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(
@@ -290,15 +290,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;
             }
 
@@ -317,7 +317,7 @@ 
     /**
      * Test that storage clear is called.
      */
-    public function testclear(){
+    public function testclear() {
         $this->storageMock->expects($this->once())
             ->method('clear');
         $this->cache->clear();
@@ -326,7 +326,7 @@ 
     /**
      * Test that array has keys.
      */
-    public function testArrayHasKeys(){
+    public function testArrayHasKeys() {
         $data = ['a' => 'foo', 'b' => 'bar'];
 
         $reflector = new \ReflectionClass(Cache::class);
@@ -340,9 +340,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);
@@ -352,8 +352,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(Cache::class);
         $method = $reflector->getMethod('_hasFailure');
         $method->setAccessible(true);
@@ -365,8 +365,8 @@ 
     /**
      * Test array doesn't contain a failure.
      */
-    public function testHasNoFailure(){
-        $results = [true,true,true,true,true];
+    public function testHasNoFailure() {
+        $results = [true, true, true, true, true];
         $reflector = new \ReflectionClass(Cache::class);
         $method = $reflector->getMethod('_hasFailure');
         $method->setAccessible(true);
@@ -378,8 +378,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(Cache::class);
         $method = $reflector->getMethod('_isTraversable');
         $method->setAccessible(true);
@@ -391,7 +391,7 @@ 
     /**
      * Test that string is not Traversable
      */
-    public function testIsNotTraversable(){
+    public function testIsNotTraversable() {
         $this->expectException(InvalidArgumentException::class);
         $data = 'some-random-string';
         $reflector = new \ReflectionClass(Cache::class);
@@ -403,13 +403,13 @@ 
     /**
      * Test that instance of Iterator is traversable
      */
-    public function testIsTraversableIterator(){
+    public function testIsTraversableIterator() {
         $iterator = new class implements \Iterator {
-            public function current(){}
-            public function next(){}
-            public function key(){}
-            public function valid(){}
-            public function rewind(){}
+            public function current() {}
+            public function next() {}
+            public function key() {}
+            public function valid() {}
+            public function rewind() {}
         };
         $reflector = new \ReflectionClass(Cache::class);
         $method = $reflector->getMethod('_isTraversable');
@@ -423,11 +423,11 @@ 
     /**
      * Private functions
      */
-    public function test_isValidKeyValid(){}
-    public function test_isValidKeyInvalid(){}
-    public function test_checkTraversableArray(){}
-    public function test_checkTraversableTraversable(){}
-    public function test_checkTraversableException(){}
-    public function test_hasFailureNoFailure(){}
-    public function test_hasFailureException(){}
+    public function test_isValidKeyValid() {}
+    public function test_isValidKeyInvalid() {}
+    public function test_checkTraversableArray() {}
+    public function test_checkTraversableTraversable() {}
+    public function test_checkTraversableException() {}
+    public function test_hasFailureNoFailure() {}
+    public function test_hasFailureException() {}
 }

Src/Cache/Cache.php

Spacing +16 added lines, -16 removed lines

@@ -37,13 +37,13 @@ 
     public function set($key, $value, $ttl = null)
     {
         //convert to timestamp from now.
-        if ($ttl instanceof \DateInterval){
+        if ($ttl instanceof \DateInterval) {
             $dateTime = new \DateTime();
-            $dateTime->add( $ttl );
+            $dateTime->add($ttl);
             $ttl = $dateTime->getTimestamp() - time();
         }
 
-        if (!is_int($ttl) ||  $ttl === null){
+        if (!is_int($ttl) || $ttl === null) {
             throw new InvalidArgumentException('$ttl can only be an instance of \DateInterval, int or null');
         }
 
@@ -86,7 +86,7 @@ 
     {
         $this->_isValidKey($key);
 
-        if ($this->cache->has($key)){
+        if ($this->cache->has($key)) {
             return $this->cache->get($key);
         }
 
@@ -127,7 +127,7 @@ 
         $this->_isTraversable($keys);
         $result = [];
 
-        foreach ((array)$keys as $key){
+        foreach ((array)$keys as $key) {
             $cachedItem = $this->cache->get($key);
             $result[$key] = (null !== $cachedItem) ? $cachedItem : $default;
         }
@@ -155,11 +155,11 @@ 
         $this->_isTraversable($values);
         $results = [];
 
-        foreach ((array)$values as $key => $value){
+        foreach ((array)$values as $key => $value) {
             $results[] = $this->cache->set($key, $value, $ttl);
         }
 
-        if ($this->_hasFailure($results)){
+        if ($this->_hasFailure($results)) {
             return false;
         }
 
@@ -182,11 +182,11 @@ 
         $this->_isTraversable($keys);
         $results = [];
 
-        foreach ((array)$keys as $key){
+        foreach ((array)$keys as $key) {
             $results[] = $this->cache->delete($key);
         }
 
-        if ($this->_hasFailure($results)){
+        if ($this->_hasFailure($results)) {
             return false;
         }
 
@@ -209,8 +209,8 @@ 
      * @param $key
      * @throws InvalidArgumentException
      */
-    private function _isValidKey($key){
-        if (!is_string($key)){
+    private function _isValidKey($key) {
+        if (!is_string($key)) {
             throw new InvalidArgumentException('provided key must be a valid string');
         }
     }
@@ -223,9 +223,9 @@ 
      * @return bool
      * @internal
      */
-    private function _isTraversable($data){
+    private function _isTraversable($data) {
 
-        if (is_array($data) || $data instanceof \Traversable){
+        if (is_array($data) || $data instanceof \Traversable) {
             return true;
         }
 
@@ -239,7 +239,7 @@ 
      */
     private function _hasKeys(array $arr)
     {
-        if (array() === $arr || array_keys($arr) === range(0, count($arr) - 1)){
+        if (array() === $arr || array_keys($arr) === range(0, count($arr) - 1)) {
             throw new InvalidArgumentException('Keys missing');
         }
 
@@ -253,8 +253,8 @@ 
      * @return bool
      * @internal
      */
-    private function _hasFailure(array $results){
-        if (in_array(false, $results)){
+    private function _hasFailure(array $results) {
+        if (in_array(false, $results)) {
             return true;
         }
         return false;