Merge pull request #11 from voku/analysis-XZxWPz

Applied fixes from StyleCI
voku · Aug 19, 2015 · e0b3d31 · e0b3d31
2 parents 0a66c47 + dde701a
commit e0b3d31
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/src/voku/cache/Cache.php b/src/voku/cache/Cache.php
@@ -295,7 +295,7 @@ private function getClientIp($trust_proxy_headers = false)
 
     if (isset($_SERVER['HTTP_CLIENT_IP']) && $_SERVER['HTTP_CLIENT_IP']) {
       $ip = $_SERVER['HTTP_CLIENT_IP'];
-    } else if (isset($_SERVER['HTTP_X_FORWARDED_FOR']) && $_SERVER['HTTP_X_FORWARDED_FOR']) {
+    } elseif (isset($_SERVER['HTTP_X_FORWARDED_FOR']) && $_SERVER['HTTP_X_FORWARDED_FOR']) {
       $ip = $_SERVER['HTTP_X_FORWARDED_FOR'];
     } else {
       $ip = $remoteAddr;

diff --git a/src/voku/cache/iSerializer.php b/src/voku/cache/iSerializer.php
@@ -27,4 +27,4 @@ public function serialize($value);
    * @return mixed
    */
   public function unserialize($value);
-} 
+}
diff --git a/tests/MemcachedCacheTest.php b/tests/MemcachedCacheTest.php
@@ -1,6 +1,5 @@
 <?php
 
-use voku\cache\AdapterArray;
 use voku\cache\AdapterMemcached;
 use voku\cache\Cache;
 use voku\cache\iAdapter;

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -3,4 +3,4 @@
 require_once dirname(__DIR__) . '/vendor/autoload.php';
 
 $_SERVER['$_SERVER_NAME'] = '';
-$_SESSION = array();
+$_SESSION = array();