Small fixes for tests in favor of PHP 8.0 compat

.github/workflows/tests.yml

@@ -26,7 +26,7 @@ jobs:
         # https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#example-including-additional-values-into-combinations
         include:
           - php: "8.0"
-            experimental: true
+            experimental: false
             runs-on: ubuntu-20.04
 
     env:

.travis.yml

@@ -17,8 +17,6 @@ jobs:
     - php: 7.3
     - php: 7.4
     - php: 8.0
-  allow_failures:
-    - php: 8.0
   fast_finish: true
 
 env:

tests/Zend/Db/Adapter/StaticTest.php

@@ -342,7 +342,7 @@ public function testDbFactoryWillThrowExceptionWhenAssumingBadBehavior()
                 );
         } catch (Exception $e) {
             set_include_path($oldIncludePath);
-            $this->assertContains('failed to open stream', $e->getMessage());
+            $this->assertContains('failed to open stream', strtolower($e->getMessage()));
             return;
         }
 

tests/Zend/Db/Statement/TestCommon.php

@@ -329,6 +329,10 @@ public function testStatementSetFetchModeInvalidException()
             $this->assertTrue($e instanceof Zend_Db_Statement_Exception,
                 'Expecting object of type Zend_Db_Statement_Exception, got '.get_class($e));
             $this->assertRegExp('#invalid fetch mode#i', $e->getMessage());
+        } catch (Throwable $e) {
+            $this->assertTrue($e instanceof ValueError,
+                'Expecting object of type Zend_Db_Statement_Exception, got '.get_class($e));
+            $this->assertRegExp('#must be a bitmask#i', $e->getMessage());
         }
     }
 
@@ -443,6 +447,10 @@ public function testStatementFetchAllStyleException()
         } catch (Zend_Exception $e) {
             $this->assertTrue($e instanceof Zend_Db_Statement_Exception,
                 'Expecting object of type Zend_Db_Statement_Exception, got '.get_class($e));
+        } catch (Throwable $e) {
+            $this->assertTrue($e instanceof ValueError,
+                'Expecting object of type Zend_Db_Statement_Exception, got '.get_class($e));
+            $this->assertRegExp('#must be a bitmask#i', $e->getMessage());
         }
         $stmt->closeCursor();
     }
@@ -586,6 +594,10 @@ public function testStatementFetchStyleException()
         } catch (Zend_Exception $e) {
             $this->assertTrue($e instanceof Zend_Db_Statement_Exception,
                 'Expecting object of type Zend_Db_Statement_Exception, got '.get_class($e));
+        } catch (Throwable $e) {
+            $this->assertTrue($e instanceof ValueError,
+                'Expecting object of type Zend_Db_Statement_Exception, got '.get_class($e));
+            $this->assertRegExp('#must be a bitmask#i', $e->getMessage());
         }
         $stmt->closeCursor();
     }

tests/Zend/Filter/HtmlEntitiesTest.php

@@ -214,7 +214,7 @@ public function testQuoteStyleQuotesEncodeNone()
      */
     public function testCorrectsForEncodingMismatch()
     {
-        if (PHP_VERSION_ID >= 50400) {
+        if (PHP_VERSION_ID >= 70000 && PHP_VERSION_ID < 70100) {
             $this->markTestIncomplete('Tested feature ZF-11344 is not available because of PHP bug #63450');
         }
 
@@ -234,7 +234,7 @@ public function testCorrectsForEncodingMismatch()
      */
     public function testStripsUnknownCharactersWhenEncodingMismatchDetected()
     {
-        if (PHP_VERSION_ID >= 50400) {
+        if (PHP_VERSION_ID >= 70000 && PHP_VERSION_ID < 70100) {
             $this->markTestIncomplete('Tested feature ZF-11344 is not available because of PHP bug #63450');
         }
 

tests/Zend/Log/Writer/StreamTest.php

@@ -55,6 +55,8 @@ public function testConstructorThrowsWhenResourceIsNotStream()
         } catch (Exception $e) {
             $this->assertTrue($e instanceof Zend_Log_Exception);
             $this->assertRegExp('/not a stream/i', $e->getMessage());
+        } catch (TypeError $e) {
+            $this->assertRegExp('/must be of t/i', $e->getMessage());
         }
         xml_parser_free($resource);
     }
@@ -90,6 +92,9 @@ public function testConstructorThrowsWhenStreamCannotBeOpened()
         } catch (Exception $e) {
             $this->assertTrue($e instanceof Zend_Log_Exception);
             $this->assertRegExp('/cannot be opened/i', $e->getMessage());
+        } catch (Error $e) {
+            $this->assertTrue($e instanceof ValueError);
+            $this->assertRegExp('/cannot be empty/i', $e->getMessage());
         }
     }
 
@@ -119,7 +124,9 @@ public function testWriteThrowsWhenStreamWriteFails()
             $this->fail();
         } catch (Exception $e) {
             $this->assertTrue($e instanceof Zend_Log_Exception);
-            $this->assertRegExp('/unable to write/i', $e->getMessage());
+        } catch (Error $e) {
+            $this->assertTrue($e instanceof TypeError);
+            $this->assertRegExp('/resource is not a valid/i', $e->getMessage());
         }
     }
 
@@ -136,6 +143,9 @@ public function testShutdownClosesStreamResource()
         } catch (Exception $e) {
             $this->assertTrue($e instanceof Zend_Log_Exception);
             $this->assertRegExp('/unable to write/i', $e->getMessage());
+        } catch (Error $e) {
+            $this->assertTrue($e instanceof TypeError);
+            $this->assertRegExp('/resource is not a valid/i', $e->getMessage());
         }
     }
 

tests/Zend/ProgressBar/Adapter/ConsoleTest.php

@@ -266,6 +266,9 @@ public function testSetOutputStreamOpenFail() {
             $adapter->setOutputStream(null);
             $this->fail('Expected Zend_ProgressBar_Adapter_Exception');
         } catch (Zend_ProgressBar_Adapter_Exception $e) {
+        } catch (Error $e) {
+            $this->assertTrue($e instanceof ValueError);
+            $this->assertContains('cannot be empty', $e->getMessage());
         }
     }
 

tests/Zend/Queue/QueueBaseTest.php

@@ -188,6 +188,9 @@ public function testSendAndCountAndReceiveAndDeleteMessage()
             $this->fail('send() $mesage must be a string');
         } catch (Exception $e) {
             $this->assertTrue(true);
+        } catch (Error $e) {
+            $this->assertTrue($e instanceof TypeError);
+            $this->assertContains('must be of type string', $e->getMessage());
         }
 
         $message = 'Hello world'; // never gets boring!