Merge branch 'cs/zendframework/zendframework#7047-zend-cache-psr2-com…

…pliance' Close zendframework/zendframework#7047
zendframework · Dec 16, 2014 · 624cae1 · 624cae1
2 parents 8e5ae36 + af071f3
commit 624cae1
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 29 deletions.
diff --git a/src/Storage/Adapter/Dba.php b/src/Storage/Adapter/Dba.php
@@ -225,7 +225,8 @@ public function clearByNamespace($namespace)
 
         $this->_open();
 
-        do { // Workaround for PHP-Bug #62491 & #62492
+        do {
+            // Workaround for PHP-Bug #62491 & #62492
             $recheck     = false;
             $internalKey = dba_firstkey($this->handle);
             while ($internalKey !== false && $internalKey !== null) {

diff --git a/src/Storage/Capabilities.php b/src/Storage/Capabilities.php
@@ -40,8 +40,8 @@ class Capabilities
     /**
      * Expire read
      *
-    * If it's NULL the capability isn't set and the getter
-    * returns the base capability or the default value.
+     * If it's NULL the capability isn't set and the getter
+     * returns the base capability or the default value.
      *
      * @var null|bool
      */
@@ -50,8 +50,8 @@ class Capabilities
     /**
      * Max. key length
      *
-    * If it's NULL the capability isn't set and the getter
-    * returns the base capability or the default value.
+     * If it's NULL the capability isn't set and the getter
+     * returns the base capability or the default value.
      *
      * @var null|int
      */
@@ -60,8 +60,8 @@ class Capabilities
     /**
      * Min. TTL (0 means items never expire)
      *
-    * If it's NULL the capability isn't set and the getter
-    * returns the base capability or the default value.
+     * If it's NULL the capability isn't set and the getter
+     * returns the base capability or the default value.
      *
      * @var null|int
      */
@@ -70,8 +70,8 @@ class Capabilities
     /**
      * Max. TTL (0 means infinite)
      *
-    * If it's NULL the capability isn't set and the getter
-    * returns the base capability or the default value.
+     * If it's NULL the capability isn't set and the getter
+     * returns the base capability or the default value.
      *
      * @var null|int
      */
@@ -80,8 +80,8 @@ class Capabilities
     /**
      * Namespace is prefix
      *
-    * If it's NULL the capability isn't set and the getter
-    * returns the base capability or the default value.
+     * If it's NULL the capability isn't set and the getter
+     * returns the base capability or the default value.
      *
      * @var null|bool
      */
@@ -90,8 +90,8 @@ class Capabilities
     /**
      * Namespace separator
      *
-    * If it's NULL the capability isn't set and the getter
-    * returns the base capability or the default value.
+     * If it's NULL the capability isn't set and the getter
+     * returns the base capability or the default value.
      *
      * @var null|string
      */
@@ -100,28 +100,28 @@ class Capabilities
     /**
      * Static ttl
      *
-    * If it's NULL the capability isn't set and the getter
-    * returns the base capability or the default value.
+     * If it's NULL the capability isn't set and the getter
+     * returns the base capability or the default value.
      *
      * @var null|bool
      */
     protected $staticTtl;
 
-   /**
-    * Supported datatypes
-    *
-    * If it's NULL the capability isn't set and the getter
-    * returns the base capability or the default value.
-    *
-    * @var null|array
-    */
+    /**
+     * Supported datatypes
+     *
+     * If it's NULL the capability isn't set and the getter
+     * returns the base capability or the default value.
+     *
+     * @var null|array
+     */
     protected $supportedDatatypes;
 
     /**
      * Supported metdata
      *
-    * If it's NULL the capability isn't set and the getter
-    * returns the base capability or the default value.
+     * If it's NULL the capability isn't set and the getter
+     * returns the base capability or the default value.
      *
      * @var null|array
      */
@@ -130,8 +130,8 @@ class Capabilities
     /**
      * TTL precision
      *
-    * If it's NULL the capability isn't set and the getter
-    * returns the base capability or the default value.
+     * If it's NULL the capability isn't set and the getter
+     * returns the base capability or the default value.
      *
      * @var null|int
      */
@@ -140,8 +140,8 @@ class Capabilities
     /**
      * Use request time
      *
-    * If it's NULL the capability isn't set and the getter
-    * returns the base capability or the default value.
+     * If it's NULL the capability isn't set and the getter
+     * returns the base capability or the default value.
      *
      * @var null|bool
      */