Skip to content

[RFC] Strict operators directive #4375

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jasny wants to merge 14 commits into from
Closed

[RFC] Strict operators directive #4375

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
15f6983
Implemented `declare(strict_operators=1)`
jasny Jun 26, 2019
10dd07c
Implemented strict operators for comparison
jasny Jul 3, 2019
9374ab0
Added tests for operators
jasny Jul 5, 2019
8ad5a45
Operator tests for strict operators (WIP)
jasny Jul 5, 2019
12ace51
Strict operator support for increment/decrement operator
jasny Jul 5, 2019
0571785
Strict operator support for concatenation operator
jasny Jul 5, 2019
55a834f
Strict operators for bitwise ops.
jasny Jul 6, 2019
b3895ff
Fixed strict equal operator.
jasny Jul 7, 2019
f13984c
Strict operators for case (in switch).
jasny Jul 8, 2019
839de82
Implemented strict_operators support for objects
jasny Jul 8, 2019
2a35e72
Also throw `TypeError` for using NULL with concat operator in strict_…
jasny Jul 8, 2019
db905a6
Better error messages for strict operators
jasny Jul 9, 2019
578dff9
More consistent error messages for strict_operators.
jasny Jul 9, 2019
ba955e7
Normalize output for spaceship operator when using strict_operators.
jasny Jul 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Also throw TypeError for using NULL with concat operator in strict_… 
…operators mode.

(suggested by @nikic)
  • Loading branch information
