PHP 7.2 support change

Author: tavy315

library/Zend/Cache/Frontend/Page.php

@@ -395,7 +395,7 @@ protected function _makePartialId($arrayName, $bool1, $bool2)
             }
             return '';
         }
-        if (count($var) > 0) {
+        if (is_array($var) && count($var) > 0) {
             return false;
         }
         return '';

library/Zend/Config/Yaml.php

@@ -362,11 +362,11 @@ protected static function _parseValue($value)
         $value = trim($value);
 
         // remove quotes from string.
-        if ('"' == $value['0']) {
-            if ('"' == $value[count($value) -1]) {
+        if ('"' == substr($value, 0, 1)) {
+            if ('"' == substr($value, -1)) {
                 $value = substr($value, 1, -1);
             }
-        } elseif ('\'' == $value['0'] && '\'' == $value[count($value) -1]) {
+        } elseif ('\'' == substr($value, 0, 1) && '\'' == substr($value, -1)) {
             $value = strtr($value, array("''" => "'", "'" => ''));
         }
 

library/Zend/Controller/Action/Interface.php

@@ -29,36 +29,6 @@
  */
 interface Zend_Controller_Action_Interface
 {
-    /**
-     * Class constructor
-     *
-     * The request and response objects should be registered with the
-     * controller, as should be any additional optional arguments; these will be
-     * available via {@link getRequest()}, {@link getResponse()}, and
-     * {@link getInvokeArgs()}, respectively.
-     *
-     * When overriding the constructor, please consider this usage as a best
-     * practice and ensure that each is registered appropriately; the easiest
-     * way to do so is to simply call parent::__construct($request, $response,
-     * $invokeArgs).
-     *
-     * After the request, response, and invokeArgs are set, the
-     * {@link $_helper helper broker} is initialized.
-     *
-     * Finally, {@link init()} is called as the final action of
-     * instantiation, and may be safely overridden to perform initialization
-     * tasks; as a general rule, override {@link init()} instead of the
-     * constructor to customize an action controller's instantiation.
-     *
-     * @param Zend_Controller_Request_Abstract $request
-     * @param Zend_Controller_Response_Abstract $response
-     * @param array $invokeArgs Any additional invocation arguments
-     * @return void
-     */
-    public function __construct(Zend_Controller_Request_Abstract $request,
-                                Zend_Controller_Response_Abstract $response,
-                                array $invokeArgs = array());
-
     /**
      * Dispatch the requested action
      *

library/Zend/Db/Table/Abstract.php

@@ -789,7 +789,7 @@ protected function _setupTableName()
      */
     protected function _setupMetadata()
     {
-        if ($this->metadataCacheInClass() && (count($this->_metadata) > 0)) {
+        if ($this->metadataCacheInClass() && is_array($this->_metadata) && count($this->_metadata) > 0) {
             return true;
         }
 
@@ -1304,7 +1304,10 @@ public function find()
         $whereList = array();
         $numberTerms = 0;
         foreach ($args as $keyPosition => $keyValues) {
-            $keyValuesCount = count($keyValues);
+            // If the value is a string, cast it to int to be Countable.
+            // The coercion to array could be done first, but if so we
+            // are to be sure the string value is always '1'.
+            $keyValuesCount = gettype($keyValues) === 'string' ? (int) $keyValues : count($keyValues);
             // Coerce the values to an array.
             // Don't simply typecast to array, because the values
             // might be Zend_Db_Expr objects.

library/Zend/Feed/Element.php

@@ -193,7 +193,7 @@ public function __get($var)
         if ($length == 1) {
             return new Zend_Feed_Element($nodes[0]);
         } elseif ($length > 1) {
-            return array_map(create_function('$e', 'return new Zend_Feed_Element($e);'), $nodes);
+            return array_map(function ($e) { return new Zend_Feed_Element($e); }, $nodes);
         } else {
             // When creating anonymous nodes for __set chaining, don't
             // call appendChild() on them. Instead we pass the current

library/Zend/File/Transfer/Adapter/Abstract.php

@@ -324,10 +324,10 @@ public function addPrefixPaths(array $spec)
     /**
      * Adds a new validator for this class
      *
-     * @param  string|array $validator           Type of validator to add
-     * @param  boolean      $breakChainOnFailure If the validation chain should stop an failure
-     * @param  string|array $options             Options to set for the validator
-     * @param  string|array $files               Files to limit this validator to
+     * @param  string|array|Zend_Validate_Interface $validator           Type of validator to add
+     * @param  boolean                              $breakChainOnFailure If the validation chain should stop an failure
+     * @param  string|array                         $options             Options to set for the validator
+     * @param  string|array                         $files               Files to limit this validator to
      * @return Zend_File_Transfer_Adapter
      */
     public function addValidator($validator, $breakChainOnFailure = false, $options = null, $files = null)

library/Zend/Validate/File/Upload.php

@@ -161,7 +161,7 @@ public function setFiles($files = array())
      */
     public function isValid($value, $file = null)
     {
-        $this->_messages = null;
+        $this->_messages = array();
         if (array_key_exists($value, $this->_files)) {
             $files[$value] = $this->_files[$value];
         } else {