Merge pull request #5 from Shardj/master

Update from Upstream
MittagQI · Aug 25, 2020 · f7b607d · f7b607d
2 parents 31019d9 + 4eaef75
commit f7b607d
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 22 deletions.
diff --git a/library/Zend/Application/Resource/UserAgent.php b/library/Zend/Application/Resource/UserAgent.php
@@ -26,13 +26,13 @@
  * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class UserAgent extends Zend_Application_Resource_ResourceAbstract
+class Zend_Application_Resource_UserAgent extends Zend_Application_Resource_ResourceAbstract
 {
     /**
      * @var Zend_Http_UserAgent
      */
     protected $_userAgent;
-    
+
     /**
      * Intialize resource
      *
@@ -54,7 +54,7 @@ public function init()
 
         return $userAgent;
     }
-    
+
     /**
      * Get UserAgent instance
      *
@@ -66,7 +66,7 @@ public function getUserAgent()
             $options = $this->getOptions();
             $this->_userAgent = new Zend_Http_UserAgent($options);
         }
-        
+
         return $this->_userAgent;
     }
 }
diff --git a/library/Zend/Controller/Action/Helper/FlashMessenger.php b/library/Zend/Controller/Action/Helper/FlashMessenger.php
@@ -137,7 +137,7 @@ public function resetNamespace()
     /**
      * addMessage() - Add a message to flash message
      *
-     * @param  string $message
+     * @param  string|string[] $message
      * @return Zend_Controller_Action_Helper_FlashMessenger Provides a fluent interface
      */
     public function addMessage($message, $namespace = null)
@@ -303,7 +303,7 @@ public function count($namespace = null)
     /**
      * Strategy pattern: proxy to addMessage()
      *
-     * @param  string $message
+     * @param  string|string[] $message
      * @return void
      */
     public function direct($message, $namespace=NULL)

diff --git a/library/Zend/Db/Adapter/Pdo/Sqlsrv.php b/library/Zend/Db/Adapter/Pdo/Sqlsrv.php
@@ -93,9 +93,6 @@ protected function _dsn()
             }
 
             if(isset($dsn['host'])) {
-                if($dsn['host'] == '127.0.0.1') {
-                    $dsn['host'] = '(local)';
-                }
                 $dsn['Server'] = $dsn['host'];
                 unset($dsn['host']);
             }

diff --git a/library/Zend/Exception.php b/library/Zend/Exception.php
@@ -40,7 +40,7 @@ class Zend_Exception extends Exception
      * @param  Exception $previous
      * @return void
      */
-    public function __construct($msg = '', $code = 0, Exception $previous = null)
+    public function __construct($msg = '', $code = 0, \Throwable $previous = null)
     {
         if (version_compare(PHP_VERSION, '5.3.0', '<')) {
             parent::__construct($msg, (int) $code);

diff --git a/library/Zend/Gdata/Analytics/Goal.php b/library/Zend/Gdata/Analytics/Goal.php
@@ -30,7 +30,7 @@
  * @package    Zend_Gdata
  * @subpackage Analytics
  */
-class Goal extends Zend_Gdata_Extension
+class Zend_Gdata_Analytics_Goal extends Zend_Gdata_Extension
 {
     protected $_rootNamespace = 'ga';
     protected $_rootElement = 'goal';
@@ -40,7 +40,7 @@ public function __construct()
         $this->registerAllNamespaces(Zend_Gdata_Analytics::$namespaces);
         parent::__construct();
     }
-    
+
     /**
      * @return string
      */

diff --git a/library/Zend/Test/PHPUnit/ControllerTestCase.php b/library/Zend/Test/PHPUnit/ControllerTestCase.php
@@ -37,14 +37,14 @@
 /**
  * Functional testing scaffold for MVC applications
  *
- * @uses       PHPUnit\Framework\TestCase
+ * @uses       PHPUnit_Framework_TestCase
  * @category   Zend
  * @package    Zend_Test
  * @subpackage PHPUnit
  * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-abstract class Zend_Test_PHPUnit_ControllerTestCase extends PHPUnit\Framework\TestCase
+abstract class Zend_Test_PHPUnit_ControllerTestCase extends PHPUnit_Framework_TestCase
 {
     /**
      * @var mixed Bootstrap file path or callback
@@ -120,7 +120,7 @@ public function __get($name)
      *
      * Calls {@link bootstrap()} by default
      */
-    protected function setUp(): void
+    protected function setUp()
     {
         $this->bootstrap();
     }

diff --git a/library/Zend/Tool/Framework/Provider/DocblockManifestInterface.php b/library/Zend/Tool/Framework/Provider/DocblockManifestInterface.php
@@ -25,6 +25,6 @@
  * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-interface DocblockManifestInterface
+interface Zend_Tool_Framework_Provider_DocblockManifestInterface
 {
 }
diff --git a/library/Zend/Validate/Barcode/IntelligentMail.php b/library/Zend/Validate/Barcode/IntelligentMail.php
@@ -30,7 +30,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
  */
-class IntelligentMail extends Zend_Validate_Barcode_AdapterAbstract
+class Zend_Validate_Barcode_IntelligentMail extends Zend_Validate_Barcode_AdapterAbstract
 {
     /**
      * Allowed barcode lengths

diff --git a/library/Zend/Validate/Isbn.php b/library/Zend/Validate/Isbn.php
@@ -167,7 +167,7 @@ public function isValid($value)
                 $isbn10 = str_replace($this->_separator, '', $value);
                 $sum    = 0;
                 for ($i = 0; $i < 9; $i++) {
-                    $sum += (10 - $i) * $isbn10{$i};
+                    $sum += (10 - $i) * $isbn10[$i];
                 }
 
                 // checksum
@@ -185,9 +185,9 @@ public function isValid($value)
                 $sum    = 0;
                 for ($i = 0; $i < 12; $i++) {
                     if ($i % 2 == 0) {
-                        $sum += $isbn13{$i};
+                        $sum += $isbn13[$i];
                     } else {
-                        $sum += 3 * $isbn13{$i};
+                        $sum += 3 * $isbn13[$i];
                     }
                 }
                 // checksum

diff --git a/library/Zend/Version.php b/library/Zend/Version.php
@@ -32,7 +32,7 @@ final class Zend_Version
     /**
      * Zend Framework version identification - see compareVersion()
      */
-    const VERSION = '1.18.3';
+    const VERSION = '1.18.5';
 
     /**
      * The latest stable version Zend Framework available

diff --git a/tests/Zend/CodeGenerator/Php/FileTest.php b/tests/Zend/CodeGenerator/Php/FileTest.php
@@ -287,7 +287,7 @@ public function testFileLineEndingsAreAlwaysLineFeed()
 
         $targetLength = strlen('require_once \'SampleClass.php\';');
         $this->assertEquals($targetLength, strlen($lines[2]));
-        $this->assertEquals(';', $lines[2]{$targetLength-1});
+        $this->assertEquals(';', $lines[2][$targetLength-1]);
     }
 
     /**