20210714 Build Fix 3

NathanGibbs3 · Jul 14, 2021 · 4b4b1d6 · 4b4b1d6
1 parent 114f586
commit 4b4b1d6
Show file tree

Hide file tree

Showing 3 changed files with 162 additions and 52 deletions.
diff --git a/tests/php/langcommonTest.php b/tests/php/langcommonTest.php
@@ -130,9 +130,12 @@ public function testBlankPropsValueNULLThrowsError() {
 		}elseif (version_compare($PHPUV, '6.0', '<')) { // PHPUnit 5x
 			$this->expectException("PHPUnit_Framework_Error_Notice");
 			$this->expectExceptionMessage($EEM);
-		}else{ // PHPUnit 6+
+		}elseif (version_compare($PHPUV, '9.0', '<')) { // PHPUnit 6x - 8x
 			$this->expectException("PHPUnit\Framework\Error\Notice");
 			$this->expectExceptionMessage($EEM);
+		}else{ // PHPUnit 9+
+			$this->expectNotice();
+			$this->expectNoticeMessage($EEM);
 		}
 		$$tmp->BlankProps('NULL',NULL);
 	}
@@ -224,9 +227,12 @@ public function testADASetItemInvalidThrowsError() {
 			}elseif (version_compare($PHPUV, '6.0', '<')) { // PHPUnit 5x
 				$this->expectException("PHPUnit_Framework_Error_Notice");
 				$this->expectExceptionMessage($EEM);
-			}else{ // PHPUnit 6+
+			}elseif (version_compare($PHPUV, '9.0', '<')) { // PHPUnit 6x - 8x
 				$this->expectException("PHPUnit\Framework\Error\Notice");
 				$this->expectExceptionMessage($EEM);
+			}else{ // PHPUnit 9+
+				$this->expectNotice();
+				$this->expectNoticeMessage($EEM);
 			}
 			$$tmp->SetUIADItem($key,$kD);
 		}else{
@@ -256,9 +262,12 @@ public function testCWASetItemInvalidThrowsError() {
 		}elseif (version_compare($PHPUV, '6.0', '<')) { // PHPUnit 5x
 			$this->expectException("PHPUnit_Framework_Error_Notice");
 			$this->expectExceptionMessage($EEM);
-		}else{ // PHPUnit 6+
+		}elseif (version_compare($PHPUV, '9.0', '<')) { // PHPUnit 6x - 8x
 			$this->expectException("PHPUnit\Framework\Error\Notice");
 			$this->expectExceptionMessage($EEM);
+		}else{ // PHPUnit 9+
+			$this->expectNotice();
+			$this->expectNoticeMessage($EEM);
 		}
 		$$tmp->SetUICWItem($key,$kD);
 	}
@@ -283,9 +292,12 @@ public function testCPASetItemInvalidThrowsError() {
 		}elseif (version_compare($PHPUV, '6.0', '<')) { // PHPUnit 5x
 			$this->expectException("PHPUnit_Framework_Error_Notice");
 			$this->expectExceptionMessage($EEM);
-		}else{ // PHPUnit 6+
+		}elseif (version_compare($PHPUV, '9.0', '<')) { // PHPUnit 6x - 8x
 			$this->expectException("PHPUnit\Framework\Error\Notice");
 			$this->expectExceptionMessage($EEM);
+		}else{ // PHPUnit 9+
+			$this->expectNotice();
+			$this->expectNoticeMessage($EEM);
 		}
 		$$tmp->SetUICPItem($key,$kD);
 	}
@@ -310,9 +322,12 @@ public function testUAASetItemInvalidThrowsError() {
 		}elseif (version_compare($PHPUV, '6.0', '<')) { // PHPUnit 5x
 			$this->expectException("PHPUnit_Framework_Error_Notice");
 			$this->expectExceptionMessage($EEM);
-		}else{ // PHPUnit 6+
+		}elseif (version_compare($PHPUV, '9.0', '<')) { // PHPUnit 6x - 8x
 			$this->expectException("PHPUnit\Framework\Error\Notice");
 			$this->expectExceptionMessage($EEM);
+		}else{ // PHPUnit 9+
+			$this->expectNotice();
+			$this->expectNoticeMessage($EEM);
 		}
 		$$tmp->SetUIUAItem($key,$kD);
 	}

diff --git a/tests/php/langcommonspTest.php b/tests/php/langcommonspTest.php
@@ -80,9 +80,12 @@ public function testTDFNotExistThrowsError() {
 		}elseif (version_compare($PHPUV, '6.0', '<')) { // PHPUnit 5x
 			$this->expectException("PHPUnit_Framework_Error_Notice");
 			$this->expectExceptionMessage($EEM);
-		}else{ // PHPUnit 6+
+		}elseif (version_compare($PHPUV, '9.0', '<')) { // PHPUnit 6x - 8x
 			$this->expectException("PHPUnit\Framework\Error\Notice");
 			$this->expectExceptionMessage($EEM);
+		}else{ // PHPUnit 9+
+			$this->expectNotice();
+			$this->expectNoticeMessage($EEM);
 		}
 		$this->assertInstanceOf('UILang',self::$UIL = new UILang($lang),
 			"Class for $lang not created."