MehrAlsNix / zf-couchbase2

src/Cache/Storage/Adapter/Couchbase.php

Doc Comments +2 added lines, -2 removed lines

@@ -170,9 +170,9 @@
     /**
      * Set options.
      *
-     * @param array|\Traversable|CouchbaseOptions $options
+     * @param CouchbaseOptions $options
      *
-     * @return \CouchbaseCluster
+     * @return AbstractAdapter
      *
      * @see    getOptions()
      */

Spacing +19 added lines, -19 removed lines

@@ -68,8 +68,8 @@ 
     public function __construct($options = null)
     {
         if (static::$extCouchbaseMajorVersion === null) {
-            $v = (string) phpversion('couchbase');
-            static::$extCouchbaseMajorVersion = ($v !== '') ? (int) $v[0] : 0;
+            $v = (string)phpversion('couchbase');
+            static::$extCouchbaseMajorVersion = ($v !== '') ? (int)$v[0] : 0;
         }
         if (static::$extCouchbaseMajorVersion < 2) {
             throw new Exception\ExtensionNotLoadedException('Need ext/couchbase version >= 2.0.0');
@@ -77,7 +77,7 @@ 
         parent::__construct($options);
         // reset initialized flag on update option(s)
         $initialized = &$this->initialized;
-        $this->getEventManager()->attach('option', function () use (&$initialized) {
+        $this->getEventManager()->attach('option', function() use (&$initialized) {
             $initialized = false;
         });
     }
@@ -107,7 +107,7 @@ 
     protected function internalSetItem(&$normalizedKey, &$value)
     {
         $memc = $this->getCouchbaseResource();
-        $internalKey = $this->namespacePrefix.$normalizedKey;
+        $internalKey = $this->namespacePrefix . $normalizedKey;
 
         try {
             $memc->upsert($internalKey, $value, ['expiry' => $this->expirationTime()]);
@@ -141,7 +141,7 @@ 
             $this->namespacePrefix = '';
 
             if ($namespace !== '') {
-                $this->namespacePrefix = $namespace.$options->getNamespaceSeparator();
+                $this->namespacePrefix = $namespace . $options->getNamespaceSeparator();
             }
 
             // update initialized flag
@@ -222,7 +222,7 @@ 
     protected function internalAddItem(&$normalizedKey, &$value)
     {
         $memc = $this->getCouchbaseResource();
-        $internalKey = $this->namespacePrefix.$normalizedKey;
+        $internalKey = $this->namespacePrefix . $normalizedKey;
         try {
             $memc->insert($internalKey, $value, ['expiry' => $this->expirationTime()]);
         } catch (\CouchbaseException $e) {
@@ -269,7 +269,7 @@ 
         $namespacedKeyValuePairs = [];
 
         foreach ($normalizedKeyValuePairs as $normalizedKey => &$value) {
-            $namespacedKeyValuePairs[$this->namespacePrefix.$normalizedKey] = ['value' => &$value];
+            $namespacedKeyValuePairs[$this->namespacePrefix . $normalizedKey] = ['value' => &$value];
         }
         unset($value);
 
@@ -340,7 +340,7 @@ 
         $result = true;
 
         try {
-            $memc->remove($this->namespacePrefix.$normalizedKey);
+            $memc->remove($this->namespacePrefix . $normalizedKey);
         } catch (\CouchbaseException $e) {
             $result = false;
         }
@@ -377,7 +377,7 @@ 
     protected function namespacesKeys(array &$normalizedKeys)
     {
         foreach ($normalizedKeys as &$normalizedKey) {
-            $normalizedKey = $this->namespacePrefix.$normalizedKey;
+            $normalizedKey = $this->namespacePrefix . $normalizedKey;
         }
     }
 
@@ -398,7 +398,7 @@ 
     protected function internalCheckAndSetItem(&$token, &$normalizedKey, &$value)
     {
         $memc = $this->getCouchbaseResource();
-        $key = $this->namespacePrefix.$normalizedKey;
+        $key = $this->namespacePrefix . $normalizedKey;
         $success = null;
         $this->internalGetItem($key, $success, $token);
 
@@ -430,7 +430,7 @@ 
      */
     protected function internalGetItem(&$normalizedKey, &$success = null, &$casToken = null)
     {
-        $internalKey = $this->namespacePrefix.$normalizedKey;
+        $internalKey = $this->namespacePrefix . $normalizedKey;
         $memc = $this->getCouchbaseResource();
 
         try {
@@ -467,7 +467,7 @@ 
         $memc = $this->getCouchbaseResource();
         $expiration = $this->expirationTime();
         try {
-            $memc->replace($this->namespacePrefix.$normalizedKey, $value, ['expiry' => $expiration]);
+            $memc->replace($this->namespacePrefix . $normalizedKey, $value, ['expiry' => $expiration]);
         } catch (\CouchbaseException $e) {
             $result = false;
         }
@@ -489,7 +489,7 @@ 
         $redis = $this->getCouchbaseResource();
         try {
             $ttl = $this->getOptions()->getTtl();
-            $redis->touch($this->namespacePrefix.$normalizedKey, $ttl);
+            $redis->touch($this->namespacePrefix . $normalizedKey, $ttl);
         } catch (\CouchbaseException $e) {
             if ($e->getCode() === \COUCHBASE_KEY_EEXISTS
                 || $e->getCode() === \COUCHBASE_KEY_ENOENT
@@ -514,7 +514,7 @@ 
     protected function internalHasItem(&$normalizedKey)
     {
         $memc = $this->getCouchbaseResource();
-        $internalKey = $this->namespacePrefix.$normalizedKey;
+        $internalKey = $this->namespacePrefix . $normalizedKey;
 
         try {
             $result = $memc->get($internalKey)->value;
@@ -526,7 +526,7 @@ 
             }
         }
 
-        return (bool) $result;
+        return (bool)$result;
     }
 
     /**
@@ -620,8 +620,8 @@ 
     protected function internalIncrementItem(&$normalizedKey, &$value)
     {
         $couchbaseBucket = $this->getCouchbaseResource();
-        $internalKey = $this->namespacePrefix.$normalizedKey;
-        $value = (int) $value;
+        $internalKey = $this->namespacePrefix . $normalizedKey;
+        $value = (int)$value;
         $newValue = false;
 
         try {
@@ -652,8 +652,8 @@ 
     protected function internalDecrementItem(&$normalizedKey, &$value)
     {
         $couchbaseBucket = $this->getCouchbaseResource();
-        $internalKey = $this->namespacePrefix.$normalizedKey;
-        $value = - (int) $value;
+        $internalKey = $this->namespacePrefix . $normalizedKey;
+        $value = - (int)$value;
         $newValue = false;
 
         try {

src/Cache/Storage/Adapter/CouchbaseOptions.php

Spacing +3 added lines, -3 removed lines

@@ -61,7 +61,7 @@ 
      */
     public function setNamespace($namespace)
     {
-        $namespace = (string) $namespace;
+        $namespace = (string)$namespace;
 
         if (128 < strlen($namespace)) {
             throw new Exception\InvalidArgumentException(sprintf(
@@ -82,7 +82,7 @@ 
      */
     public function setNamespaceSeparator($namespaceSeparator)
     {
-        $namespaceSeparator = (string) $namespaceSeparator;
+        $namespaceSeparator = (string)$namespaceSeparator;
         if ($this->namespaceSeparator !== $namespaceSeparator) {
             $this->triggerOptionEvent('namespace_separator', $namespaceSeparator);
             $this->namespaceSeparator = $namespaceSeparator;
@@ -151,7 +151,7 @@ 
      */
     public function setResourceId($resourceId)
     {
-        $resourceId = (string) $resourceId;
+        $resourceId = (string)$resourceId;
         if ($this->resourceId !== $resourceId) {
             $this->triggerOptionEvent('resource_id', $resourceId);
             $this->resourceId = $resourceId;

Indentation +15 added lines, -15 removed lines

@@ -1,20 +1,20 @@
 <?php
 /**
- * zf-couchbase2.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * @copyright 2015 MehrAlsNix (http://www.mehralsnix.de)
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
- *
- * @link      http://github.com/MehrAlsNix/zf-couchbase2
- */
+     * zf-couchbase2.
+     *
+     * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+     * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+     * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+     * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+     * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+     * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+     * SOFTWARE.
+     *
+     * @copyright 2015 MehrAlsNix (http://www.mehralsnix.de)
+     * @license   http://www.opensource.org/licenses/mit-license.php MIT
+     *
+     * @link      http://github.com/MehrAlsNix/zf-couchbase2
+     */
 namespace MehrAlsNix\ZF\Cache\Storage\Adapter;
 
 use CouchbaseBucket as CouchbaseBucketResource;

src/Cache/Storage/Adapter/CouchbaseResourceManager.php

Indentation +15 added lines, -15 removed lines

@@ -1,20 +1,20 @@
 <?php
 /**
- * zf-couchbase2.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * @copyright 2015 MehrAlsNix (http://www.mehralsnix.de)
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
- *
- * @link      http://github.com/MehrAlsNix/zf-couchbase2
- */
+     * zf-couchbase2.
+     *
+     * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+     * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+     * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+     * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+     * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+     * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+     * SOFTWARE.
+     *
+     * @copyright 2015 MehrAlsNix (http://www.mehralsnix.de)
+     * @license   http://www.opensource.org/licenses/mit-license.php MIT
+     *
+     * @link      http://github.com/MehrAlsNix/zf-couchbase2
+     */
 namespace MehrAlsNix\ZF\Cache\Storage\Adapter;
 
 use CouchbaseBucket as CouchbaseBucketResource;

Doc Comments +11 added lines, -2 removed lines

@@ -309,6 +309,9 @@ 
         return $this;
     }
 
+    /**
+     * @param string $id
+     */
     public function getUsername($id)
     {
         if (!$this->hasResource($id)) {
@@ -345,7 +348,7 @@ 
     /**
      * Get encoder.
      *
-     * @param $id
+     * @param string $id
      *
      * @return CouchbaseBucketResource
      */
@@ -385,7 +388,7 @@ 
     /**
      * Get decoder.
      *
-     * @param $id
+     * @param string $id
      *
      * @return CouchbaseBucketResource
      */
@@ -428,6 +431,9 @@ 
         return $this;
     }
 
+    /**
+     * @param string $id
+     */
     public function getBucket($id)
     {
         if (!$this->hasResource($id)) {
@@ -467,6 +473,9 @@ 
         return $this;
     }
 
+    /**
+     * @param string $id
+     */
     public function getPassword($id)
     {
         if (!$this->hasResource($id)) {

Spacing +12 added lines, -12 removed lines

@@ -76,26 +76,26 @@ 
         if (is_array($server)) {
             // array(<host>[, <port>])
             if (isset($server[0])) {
-                $host = (string) $server[0];
-                $port = isset($server[1]) ? (int) $server[1] : $port;
+                $host = (string)$server[0];
+                $port = isset($server[1]) ? (int)$server[1] : $port;
             }
             // array('host' => <host>[, 'port' => <port>])
             if (!isset($server[0]) && isset($server['host'])) {
-                $host = (string) $server['host'];
-                $port = isset($server['port']) ? (int) $server['port'] : $port;
+                $host = (string)$server['host'];
+                $port = isset($server['port']) ? (int)$server['port'] : $port;
             }
         } else {
             // parse server from URI host{:?port}
             $server = trim($server);
             if (strpos($server, '://') === false) {
-                $server = 'couchbase://'.$server;
+                $server = 'couchbase://' . $server;
             }
             $server = parse_url($server);
             if (!$server) {
                 throw new Exception\InvalidArgumentException('Invalid server given');
             }
             $host = $server['host'];
-            $port = isset($server['port']) ? (int) $server['port'] : $port;
+            $port = isset($server['port']) ? (int)$server['port'] : $port;
             if (isset($server['query'])) {
                 $query = null;
                 parse_str($server['query'], $query);
@@ -140,8 +140,8 @@ 
         if ($resource instanceof \CouchbaseBucket) {
             return $resource;
         }
-        $memc = new CouchbaseClusterResource('couchbase://'.$resource['server'][0]['host'].':'.$resource['server'][0]['port'], (string) $resource['username'], (string) $resource['password']);
-        $bucket = $memc->openBucket((string) $resource['bucket'], (string) $resource['password']);
+        $memc = new CouchbaseClusterResource('couchbase://' . $resource['server'][0]['host'] . ':' . $resource['server'][0]['port'], (string)$resource['username'], (string)$resource['password']);
+        $bucket = $memc->openBucket((string)$resource['bucket'], (string)$resource['password']);
 
         $bucket->setTranscoder(
             $resource['encoder'],
@@ -167,7 +167,7 @@ 
      */
     public function setResource($id, $resource)
     {
-        $id = (string) $id;
+        $id = (string)$id;
         if (!($resource instanceof CouchbaseBucketResource)) {
             if ($resource instanceof \Traversable) {
                 $resource = ArrayUtils::iteratorToArray($resource);
@@ -495,7 +495,7 @@ 
         $result = [];
         foreach ($servers as $server) {
             $this->normalizeServer($server);
-            $result[$server['host'].':'.$server['port']] = $server;
+            $result[$server['host'] . ':' . $server['port']] = $server;
         }
         $servers = array_values($result);
     }
@@ -511,8 +511,8 @@ 
      */
     protected function compareServers(array $serverA, array $serverB)
     {
-        $keyA = $serverA['host'].':'.$serverA['port'];
-        $keyB = $serverB['host'].':'.$serverB['port'];
+        $keyA = $serverA['host'] . ':' . $serverA['port'];
+        $keyB = $serverB['host'] . ':' . $serverB['port'];
         if ($keyA === $keyB) {
             return 0;
         }