Merge tag 'release-1.12.13' into 1.12.13-dev

Zend Framework 1.12.13

- [567: Cast int and float to string when creating headers](zendframework#567)

# gpg verification failed.

# Conflicts:
#	README.md
#	library/Zend/Http/Client.php
#	library/Zend/Session.php
#	library/Zend/Version.php

Author: Maxim Shikula

.travis.yml

@@ -6,6 +6,7 @@ php:
   - 5.4
   - 5.5
   - 5.6
+  - 7
   - hhvm
 
 env: TMPDIR=/tmp
@@ -24,8 +25,9 @@ before_script:
   - mysql -e 'create database zftest;'
   - psql -c 'create database zftest;' -U postgres
 
-  - if [[ "$TRAVIS_PHP_VERSION" != "5.2" ]] && [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then phpenv config-add tests/config.ini; fi
+  - if [[ "$TRAVIS_PHP_VERSION" != "5.2" ]] && [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]] && [[ "$TRAVIS_PHP_VERSION" != "7" ]]; then phpenv config-add tests/config.ini; fi
   - if [[ "$TRAVIS_PHP_VERSION" == "5.2" ]]; then phpenv config-add tests/php52_config.ini; fi
+  - if [[ "$TRAVIS_PHP_VERSION" == "7" ]]; then phpenv config-add tests/php7_config.ini; fi
 
   - cp ./tests/TestConfiguration.travis.php ./tests/TestConfiguration.php
 
@@ -35,4 +37,5 @@ script:
 
 matrix:
   allow_failures:
+   - php: 7
    - php: hhvm

README.md

@@ -1,7 +1,7 @@
 INFORMATION
 ===================
 
-This is a fork from Zend Framework 1.12.10 Release.
+This is a fork from Zend Framework 1.12.13 Release.
 
 PURPOSE
 ---------------------------

documentation/manual/en/ref/requirements-dependencies-table.xml

@@ -118,7 +118,7 @@
                 </entry>
             </row>
             <row>
-                <entry morerows="4" valign="middle">&requirements.soft;</entry>
+                <entry morerows="3" valign="middle">&requirements.soft;</entry>
                 <entry>
                     <ulink
                         url="&zf.manual.link;/zend.db.html">

library/Zend/Amf/Server.php

@@ -767,9 +767,9 @@ public function setClass($class, $namespace = '', $argv = null)
             throw new Zend_Amf_Server_Exception('Invalid method or class; must be a classname or object');
         }
 
-        $argv = null;
+        $args = null;
         if (2 < func_num_args()) {
-            $argv = array_slice(func_get_args(), 2);
+            $args = array_slice(func_get_args(), 2);
         }
 
         // Use the class name as the name space by default.
@@ -780,7 +780,7 @@ public function setClass($class, $namespace = '', $argv = null)
 
         $this->_classAllowed[is_object($class) ? get_class($class) : $class] = true;
 
-        $this->_methods[] = Zend_Server_Reflection::reflectClass($class, $argv, $namespace);
+        $this->_methods[] = Zend_Server_Reflection::reflectClass($class, $args, $namespace);
         $this->_buildDispatchTable();
 
         return $this;

library/Zend/Application.php

@@ -70,15 +70,17 @@ class Zend_Application
      *
      * @param  string                   $environment
      * @param  string|array|Zend_Config $options String path to configuration file, or array/Zend_Config of configuration options
+     * @param bool $suppressNotFoundWarnings Should warnings be suppressed when a file is not found during autoloading?
      * @throws Zend_Application_Exception When invalid options are provided
      * @return void
      */
