Remove redundant PARSER_MODE() call (php#19559)

kubawerlos · web-flow · commit 414e521f1a55 · 2025-08-23T09:51:56.000+02:00
diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
@@ -1641,7 +1641,7 @@ OPTIONAL_WHITESPACE_OR_COMMENTS ({WHITESPACE}|{MULTI_LINE_COMMENT}|{SINGLE_LINE_
 <ST_IN_SCRIPTING>"("{TABS_AND_SPACES}("integer"){TABS_AND_SPACES}")" {
 	if (PARSER_MODE()) {
 		zend_error(E_DEPRECATED, "Non-canonical cast (integer) is deprecated, use the (int) cast instead");
-		if (PARSER_MODE() && EG(exception)) {
+		if (EG(exception)) {
 			RETURN_TOKEN(T_ERROR);
 		}
 	}
@@ -1655,7 +1655,7 @@ OPTIONAL_WHITESPACE_OR_COMMENTS ({WHITESPACE}|{MULTI_LINE_COMMENT}|{SINGLE_LINE_
 <ST_IN_SCRIPTING>"("{TABS_AND_SPACES}("double"){TABS_AND_SPACES}")" {
 	if (PARSER_MODE()) {
 		zend_error(E_DEPRECATED, "Non-canonical cast (double) is deprecated, use the (float) cast instead");
-		if (PARSER_MODE() && EG(exception)) {
+		if (EG(exception)) {
 			RETURN_TOKEN(T_ERROR);
 		}
 	}
@@ -1677,7 +1677,7 @@ OPTIONAL_WHITESPACE_OR_COMMENTS ({WHITESPACE}|{MULTI_LINE_COMMENT}|{SINGLE_LINE_
 <ST_IN_SCRIPTING>"("{TABS_AND_SPACES}("binary"){TABS_AND_SPACES}")" {
 	if (PARSER_MODE()) {
 		zend_error(E_DEPRECATED, "Non-canonical cast (binary) is deprecated, use the (string) cast instead");
-		if (PARSER_MODE() && EG(exception)) {
+		if (EG(exception)) {
 			RETURN_TOKEN(T_ERROR);
 		}
 	}
@@ -1699,7 +1699,7 @@ OPTIONAL_WHITESPACE_OR_COMMENTS ({WHITESPACE}|{MULTI_LINE_COMMENT}|{SINGLE_LINE_
 <ST_IN_SCRIPTING>"("{TABS_AND_SPACES}("boolean"){TABS_AND_SPACES}")" {
 	if (PARSER_MODE()) {
 		zend_error(E_DEPRECATED, "Non-canonical cast (boolean) is deprecated, use the (bool) cast instead");
-		if (PARSER_MODE() && EG(exception)) {
+		if (EG(exception)) {
 			RETURN_TOKEN(T_ERROR);
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -1641,7 +1641,7 @@ OPTIONAL_WHITESPACE_OR_COMMENTS ({WHITESPACE}\|{MULTI_LINE_COMMENT}\|{SINGLE_LINE_`
`1641`	`1641`	`<ST_IN_SCRIPTING>"("{TABS_AND_SPACES}("integer"){TABS_AND_SPACES}")" {`
`1642`	`1642`	`if (PARSER_MODE()) {`
`1643`	`1643`	`zend_error(E_DEPRECATED, "Non-canonical cast (integer) is deprecated, use the (int) cast instead");`
`1644`		`- if (PARSER_MODE() && EG(exception)) {`
	`1644`	`+ if (EG(exception)) {`
`1645`	`1645`	`RETURN_TOKEN(T_ERROR);`
`1646`	`1646`	`}`
`1647`	`1647`	`}`
`@@ -1655,7 +1655,7 @@ OPTIONAL_WHITESPACE_OR_COMMENTS ({WHITESPACE}\|{MULTI_LINE_COMMENT}\|{SINGLE_LINE_`
`1655`	`1655`	`<ST_IN_SCRIPTING>"("{TABS_AND_SPACES}("double"){TABS_AND_SPACES}")" {`
`1656`	`1656`	`if (PARSER_MODE()) {`
`1657`	`1657`	`zend_error(E_DEPRECATED, "Non-canonical cast (double) is deprecated, use the (float) cast instead");`
`1658`		`- if (PARSER_MODE() && EG(exception)) {`
	`1658`	`+ if (EG(exception)) {`
`1659`	`1659`	`RETURN_TOKEN(T_ERROR);`
`1660`	`1660`	`}`
`1661`	`1661`	`}`
`@@ -1677,7 +1677,7 @@ OPTIONAL_WHITESPACE_OR_COMMENTS ({WHITESPACE}\|{MULTI_LINE_COMMENT}\|{SINGLE_LINE_`
`1677`	`1677`	`<ST_IN_SCRIPTING>"("{TABS_AND_SPACES}("binary"){TABS_AND_SPACES}")" {`
`1678`	`1678`	`if (PARSER_MODE()) {`
`1679`	`1679`	`zend_error(E_DEPRECATED, "Non-canonical cast (binary) is deprecated, use the (string) cast instead");`
`1680`		`- if (PARSER_MODE() && EG(exception)) {`
	`1680`	`+ if (EG(exception)) {`
`1681`	`1681`	`RETURN_TOKEN(T_ERROR);`
`1682`	`1682`	`}`
`1683`	`1683`	`}`
`@@ -1699,7 +1699,7 @@ OPTIONAL_WHITESPACE_OR_COMMENTS ({WHITESPACE}\|{MULTI_LINE_COMMENT}\|{SINGLE_LINE_`
`1699`	`1699`	`<ST_IN_SCRIPTING>"("{TABS_AND_SPACES}("boolean"){TABS_AND_SPACES}")" {`
`1700`	`1700`	`if (PARSER_MODE()) {`
`1701`	`1701`	`zend_error(E_DEPRECATED, "Non-canonical cast (boolean) is deprecated, use the (bool) cast instead");`
`1702`		`- if (PARSER_MODE() && EG(exception)) {`
	`1702`	`+ if (EG(exception)) {`
`1703`	`1703`	`RETURN_TOKEN(T_ERROR);`
`1704`	`1704`	`}`
`1705`	`1705`	`}`