PHP error messages lose '.' in PHP 7.2

fisharebest · Jan 16, 2018 · d30c982 · d30c982
1 parent 427cfd2
commit d30c982
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 27 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 CHANGE LOG
 ==========
 
+## 2.4.0 (2018-01-15)
+ - PHP error messages changed slightly in 7.2.0
+
 ## 2.3.1 (2018-01-15)
  - Update PHPdoc to use int/bool instead of integer/boolean
 

diff --git a/src/Shim.php b/src/Shim.php
@@ -196,7 +196,9 @@ private static function calDaysInMonthCalendar(CalendarInterface $calendar, $yea
 		try {
 			return $calendar->daysInMonth($year, $month);
 		} catch (InvalidArgumentException $ex) {
-			return trigger_error('invalid date.', E_USER_WARNING);
+			$error_msg = PHP_VERSION_ID < 70200 ? 'invalid date.' : 'invalid date';
+
+			return trigger_error($error_msg, E_USER_WARNING);
 		}
 	}
 
@@ -214,7 +216,9 @@ private static function calDaysInMonthFrench($year, $month) {
 		if ($month == 13 && $year == 14 && self::shouldEmulateBug67976()) {
 			return -2380948;
 		} elseif ($year > 14) {
-			return trigger_error('invalid date.', E_USER_WARNING);
+			$error_msg = PHP_VERSION_ID < 70200 ? 'invalid date.' : 'invalid date';
+
+			return trigger_error($error_msg, E_USER_WARNING);
 		} else {
 			return self::calDaysInMonthCalendar(self::$french_calendar, $year, $month);
 		}
@@ -648,7 +652,9 @@ public static function jdToGregorian($julian_day) {
 	public static function jdToJewish($julian_day, $hebrew, $fl) {
 		if ($hebrew) {
 			if ($julian_day < 347998 || $julian_day > 4000075) {
-				return trigger_error('Year out of range (0-9999).', E_USER_WARNING);
+				$error_msg = PHP_VERSION_ID < 70200 ? 'Year out of range (0-9999).' : 'Year out of range (0-9999)';
+
+				return trigger_error($error_msg, E_USER_WARNING);
 			}
 
 			return self::$jewish_calendar->jdToHebrew(

diff --git a/test/ShimTest.php b/test/ShimTest.php
@@ -132,7 +132,7 @@ public function testCalDaysInMonthFrenchBug67976() {
 	 * Test the implementation of Shim::calDaysInMonth() against cal_days_in_month()
 	 *
 	 * @expectedException        \PHPUnit_Framework_Error_Warning
-	 * @expectedExceptionMessage invalid date.
+	 * @expectedExceptionMessage invalid date
 	 * @return                   void
 	 */
 	public function testCalDaysInMonthFrenchInvalidMonth1() {
@@ -143,7 +143,7 @@ public function testCalDaysInMonthFrenchInvalidMonth1() {
 	 * Test the implementation of Shim::calDaysInMonth() against cal_days_in_month()
 	 *
 	 * @expectedException        \PHPUnit_Framework_Error_Warning
-	 * @expectedExceptionMessage invalid date.
+	 * @expectedExceptionMessage invalid date
 	 * @return                   void
 	 */
 	public function testCalDaysInMonthFrenchInvalidMonth2() {
@@ -154,7 +154,7 @@ public function testCalDaysInMonthFrenchInvalidMonth2() {
 	 * Test the implementation of Shim::calDaysInMonth() against cal_days_in_month()
 	 *
 	 * @expectedException        \PHPUnit_Framework_Error_Warning
-	 * @expectedExceptionMessage invalid date.
+	 * @expectedExceptionMessage invalid date
 	 * @return                   void
 	 */
 	public function testCalDaysInMonthFrenchZeroYear1() {
@@ -165,7 +165,7 @@ public function testCalDaysInMonthFrenchZeroYear1() {
 	 * Test the implementation of Shim::calDaysInMonth() against cal_days_in_month()
 	 *
 	 * @expectedException        \PHPUnit_Framework_Error_Warning
-	 * @expectedExceptionMessage invalid date.
+	 * @expectedExceptionMessage invalid date
 	 * @return                   void
 	 */
 	public function testCalDaysInMonthFrenchZeroYear2() {
@@ -176,7 +176,7 @@ public function testCalDaysInMonthFrenchZeroYear2() {
 	 * Test the implementation of Shim::calDaysInMonth() against cal_days_in_month()
 	 *
 	 * @expectedException        \PHPUnit_Framework_Error_Warning
-	 * @expectedExceptionMessage invalid date.
+	 * @expectedExceptionMessage invalid date
 	 * @return                   void
 	 */
 	public function testCalDaysInMonthFrenchNegativeYear1() {
@@ -187,7 +187,7 @@ public function testCalDaysInMonthFrenchNegativeYear1() {
 	 * Test the implementation of Shim::calDaysInMonth() against cal_days_in_month()
 	 *
 	 * @expectedException        \PHPUnit_Framework_Error_Warning
-	 * @expectedExceptionMessage invalid date.
+	 * @expectedExceptionMessage invalid date
 	 * @return                   void
 	 */
 	public function testCalDaysInMonthFrenchNegativeYear2() {
@@ -198,7 +198,7 @@ public function testCalDaysInMonthFrenchNegativeYear2() {
 	 * Test the implementation of Shim::calDaysInMonth() against cal_days_in_month()
 	 *
 	 * @expectedException        \PHPUnit_Framework_Error_Warning
-	 * @expectedExceptionMessage invalid date.
+	 * @expectedExceptionMessage invalid date
 	 * @return                   void
 	 */
 	public function testCalDaysInMonthFrenchHighYear1() {
@@ -209,7 +209,7 @@ public function testCalDaysInMonthFrenchHighYear1() {
 	 * Test the implementation of Shim::calDaysInMonth() against cal_days_in_month()
 	 *
 	 * @expectedException        \PHPUnit_Framework_Error_Warning
-	 * @expectedExceptionMessage invalid date.
+	 * @expectedExceptionMessage invalid date
 	 * @return                   void
 	 */
 	public function testCalDaysInMonthFrenchHighYear2() {
@@ -237,7 +237,7 @@ public function testCalDaysInMonthGregorian() {
 	 * Test the implementation of Shim::calDaysInMonth() against cal_days_in_month()
 	 *
 	 * @expectedException        \PHPUnit_Framework_Error_Warning
-	 * @expectedExceptionMessage invalid date.
+	 * @expectedExceptionMessage invalid date
 	 * @return                   void
 	 */
 	public function testCalDaysInMonthGregorianInvalidMonth1() {
@@ -248,7 +248,7 @@ public function testCalDaysInMonthGregorianInvalidMonth1() {
 	 * Test the implementation of Shim::calDaysInMonth() against cal_days_in_month()
 	 *
 	 * @expectedException        \PHPUnit_Framework_Error_Warning
-	 * @expectedExceptionMessage invalid date.
+	 * @expectedExceptionMessage invalid date
 	 * @return                   void
 	 */
 	public function testCalDaysInMonthGregorianInvalidMonth2() {
@@ -259,7 +259,7 @@ public function testCalDaysInMonthGregorianInvalidMonth2() {
 	 * Test the implementation of Shim::calDaysInMonth() against cal_days_in_month()
 	 *
 	 * @expectedException        \PHPUnit_Framework_Error_Warning
-	 * @expectedExceptionMessage invalid date.
+	 * @expectedExceptionMessage invalid date
 	 * @return                   void
 	 */
 	public function testCalDaysInMonthGregorianInvalidYear1() {
@@ -270,7 +270,7 @@ public function testCalDaysInMonthGregorianInvalidYear1() {
 	 * Test the implementation of Shim::calDaysInMonth() against cal_days_in_month()
 	 *
 	 * @expectedException        \PHPUnit_Framework_Error_Warning
-	 * @expectedExceptionMessage invalid date.
+	 * @expectedExceptionMessage invalid date
 	 * @return                   void
 	 */
 	public function testCalDaysInMonthGregorianInvalidYear2() {
@@ -313,7 +313,7 @@ public function testCalDaysInMonthJewish() {
 	 * Test the implementation of Shim::calDaysInMonth() against cal_days_in_month()
 	 *
 	 * @expectedException        \PHPUnit_Framework_Error_Warning
-	 * @expectedExceptionMessage invalid date.
+	 * @expectedExceptionMessage invalid date
 	 * @return                   void
 	 */
 	public function testCalDaysInMonthJewishInvalidMonth1() {
@@ -324,7 +324,7 @@ public function testCalDaysInMonthJewishInvalidMonth1() {
 	 * Test the implementation of Shim::calDaysInMonth() against cal_days_in_month()
 	 *
 	 * @expectedException        \PHPUnit_Framework_Error_Warning
-	 * @expectedExceptionMessage invalid date.
+	 * @expectedExceptionMessage invalid date
 	 * @return                   void
 	 */
 	public function testCalDaysInMonthJewishInvalidMonth2() {
@@ -335,7 +335,7 @@ public function testCalDaysInMonthJewishInvalidMonth2() {
 	 * Test the implementation of Shim::calDaysInMonth() against cal_days_in_month()
 	 *
 	 * @expectedException        \PHPUnit_Framework_Error_Warning
-	 * @expectedExceptionMessage invalid date.
+	 * @expectedExceptionMessage invalid date
 	 * @return                   void
 	 */
 	public function testCalDaysInMonthJewishInvalidYear1() {
@@ -346,7 +346,7 @@ public function testCalDaysInMonthJewishInvalidYear1() {
 	 * Test the implementation of Shim::calDaysInMonth() against cal_days_in_month()
 	 *
 	 * @expectedException        \PHPUnit_Framework_Error_Warning
-	 * @expectedExceptionMessage invalid date.
+	 * @expectedExceptionMessage invalid date
 	 * @return                   void
 	 */
 	public function testCalDaysInMonthJewishInvalidYear2() {
@@ -357,7 +357,7 @@ public function testCalDaysInMonthJewishInvalidYear2() {
 	 * Test the implementation of Shim::calDaysInMonth() against cal_days_in_month()
 	 *
 	 * @expectedException        \PHPUnit_Framework_Error_Warning
-	 * @expectedExceptionMessage invalid date.
+	 * @expectedExceptionMessage invalid date
 	 * @return                   void
 	 */
 	public function testCalDaysInMonthJulianInvalidMonth1() {
@@ -368,7 +368,7 @@ public function testCalDaysInMonthJulianInvalidMonth1() {
 	 * Test the implementation of Shim::calDaysInMonth() against cal_days_in_month()
 	 *
 	 * @expectedException        \PHPUnit_Framework_Error_Warning
-	 * @expectedExceptionMessage invalid date.
+	 * @expectedExceptionMessage invalid date
 	 * @return                   void
 	 */
 	public function testCalDaysInMonthJulianInvalidMonth2() {
@@ -379,7 +379,7 @@ public function testCalDaysInMonthJulianInvalidMonth2() {
 	 * Test the implementation of Shim::calDaysInMonth() against cal_days_in_month()
 	 *
 	 * @expectedException        \PHPUnit_Framework_Error_Warning
-	 * @expectedExceptionMessage invalid date.
+	 * @expectedExceptionMessage invalid date
 	 * @return                   void
 	 */
 	public function testCalDaysInMonthJulianInvalidYear1() {
@@ -390,7 +390,7 @@ public function testCalDaysInMonthJulianInvalidYear1() {
 	 * Test the implementation of Shim::calDaysInMonth() against cal_days_in_month()
 	 *
 	 * @expectedException        \PHPUnit_Framework_Error_Warning
-	 * @expectedExceptionMessage invalid date.
+	 * @expectedExceptionMessage invalid date
 	 * @return                   void
 	 */
 	public function testCalDaysInMonthJulianInvalidYear2() {
@@ -1086,7 +1086,7 @@ public function testJdToJewishHebrew() {
 	 * Test the implementation of Shim::calFromJd() against cal_from_jd()
 	 *
 	 * @expectedException        \PHPUnit_Framework_Error_Warning
-	 * @expectedExceptionMessage Year out of range (0-9999).
+	 * @expectedExceptionMessage Year out of range (0-9999)
 	 * @return                   void
 	 */
 	public function testJdToJewishHebrewOutOfRangeLow1() {
@@ -1100,7 +1100,7 @@ public function testJdToJewishHebrewOutOfRangeLow1() {
 	 * Test the implementation of Shim::calFromJd() against cal_from_jd()
 	 *
 	 * @expectedException        \PHPUnit_Framework_Error_Warning
-	 * @expectedExceptionMessage Year out of range (0-9999).
+	 * @expectedExceptionMessage Year out of range (0-9999)
 	 * @return                   void
 	 */
 	public function testJdToJewishHebrewOutOfRangeLow2() {
@@ -1114,7 +1114,7 @@ public function testJdToJewishHebrewOutOfRangeLow2() {
 	 * Test the implementation of Shim::calFromJd() against cal_from_jd()
 	 *
 	 * @expectedException        \PHPUnit_Framework_Error_Warning
-	 * @expectedExceptionMessage Year out of range (0-9999).
+	 * @expectedExceptionMessage Year out of range (0-9999)
 	 * @return                   void
 	 */
 	public function testJdToJewishHebrewOutOfRangeHigh1() {
@@ -1128,7 +1128,7 @@ public function testJdToJewishHebrewOutOfRangeHigh1() {
 	 * Test the implementation of Shim::calFromJd() against cal_from_jd()
 	 *
 	 * @expectedException        \PHPUnit_Framework_Error_Warning
-	 * @expectedExceptionMessage Year out of range (0-9999).
+	 * @expectedExceptionMessage Year out of range (0-9999)
 	 * @return                   void
 	 */
 	public function testJdToJewishHebrewOutOfRangeHigh2() {