-    public function __construct($environment, $options = null)
+    public function __construct($environment, $options = null, $suppressNotFoundWarnings = null)
     {
         $this->_environment = (string) $environment;
 
         #require_once 'Zend/Loader/Autoloader.php';
         $this->_autoloader = Zend_Loader_Autoloader::getInstance();
+        $this->_autoloader->suppressNotFoundWarnings($suppressNotFoundWarnings);
 
         if (null !== $options) {
             if (is_string($options)) {

library/Zend/Controller/Action/Helper/Redirector.php

@@ -406,7 +406,7 @@ public function gotoSimpleAndExit($action, $controller = null, $module = null, a
     /**
      * Redirect to a route-based URL
      *
-     * Uses route's assemble method tobuild the URL; route is specified by $name;
+     * Uses route's assemble method to build the URL; route is specified by $name;
      * default route is used if none provided.
      *
      * @param  array   $urlOptions Array of key/value pairs used to assemble URL
@@ -427,7 +427,7 @@ public function gotoRoute(array $urlOptions = array(), $name = null, $reset = fa
     /**
      * Redirect to a route-based URL, and immediately exit
      *
-     * Uses route's assemble method tobuild the URL; route is specified by $name;
+     * Uses route's assemble method to build the URL; route is specified by $name;
      * default route is used if none provided.
      *
      * @param  array   $urlOptions Array of key/value pairs used to assemble URL

library/Zend/Controller/Action/Helper/ViewRenderer.php

@@ -841,13 +841,21 @@ protected function _translateSpec(array $vars = array())
         $inflector  = $this->getInflector();
         $request    = $this->getRequest();
         $dispatcher = $this->getFrontController()->getDispatcher();
-        $module     = $dispatcher->formatModuleName($request->getModuleName());
-        $controller = substr(
-            $dispatcher->formatControllerName($request->getControllerName()),
-            0,
-            -10
-        );
-        $action     = $dispatcher->formatActionName($request->getActionName());
+
+        // Format module name
+        $module = $dispatcher->formatModuleName($request->getModuleName());
+
+        // Format controller name
+        require_once 'Zend/Filter/Word/CamelCaseToDash.php';
+        $filter     = new Zend_Filter_Word_CamelCaseToDash();
+        $controller = $filter->filter($request->getControllerName());
+        $controller = $dispatcher->formatControllerName($controller);
+        if ('Controller' == substr($controller, -10)) {
+            $controller = substr($controller, 0, -10);
+        }
+
+        // Format action name
+        $action = $dispatcher->formatActionName($request->getActionName());
 
         $params     = compact('module', 'controller', 'action');
         foreach ($vars as $key => $value) {

library/Zend/Controller/Request/Http.php

@@ -917,6 +917,20 @@ public function isOptions()
         return false;
     }
 
+    /**
+     * Was the request made by PATCH?
+     *
+     * @return boolean
+     */
+    public function isPatch()
+    {
+        if ('PATCH' == $this->getMethod()) {
+            return true;
+        }
+
+        return false;
+    }
+
     /**
      * Is the request a Javascript XMLHttpRequest?
      *

library/Zend/Controller/Request/HttpTestCase.php

@@ -62,6 +62,7 @@ class Zend_Controller_Request_HttpTestCase extends Zend_Controller_Request_Http
         'GET',
         'HEAD',
         'OPTIONS',
+        'PATCH',
         'POST',
         'PUT',
     );

library/Zend/Controller/Router/Route/Chain.php

@@ -86,10 +86,10 @@ public function chain(Zend_Controller_Router_Route_Abstract $route, $separator =
      */
     public function match($request, $partial = null)
     {
+        $rawPath     = $request->getPathInfo();
         $path        = trim($request->getPathInfo(), self::URI_DELIMITER);
         $subPath     = $path;
         $values      = array();
-        $numRoutes   = count($this->_routes);
         $matchedPath = null;
 
         foreach ($this->_routes as $key => $route) {
@@ -101,12 +101,12 @@ public function match($request, $partial = null)
                 $separator = substr($subPath, 0, strlen($this->_separators[$key]));
 
                 if ($separator !== $this->_separators[$key]) {
+                    $request->setPathInfo($rawPath);
                     return false;
                 }
 
                 $subPath = substr($subPath, strlen($separator));
             }
-
             // TODO: Should be an interface method. Hack for 1.0 BC
             if (!method_exists($route, 'getVersion') || $route->getVersion() == 1) {
                 $match = $subPath;
@@ -115,16 +115,17 @@ public function match($request, $partial = null)
                 $match = $request;
             }
 
-            $res = $route->match($match, true, ($key == $numRoutes - 1));
+            $res = $route->match($match, true);
+
             if ($res === false) {
+                $request->setPathInfo($rawPath);
                 return false;
             }
 
             $matchedPath = $route->getMatchedPath();
 
             if ($matchedPath !== null) {
                 $subPath   = substr($subPath, strlen($matchedPath));
-                $separator = substr($subPath, 0, strlen($this->_separators[$key]));
             }
 
             $values = $res + $values;