Support PHP 8.2 (#15)

.github/workflows/tests.yml

@@ -14,13 +14,8 @@ jobs:
         experimental:
           - false
         php:
-          - "7.0"
-          - "7.1"
-          - "7.2"
-          - "7.3"
-          - "7.4"
-          - "8.0"
           - "8.1"
+          - "8.2"
 
     env:
       MYSQL_USER: "zftest"

composer.json

@@ -3,7 +3,7 @@
     "description": "Monorepo for zf1s (Zend Framework 1) packages",
     "license": "BSD-3-Clause",
     "require": {
-        "php": ">=7",
+        "php": "^8.1 || ^8.2",
         "ext-ctype": "*",
         "ext-dom": "*",
         "ext-gd": "*",
@@ -87,7 +87,6 @@
             "Zend_Service_Audioscrobbler": "packages/zend-service-audioscrobbler/library/",
             "Zend_Service_Console": "packages/zend-service-console/library/",
             "Zend_Service_Delicious": "packages/zend-service-delicious/library/",
-            "Zend_Service_Ebay": "packages/zend-service-ebay/library/",
             "Zend_Service_Flickr": "packages/zend-service-flickr/library/",
             "Zend_Service_LiveDocx": "packages/zend-service-livedocx/library/",
             "Zend_Service_Rackspace": "packages/zend-service-rackspace/library/",
@@ -178,7 +177,6 @@
         "zf1s/zend-service-audioscrobbler": "self.version",
         "zf1s/zend-service-console": "self.version",
         "zf1s/zend-service-delicious": "self.version",
-        "zf1s/zend-service-ebay": "self.version",
         "zf1s/zend-service-flickr": "self.version",
         "zf1s/zend-service-livedocx": "self.version",
         "zf1s/zend-service-rackspace": "self.version",

monorepo-builder.yml

@@ -64,7 +64,6 @@ parameters:
         packages/zend-service-audioscrobbler: 'https://github.com/zf1s/zend-service-audioscrobbler.git'
         packages/zend-service-console: 'https://github.com/zf1s/zend-service-console.git'
         packages/zend-service-delicious: 'https://github.com/zf1s/zend-service-delicious.git'
-        packages/zend-service-ebay: 'https://github.com/zf1s/zend-service-ebay.git'
         packages/zend-service-flickr: 'https://github.com/zf1s/zend-service-flickr.git'
         packages/zend-service-livedocx: 'https://github.com/zf1s/zend-service-livedocx.git'
         packages/zend-service-rackspace: 'https://github.com/zf1s/zend-service-rackspace.git'

packages/zend-amf/library/Zend/Amf/Adobe/Introspector.php

@@ -36,6 +36,7 @@
  * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
+#[AllowDynamicProperties]
 class Zend_Amf_Adobe_Introspector
 {
     /**

packages/zend-amf/library/Zend/Amf/Parse/Amf0/Serializer.php

@@ -35,6 +35,7 @@
  * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
+#[AllowDynamicProperties]
 class Zend_Amf_Parse_Amf0_Serializer extends Zend_Amf_Parse_Serializer
 {
     /**

packages/zend-amf/library/Zend/Amf/Parse/Serializer.php

@@ -28,6 +28,7 @@
  * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
+#[AllowDynamicProperties]
 abstract class Zend_Amf_Parse_Serializer
 {
     /**

packages/zend-application/library/Zend/Application/Bootstrap/BootstrapAbstract.php

@@ -41,6 +41,7 @@
  * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
+#[AllowDynamicProperties]
 abstract class Zend_Application_Bootstrap_BootstrapAbstract
     implements Zend_Application_Bootstrap_Bootstrapper,
                Zend_Application_Bootstrap_ResourceBootstrapper

packages/zend-cloud/library/Zend/Cloud/Infrastructure/Adapter/AbstractAdapter.php

@@ -29,18 +29,19 @@
  * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
+#[AllowDynamicProperties]
 abstract class Zend_Cloud_Infrastructure_Adapter_AbstractAdapter implements Zend_Cloud_Infrastructure_Adapter
 {
     /**
      * Store the last response from the adpter
-     * 
+     *
      * @var array
      */
     protected $adapterResult;
-    
+
     /**
      * Valid metrics for monitor
-     * 
+     *
      * @var array
      */
     protected $validMetrics = array(
@@ -65,10 +66,10 @@ public function getAdapterResult()
 
     /**
      * Wait for status $status with a timeout of $timeout seconds
-     * 
+     *
      * @param  string $id
      * @param  string $status
-     * @param  integer $timeout 
+     * @param  integer $timeout
      * @return boolean
      */
     public function waitStatusInstance($id, $status, $timeout = self::TIMEOUT_STATUS_CHANGE)
@@ -92,7 +93,7 @@ public function waitStatusInstance($id, $status, $timeout = self::TIMEOUT_STATUS
      * @param  array $param
      * @param  string|array $cmd
      * @return string|array
-     */ 
+     */
     public function deployInstance($id, $params, $cmd)
     {
         if (!function_exists("ssh2_connect")) {
@@ -110,9 +111,9 @@ public function deployInstance($id, $params, $cmd)
             throw new Zend_Cloud_Infrastructure_Exception('You must specify the shell commands to run on the instance');
         }
 
-        if (empty($params) 
-            || empty($params[Zend_Cloud_Infrastructure_Instance::SSH_USERNAME]) 
-            || (empty($params[Zend_Cloud_Infrastructure_Instance::SSH_PASSWORD]) 
+        if (empty($params)
+            || empty($params[Zend_Cloud_Infrastructure_Instance::SSH_USERNAME])
+            || (empty($params[Zend_Cloud_Infrastructure_Instance::SSH_PASSWORD])
                 && empty($params[Zend_Cloud_Infrastructure_Instance::SSH_KEY]))
         ) {
             // require_once 'Zend/Cloud/Infrastructure/Exception.php';
@@ -123,13 +124,13 @@ public function deployInstance($id, $params, $cmd)
         if (empty($host)) {
             // require_once 'Zend/Cloud/Infrastructure/Exception.php';
             throw new Zend_Cloud_Infrastructure_Exception(sprintf(
-                'The instance identified by "%s" does not exist', 
+                'The instance identified by "%s" does not exist',
                 $id
             ));
         }
 
         $conn = ssh2_connect($host);
-        if (!ssh2_auth_password($conn, $params[Zend_Cloud_Infrastructure_Instance::SSH_USERNAME], 
+        if (!ssh2_auth_password($conn, $params[Zend_Cloud_Infrastructure_Instance::SSH_USERNAME],
                 $params[Zend_Cloud_Infrastructure_Instance::SSH_PASSWORD])) {
             // require_once 'Zend/Cloud/Infrastructure/Exception.php';
             throw new Zend_Cloud_Infrastructure_Exception('SSH authentication failed');
@@ -142,11 +143,11 @@ public function deployInstance($id, $params, $cmd)
                 $errorStream = ssh2_fetch_stream($stream, SSH2_STREAM_STDERR);
 
                 stream_set_blocking($errorStream, true);
-                stream_set_blocking($stream, true); 
+                stream_set_blocking($stream, true);
 
                 $output = stream_get_contents($stream);
                 $error  = stream_get_contents($errorStream);
-                
+
                 if (empty($error)) {
                     $result[$command] = $output;
                 } else {
@@ -159,17 +160,17 @@ public function deployInstance($id, $params, $cmd)
             $errorStream = ssh2_fetch_stream($stream, SSH2_STREAM_STDERR);
 
             stream_set_blocking($errorStream, true);
-            stream_set_blocking($stream, true); 
+            stream_set_blocking($stream, true);
 
             $output = stream_get_contents($stream);
             $error  = stream_get_contents($errorStream);
-            
+
             if (empty($error)) {
                 $result = $output;
             } else {
                 $result = $error;
             }
-        }    
+        }
         return $result;
     }
 }

packages/zend-console-getopt/library/Zend/Console/Getopt.php

@@ -524,9 +524,9 @@ public function toXml()
         $doc->appendChild($optionsNode);
         foreach ($this->_options as $flag => $value) {
             $optionNode = $doc->createElement('option');
-            $optionNode->setAttribute('flag', utf8_encode($flag));
+            $optionNode->setAttribute('flag', mb_convert_encoding($flag, 'UTF-8', 'ISO-8859-1'));
             if ($value !== true) {
-                $optionNode->setAttribute('parameter', utf8_encode($value));
+                $optionNode->setAttribute('parameter', mb_convert_encoding($value, 'UTF-8', 'ISO-8859-1'));
             }
             $optionsNode->appendChild($optionNode);
         }
@@ -784,7 +784,8 @@ protected function _parseLongOption(&$argv)
     protected function _parseShortOptionCluster(&$argv)
     {
         $flagCluster = ltrim((string) array_shift($argv), '-');
-        foreach (str_split($flagCluster) as $flag) {
+        $splitString = $flagCluster === '' ? [''] : str_split($flagCluster);
+        foreach ($splitString as $flag) {
             $this->_parseSingleOption($flag, $argv);
         }
     }

packages/zend-controller/library/Zend/Controller/Dispatcher/Interface.php

@@ -153,7 +153,6 @@ public function addControllerDirectory($path, $args = null);
      * Specify a string or an array; if an array is specified, all paths will be
      * added.
      *
-     * @param string|array $dir
      * @return Zend_Controller_Dispatcher_Interface
      */
     public function setControllerDirectory($path);

packages/zend-controller/library/Zend/Controller/Plugin/ErrorHandler.php

@@ -195,6 +195,7 @@ public function getErrorHandlerAction()
      * Route shutdown hook -- Ccheck for router exceptions
      *
      * @param Zend_Controller_Request_Abstract $request
+     * @return void
      */
     public function routeShutdown(Zend_Controller_Request_Abstract $request)
     {
@@ -206,6 +207,7 @@ public function routeShutdown(Zend_Controller_Request_Abstract $request)
      * necessary
      *
      * @param Zend_Controller_Request_Abstract $request
+     * @return void
      */
     public function preDispatch(Zend_Controller_Request_Abstract $request)
     {

packages/zend-controller/library/Zend/Controller/Router/Route/Abstract.php

@@ -35,6 +35,7 @@
  * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
+#[AllowDynamicProperties]
 abstract class Zend_Controller_Router_Route_Abstract implements Zend_Controller_Router_Route_Interface
 {
     /**

packages/zend-exception/library/Zend/Exception.php

@@ -25,6 +25,7 @@
 * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
+#[AllowDynamicProperties]
 class Zend_Exception extends Exception
 {
     /**

packages/zend-feed/library/Zend/Feed/Writer/Feed/FeedAbstract.php

@@ -58,6 +58,7 @@
  * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
+#[AllowDynamicProperties]
 class Zend_Feed_Writer_Feed_FeedAbstract
 {
     /**

packages/zend-form/library/Zend/Form/Decorator/Abstract.php

@@ -31,6 +31,7 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
+#[AllowDynamicProperties]
 abstract class Zend_Form_Decorator_Abstract implements Zend_Form_Decorator_Interface
 {
     /**

packages/zend-form/library/Zend/Form/Element.php

@@ -40,6 +40,7 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
+#[AllowDynamicProperties]
 class Zend_Form_Element implements Zend_Validate_Interface
 {
     /**

packages/zend-gdata/library/Zend/Gdata/App.php

@@ -1087,11 +1087,11 @@ public function __call($method, $args)
             } else {
                 // require_once 'Zend/Gdata/App/Exception.php';
                 throw new Zend_Gdata_App_Exception(
-                        "Unable to find '${class}' in registered packages");
+                        "Unable to find '{$class}' in registered packages");
             }
         } else {
             // require_once 'Zend/Gdata/App/Exception.php';
-            throw new Zend_Gdata_App_Exception("No such method ${method}");
+            throw new Zend_Gdata_App_Exception("No such method {$method}");
         }
     }
 

packages/zend-gdata/library/Zend/Gdata/App/Base.php

@@ -302,7 +302,7 @@ public function transferFromXML($xml)
     {
         if ($xml) {
             error_clear_last();
-            
+
             // Load the feed as an XML DOMDocument object
             $doc = new DOMDocument();
             $doc = @Zend_Xml_Security::scan($xml, $doc);
@@ -482,7 +482,7 @@ public function __get($name)
         $method = 'get'.ucfirst($name);
         if (method_exists($this, $method)) {
             return call_user_func(array(&$this, $method));
-        } else if (property_exists($this, "_${name}")) {
+        } else if (property_exists($this, "_{$name}")) {
             return $this->{'_' . $name};
         } else {
             // require_once 'Zend/Gdata/App/InvalidArgumentException.php';

packages/zend-gdata/library/Zend/Gdata/App/BaseMediaSource.php

@@ -113,7 +113,7 @@ public function __get($name)
         $method = 'get'.ucfirst($name);
         if (method_exists($this, $method)) {
             return call_user_func(array(&$this, $method));
-        } else if (property_exists($this, "_${name}")) {
+        } else if (property_exists($this, "_{$name}")) {
             return $this->{'_' . $name};
         } else {
             // require_once 'Zend/Gdata/App/InvalidArgumentException.php';

packages/zend-gdata/library/Zend/Gdata/App/LoggingHttpClientAdapterSocket.php

@@ -73,7 +73,7 @@ protected function log($message)
      */
     public function connect($host, $port = 80, $secure = false)
     {
-        $this->log("Connecting to: ${host}:${port}");
+        $this->log("Connecting to: {$host}:{$port}");
         return parent::connect($host, $port, $secure);
     }
 
@@ -102,7 +102,7 @@ public function write($method, $uri, $http_ver = '1.1', $headers = array(), $bod
     public function read()
     {
         $response = parent::read();
-        $this->log("${response}\n\n");
+        $this->log("{$response}\n\n");
         return $response;
     }
 

packages/zend-gdata/library/Zend/Gdata/Gapps.php

@@ -882,7 +882,7 @@ public function __call($method, $args) {
             } else {
                 // require_once 'Zend/Gdata/App/Exception.php';
                 throw new Zend_Gdata_App_Exception(
-                        "Unable to find '${class}' in registered packages");
+                        "Unable to find '{$class}' in registered packages");
             }
         } else {
             return parent::__call($method, $args);

packages/zend-http/library/Zend/Http/Client.php

@@ -69,6 +69,7 @@
  * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
+#[AllowDynamicProperties]
 class Zend_Http_Client
 {
     /**

packages/zend-http/library/Zend/Http/Header/SetCookie.php

@@ -49,6 +49,7 @@
  * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
+#[AllowDynamicProperties]
 class Zend_Http_Header_SetCookie
 {
 

packages/zend-json/library/Zend/Json/Decoder.php

@@ -32,6 +32,7 @@
  * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
+#[AllowDynamicProperties]
 class Zend_Json_Decoder
 {
     /**

packages/zend-loader/library/Zend/Loader/Autoloader/Resource.php

@@ -32,6 +32,7 @@
  * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
+#[AllowDynamicProperties]
 class Zend_Loader_Autoloader_Resource implements Zend_Loader_Autoloader_Interface
 {
     /**

packages/zend-pdf/library/Zend/Pdf.php

@@ -81,6 +81,7 @@
  * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
+#[AllowDynamicProperties]
 class Zend_Pdf
 {
   /**** Class Constants ****/

packages/zend-pdf/library/Zend/Pdf/Parser.php

@@ -35,6 +35,7 @@
  * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
+#[AllowDynamicProperties]
 class Zend_Pdf_Parser
 {
     /**

packages/zend-pdf/library/Zend/Pdf/Resource.php

@@ -27,6 +27,7 @@
  * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
+#[AllowDynamicProperties]
 abstract class Zend_Pdf_Resource
 {
     /**