@jasny
jasny committed Jul 8, 2019
commit 2a35e72ca42f8fafe2f8cbd4ebbc1dc396f29f09
58 changes: 29 additions & 29 deletions Zend/tests/operators/string/concatenation_strict.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ true . NULL - TypeError Unsupported operands
0 . (object) array ( 'bar' => 1, 'foo' => 2 ) - TypeError Object of class stdClass could not be converted to string
0 . DateTime - TypeError Object of class DateTime could not be converted to string
0 . resource - TypeError Unsupported operands
0 . NULL = '0'
0 . NULL - TypeError Unsupported operands
10 . false - TypeError Unsupported operands
10 . true - TypeError Unsupported operands
10 . 0 = '100'
Expand All @@ -102,7 +102,7 @@ true . NULL - TypeError Unsupported operands
10 . (object) array ( 'bar' => 1, 'foo' => 2 ) - TypeError Object of class stdClass could not be converted to string
10 . DateTime - TypeError Object of class DateTime could not be converted to string
10 . resource - TypeError Unsupported operands
10 . NULL = '10'
10 . NULL - TypeError Unsupported operands
0.0 . false - TypeError Unsupported operands
0.0 . true - TypeError Unsupported operands
0.0 . 0 = '00'
Expand All @@ -125,7 +125,7 @@ true . NULL - TypeError Unsupported operands
0.0 . (object) array ( 'bar' => 1, 'foo' => 2 ) - TypeError Object of class stdClass could not be converted to string
0.0 . DateTime - TypeError Object of class DateTime could not be converted to string
0.0 . resource - TypeError Unsupported operands
0.0 . NULL = '0'
0.0 . NULL - TypeError Unsupported operands
10.0 . false - TypeError Unsupported operands
10.0 . true - TypeError Unsupported operands
10.0 . 0 = '100'
Expand All @@ -148,7 +148,7 @@ true . NULL - TypeError Unsupported operands
10.0 . (object) array ( 'bar' => 1, 'foo' => 2 ) - TypeError Object of class stdClass could not be converted to string
10.0 . DateTime - TypeError Object of class DateTime could not be converted to string
10.0 . resource - TypeError Unsupported operands
10.0 . NULL = '10'
10.0 . NULL - TypeError Unsupported operands
3.14 . false - TypeError Unsupported operands
3.14 . true - TypeError Unsupported operands
3.14 . 0 = '3.140'
Expand All @@ -171,7 +171,7 @@ true . NULL - TypeError Unsupported operands
3.14 . (object) array ( 'bar' => 1, 'foo' => 2 ) - TypeError Object of class stdClass could not be converted to string
3.14 . DateTime - TypeError Object of class DateTime could not be converted to string
3.14 . resource - TypeError Unsupported operands
3.14 . NULL = '3.14'
3.14 . NULL - TypeError Unsupported operands
'0' . false - TypeError Unsupported operands
'0' . true - TypeError Unsupported operands
'0' . 0 = '00'
Expand All @@ -194,7 +194,7 @@ true . NULL - TypeError Unsupported operands
'0' . (object) array ( 'bar' => 1, 'foo' => 2 ) - TypeError Object of class stdClass could not be converted to string
'0' . DateTime - TypeError Object of class DateTime could not be converted to string
'0' . resource - TypeError Unsupported operands
'0' . NULL = '0'
'0' . NULL - TypeError Unsupported operands
'10' . false - TypeError Unsupported operands
'10' . true - TypeError Unsupported operands
'10' . 0 = '100'
Expand All @@ -217,7 +217,7 @@ true . NULL - TypeError Unsupported operands
'10' . (object) array ( 'bar' => 1, 'foo' => 2 ) - TypeError Object of class stdClass could not be converted to string
'10' . DateTime - TypeError Object of class DateTime could not be converted to string
'10' . resource - TypeError Unsupported operands
'10' . NULL = '10'
'10' . NULL - TypeError Unsupported operands
'010' . false - TypeError Unsupported operands
'010' . true - TypeError Unsupported operands
'010' . 0 = '0100'
Expand All @@ -240,7 +240,7 @@ true . NULL - TypeError Unsupported operands
'010' . (object) array ( 'bar' => 1, 'foo' => 2 ) - TypeError Object of class stdClass could not be converted to string
'010' . DateTime - TypeError Object of class DateTime could not be converted to string
'010' . resource - TypeError Unsupported operands
'010' . NULL = '010'
'010' . NULL - TypeError Unsupported operands
'10 elephants' . false - TypeError Unsupported operands
'10 elephants' . true - TypeError Unsupported operands
'10 elephants' . 0 = '10 elephants0'
Expand All @@ -263,7 +263,7 @@ true . NULL - TypeError Unsupported operands
'10 elephants' . (object) array ( 'bar' => 1, 'foo' => 2 ) - TypeError Object of class stdClass could not be converted to string
'10 elephants' . DateTime - TypeError Object of class DateTime could not be converted to string
'10 elephants' . resource - TypeError Unsupported operands
'10 elephants' . NULL = '10 elephants'
'10 elephants' . NULL - TypeError Unsupported operands
'foo' . false - TypeError Unsupported operands
'foo' . true - TypeError Unsupported operands
'foo' . 0 = 'foo0'
Expand All @@ -286,7 +286,7 @@ true . NULL - TypeError Unsupported operands
'foo' . (object) array ( 'bar' => 1, 'foo' => 2 ) - TypeError Object of class stdClass could not be converted to string
'foo' . DateTime - TypeError Object of class DateTime could not be converted to string
'foo' . resource - TypeError Unsupported operands
'foo' . NULL = 'foo'
'foo' . NULL - TypeError Unsupported operands
array ( ) . false - TypeError Unsupported operands
array ( ) . true - TypeError Unsupported operands
array ( ) . 0 - TypeError Unsupported operands
Expand Down Expand Up @@ -424,7 +424,7 @@ array ( 'bar' => 1, 'foo' => 2 ) . NULL - TypeError Unsupported operands
(object) array ( ) . (object) array ( 'bar' => 1, 'foo' => 2 ) - TypeError Object of class stdClass could not be converted to string
(object) array ( ) . DateTime - TypeError Object of class stdClass could not be converted to string
(object) array ( ) . resource - TypeError Unsupported operands
(object) array ( ) . NULL - TypeError Object of class stdClass could not be converted to string
(object) array ( ) . NULL - TypeError Unsupported operands
(object) array ( 'foo' => 1, 'bar' => 2 ) . false - TypeError Unsupported operands
(object) array ( 'foo' => 1, 'bar' => 2 ) . true - TypeError Unsupported operands
(object) array ( 'foo' => 1, 'bar' => 2 ) . 0 - TypeError Object of class stdClass could not be converted to string
Expand All @@ -447,7 +447,7 @@ array ( 'bar' => 1, 'foo' => 2 ) . NULL - TypeError Unsupported operands
(object) array ( 'foo' => 1, 'bar' => 2 ) . (object) array ( 'bar' => 1, 'foo' => 2 ) - TypeError Object of class stdClass could not be converted to string
(object) array ( 'foo' => 1, 'bar' => 2 ) . DateTime - TypeError Object of class stdClass could not be converted to string
(object) array ( 'foo' => 1, 'bar' => 2 ) . resource - TypeError Unsupported operands
(object) array ( 'foo' => 1, 'bar' => 2 ) . NULL - TypeError Object of class stdClass could not be converted to string
(object) array ( 'foo' => 1, 'bar' => 2 ) . NULL - TypeError Unsupported operands
(object) array ( 'bar' => 1, 'foo' => 2 ) . false - TypeError Unsupported operands
(object) array ( 'bar' => 1, 'foo' => 2 ) . true - TypeError Unsupported operands
(object) array ( 'bar' => 1, 'foo' => 2 ) . 0 - TypeError Object of class stdClass could not be converted to string
Expand All @@ -470,7 +470,7 @@ array ( 'bar' => 1, 'foo' => 2 ) . NULL - TypeError Unsupported operands
(object) array ( 'bar' => 1, 'foo' => 2 ) . (object) array ( 'bar' => 1, 'foo' => 2 ) - TypeError Object of class stdClass could not be converted to string
(object) array ( 'bar' => 1, 'foo' => 2 ) . DateTime - TypeError Object of class stdClass could not be converted to string
(object) array ( 'bar' => 1, 'foo' => 2 ) . resource - TypeError Unsupported operands
(object) array ( 'bar' => 1, 'foo' => 2 ) . NULL - TypeError Object of class stdClass could not be converted to string
(object) array ( 'bar' => 1, 'foo' => 2 ) . NULL - TypeError Unsupported operands
DateTime . false - TypeError Unsupported operands
DateTime . true - TypeError Unsupported operands
DateTime . 0 - TypeError Object of class DateTime could not be converted to string
Expand All @@ -493,7 +493,7 @@ DateTime . (object) array ( 'foo' => 1, 'bar' => 2 ) - TypeError Object of class
DateTime . (object) array ( 'bar' => 1, 'foo' => 2 ) - TypeError Object of class DateTime could not be converted to string
DateTime . DateTime - TypeError Object of class DateTime could not be converted to string
DateTime . resource - TypeError Unsupported operands
DateTime . NULL - TypeError Object of class DateTime could not be converted to string
DateTime . NULL - TypeError Unsupported operands
resource . false - TypeError Unsupported operands
resource . true - TypeError Unsupported operands
resource . 0 - TypeError Unsupported operands
Expand All @@ -519,24 +519,24 @@ resource . resource - TypeError Unsupported operands
resource . NULL - TypeError Unsupported operands
NULL . false - TypeError Unsupported operands
NULL . true - TypeError Unsupported operands
NULL . 0 = '0'
NULL . 10 = '10'
NULL . 0.0 = '0'
NULL . 10.0 = '10'
NULL . 3.14 = '3.14'
NULL . '0' = '0'
NULL . '10' = '10'
NULL . '010' = '010'
NULL . '10 elephants' = '10 elephants'
NULL . 'foo' = 'foo'
NULL . 0 - TypeError Unsupported operands
NULL . 10 - TypeError Unsupported operands
NULL . 0.0 - TypeError Unsupported operands
NULL . 10.0 - TypeError Unsupported operands
NULL . 3.14 - TypeError Unsupported operands
NULL . '0' - TypeError Unsupported operands
NULL . '10' - TypeError Unsupported operands
NULL . '010' - TypeError Unsupported operands
NULL . '10 elephants' - TypeError Unsupported operands
NULL . 'foo' - TypeError Unsupported operands
NULL . array ( ) - TypeError Unsupported operands
NULL . array ( 0 => 1 ) - TypeError Unsupported operands
NULL . array ( 0 => 1, 1 => 100 ) - TypeError Unsupported operands
NULL . array ( 'foo' => 1, 'bar' => 2 ) - TypeError Unsupported operands
NULL . array ( 'bar' => 1, 'foo' => 2 ) - TypeError Unsupported operands
NULL . (object) array ( ) - TypeError Object of class stdClass could not be converted to string
NULL . (object) array ( 'foo' => 1, 'bar' => 2 ) - TypeError Object of class stdClass could not be converted to string
NULL . (object) array ( 'bar' => 1, 'foo' => 2 ) - TypeError Object of class stdClass could not be converted to string
NULL . DateTime - TypeError Object of class DateTime could not be converted to string
NULL . (object) array ( ) - TypeError Unsupported operands
NULL . (object) array ( 'foo' => 1, 'bar' => 2 ) - TypeError Unsupported operands
NULL . (object) array ( 'bar' => 1, 'foo' => 2 ) - TypeError Unsupported operands
NULL . DateTime - TypeError Unsupported operands
NULL . resource - TypeError Unsupported operands
NULL . NULL = ''
NULL . NULL - TypeError Unsupported operands
4 changes: 2 additions & 2 deletions Zend/zend_operators.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1928,8 +1928,8 @@ ZEND_API int ZEND_FASTCALL concat_function(zval *result, zval *op1, zval *op2) /
ZVAL_UNDEF(&op2_copy);

if (ZEND_USES_STRICT_OPERATORS()) {
if (UNEXPECTED(Z_TYPE_P(op1) == IS_FALSE || Z_TYPE_P(op1) == IS_TRUE || Z_TYPE_P(op1) == IS_ARRAY || Z_TYPE_P(op1) == IS_RESOURCE
|| Z_TYPE_P(op2) == IS_FALSE || Z_TYPE_P(op2) == IS_TRUE || Z_TYPE_P(op2) == IS_ARRAY || Z_TYPE_P(op2) == IS_RESOURCE
if (UNEXPECTED(Z_TYPE_P(op1) <= IS_TRUE || Z_TYPE_P(op1) == IS_ARRAY || Z_TYPE_P(op1) == IS_RESOURCE
|| Z_TYPE_P(op2) <= IS_TRUE || Z_TYPE_P(op2) == IS_ARRAY || Z_TYPE_P(op2) == IS_RESOURCE
)) {
zend_throw_error(zend_ce_type_error, "Unsupported operands");
return FAILURE;
Expand Down