Merge branch 'feature/7263'

Adds PHP 7 support. Close zendframework/zendframework#7366 Fixes zendframework/zendframework#7270 Fixes zendframework/zendframework#7263
zendframework · Mar 25, 2015 · b44104c · b44104c
2 parents cea51ea + a552699
commit b44104c
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 10 deletions.
diff --git a/src/Cookies.php b/src/Cookies.php
@@ -219,7 +219,8 @@ public function getCookie($uri, $cookieName, $retAs = self::COOKIE_OBJECT)
 
         // Get correct cookie path
         $path = $uri->getPath();
-        $path = substr($path, 0, strrpos($path, '/'));
+        $lastSlashPos = strrpos($path, '/') ?: 0;
+        $path = substr($path, 0, $lastSlashPos);
         if (! $path) {
             $path = '/';
         }

diff --git a/src/Header/Accept.php b/src/Header/Accept.php
@@ -80,7 +80,7 @@ protected function parseFieldValuePart($fieldValuePart)
         if ($pos = strpos($fieldValuePart, '/')) {
             $type = trim(substr($fieldValuePart, 0, $pos));
         } else {
-            $type = trim(substr($fieldValuePart, 0));
+            $type = trim($fieldValuePart);
         }
 
         $params = $this->getParametersFromFieldValuePart($fieldValuePart);

diff --git a/src/Header/CacheControl.php b/src/Header/CacheControl.php
@@ -38,7 +38,10 @@ public static function fromString($headerLine)
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'cache-control') {
-            throw new Exception\InvalidArgumentException('Invalid header line for Cache-Control string: "' . $name . '"');
+            throw new Exception\InvalidArgumentException(sprintf(
+                'Invalid header line for Cache-Control string: ""',
+                $name
+            ));
         }
 
         $directives = static::parseValue($value);
@@ -179,6 +182,7 @@ protected static function parseValue($value)
             case 0:
                 $directive = $lastMatch;
                 goto state_value;
+                // intentional fall-through
 
             default:
                 throw new Exception\InvalidArgumentException('expected DIRECTIVE');
@@ -189,10 +193,12 @@ protected static function parseValue($value)
             case 0:
                 $directives[$directive] = substr($lastMatch, 2, -1);
                 goto state_separator;
+                // intentional fall-through
 
             case 1:
                 $directives[$directive] = rtrim(substr($lastMatch, 1));
                 goto state_separator;
+                // intentional fall-through
 
             default:
                 $directives[$directive] = true;
@@ -203,6 +209,7 @@ protected static function parseValue($value)
         switch (static::match(array('\s*,\s*', '$'), $value, $lastMatch)) {
             case 0:
                 goto state_directive;
+                // intentional fall-through
 
             case 1:
                 return $directives;
@@ -223,10 +230,13 @@ protected static function parseValue($value)
      */
     protected static function match($tokens, &$string, &$lastMatch)
     {
+        // Ensure we have a string
+        $value = (string) $string;
+
         foreach ($tokens as $i => $token) {
-            if (preg_match('/^' . $token . '/', $string, $matches)) {
+            if (preg_match('/^' . $token . '/', $value, $matches)) {
                 $lastMatch = $matches[0];
-                $string = substr($string, strlen($matches[0]));
+                $string = substr($value, strlen($matches[0]));
                 return $i;
             }
         }

diff --git a/src/PhpEnvironment/Request.php b/src/PhpEnvironment/Request.php
@@ -252,7 +252,8 @@ public function setServer(ParametersInterface $server)
 
         // URI scheme
         if ((!empty($this->serverParams['HTTPS']) && strtolower($this->serverParams['HTTPS']) !== 'off')
-            || (!empty($this->serverParams['HTTP_X_FORWARDED_PROTO']) && $this->serverParams['HTTP_X_FORWARDED_PROTO'] == 'https')
+            || (!empty($this->serverParams['HTTP_X_FORWARDED_PROTO'])
+                 && $this->serverParams['HTTP_X_FORWARDED_PROTO'] == 'https')
         ) {
             $scheme = 'https';
         } else {
@@ -362,7 +363,7 @@ public function setEnv(ParametersInterface $env)
      * Return the parameter container responsible for env parameters or a single parameter value.
      *
      * @param string|null           $name            Parameter name to retrieve, or null to get the whole container.
-     * @param mixed|null            $default         Default value to use when the parameter is missing.     * @return \Zend\Stdlib\ParametersInterface
+     * @param mixed|null            $default         Default value to use when the parameter is missing.
      * @return \Zend\Stdlib\ParametersInterface|mixed
      */
     public function getEnv($name = null, $default = null)
@@ -507,7 +508,8 @@ protected function detectBaseUrl()
             $basename = basename($filename);
             if ($basename) {
                 $path     = ($phpSelf ? trim($phpSelf, '/') : '');
-                $baseUrl .= substr($path, 0, strpos($path, $basename)) . $basename;
+                $basePos  = strpos($path, $basename) ?: 0;
+                $baseUrl .= substr($path, 0, $basePos) . $basename;
             }
         }
 

diff --git a/test/Client/CurlTest.php b/test/Client/CurlTest.php
@@ -116,6 +116,10 @@ public function testSetConfigInvalidConfig($config)
      */
     public function testSettingInvalidCurlOption()
     {
+        if (version_compare(PHP_VERSION, 7, 'gte')) {
+            $this->markTestSkipped('Test is invalid for PHP version 7');
+        }
+
         $config = array(
             'adapter'     => 'Zend\Http\Client\Adapter\Curl',
             'curloptions' => array(CURLOPT_CLOSEPOLICY => true),

diff --git a/test/Header/DateTest.php b/test/Header/DateTest.php
@@ -37,7 +37,7 @@ public function testDateFromTimeStringCreatesValidDateHeader()
         $this->assertInstanceOf('Zend\Http\Header\Date', $dateHeader);
 
         $date     = new \DateTime(null, new \DateTimeZone('GMT'));
-        $interval = $dateHeader->date()->diff($date, true);
+        $interval = $dateHeader->date()->diff($date, 1);
 
         $this->assertSame('+12 hours 00 minutes 00 seconds', $interval->format('%R%H hours %I minutes %S seconds'));
     }
@@ -50,7 +50,7 @@ public function testDateFromTimestampCreatesValidDateHeader()
         $this->assertInstanceOf('Zend\Http\Header\Date', $dateHeader);
 
         $date     = new \DateTime(null, new \DateTimeZone('GMT'));
-        $interval = $dateHeader->date()->diff($date, true);
+        $interval = $dateHeader->date()->diff($date, 1);
 
         $this->assertSame('+12 hours 00 minutes 00 seconds', $interval->format('%R%H hours %I minutes %S seconds'));
     }