Further implementation of op overloads

Zend/tests/operator_overloads/add_operator.phpt

@@ -0,0 +1,31 @@
+--TEST--
+operator overload: add operator with scalars
+--FILE--
+<?php
+
+class A {
+    public int $value;
+
+    public function __add(int $other, bool $left): A
+    {
+    	$return = new A();
+    	$return->value = $this->value + $other;
+
+		return $return;
+    }
+}
+
+$obj = new A();
+$obj->value = 3;
+
+$num1 = 2 + $obj;
+
+var_dump($num1->value);
+
+$num2 = $obj + 3;
+
+var_dump($num2->value);
+?>
+--EXPECT--
+int(5)
+int(6)

Zend/tests/operator_overloads/div_operator.phpt

@@ -0,0 +1,36 @@
+--TEST--
+operator overload: div operator with scalars
+--FILE--
+<?php
+
+class A {
+    public int $value;
+
+    public function __div(int $other, bool $left): A
+    {
+    	$return = new A();
+
+    	if ($left) {
+    		$return->value = $this->value / $other;
+    	} else {
+    		$return->value = $other / $this->value;
+    	}
+
+		return $return;
+    }
+}
+
+$obj = new A();
+$obj->value = 6;
+
+$num1 = 12 / $obj;
+
+var_dump($num1->value);
+
+$num2 = $obj / 2;
+
+var_dump($num2->value);
+?>
+--EXPECT--
+int(2)
+int(3)

Zend/tests/operator_overloads/equals_operator.phpt

@@ -0,0 +1,43 @@
+--TEST--
+operator overload: div operator with scalars
+--FILE--
+<?php
+
+class A {
+    public int $value;
+
+    public function __equals(mixed $other): bool
+    {
+		return ($this->value == $other);
+    }
+}
+
+$obj = new A();
+$obj->value = 6;
+
+$bool1 = 12 == $obj;
+
+var_dump($bool1);
+
+$bool2 = $obj == 2;
+
+var_dump($bool2);
+
+$bool3 = $obj == 6;
+
+var_dump($bool3);
+
+$bool4 = $obj == 6.0;
+
+var_dump($bool4);
+
+$bool5 = $obj != 6.0;
+
+var_dump($bool5);
+?>
+--EXPECT--
+bool(false)
+bool(false)
+bool(true)
+bool(true)
+bool(false)

Zend/tests/operator_overloads/mod_operator.phpt

@@ -0,0 +1,36 @@
+--TEST--
+operator overload: mod operator with scalars
+--FILE--
+<?php
+
+class A {
+    public int $value;
+
+    public function __mod(int $other, bool $left): A
+    {
+    	$return = new A();
+
+    	if ($left) {
+    		$return->value = $this->value % $other;
+    	} else {
+    		$return->value = $other % $this->value;
+    	}
+
+		return $return;
+    }
+}
+
+$obj = new A();
+$obj->value = 2;
+
+$num1 = 3 % $obj;
+
+var_dump($num1->value);
+
+$num2 = $obj % 4;
+
+var_dump($num2->value);
+?>
+--EXPECT--
+int(1)
+int(2)

Zend/tests/operator_overloads/mul_operator.phpt

@@ -0,0 +1,31 @@
+--TEST--
+operator overload: mul operator with scalars
+--FILE--
+<?php
+
+class A {
+    public int $value;
+
+    public function __mul(int $other, bool $left): A
+    {
+    	$return = new A();
+    	$return->value = $this->value * $other;
+
+		return $return;
+    }
+}
+
+$obj = new A();
+$obj->value = 3;
+
+$num1 = 2 * $obj;
+
+var_dump($num1->value);
+
+$num2 = $obj * 3;
+
+var_dump($num2->value);
+?>
+--EXPECT--
+int(6)
+int(9)

Zend/tests/operator_overloads/operator_omitted_type.phpt

@@ -0,0 +1,19 @@
+--TEST--
+operator overload: no explicit type
+--FILE--
+<?php
+
+class A {
+    public int $value;
+
+    public function __add($other, bool $left): self
+    {
+    	$return = new A();
+    	$return->value = $this->value + $other;
+
+		return $return;
+    }
+}
+?>
+--EXPECTF--
+Fatal error: A::__add(): Parameter #1 ($other) must explicitly define a type in %s on line %d

Zend/tests/operator_overloads/operator_unimplemented.phpt

@@ -0,0 +1,56 @@
+--TEST--
+operator overload: unimplemented
+--FILE--
+<?php
+
+class A {
+    public int $value;
+}
+
+class B {
+	public int $value;
+
+	public function __add(int|A $other, bool $left): B
+	{
+		$return = new B();
+		if (is_int($other)) {
+			$return->value = $this->value + $other;
+		} else {
+			$return->value = $this->value + $other->value;
+		}
+
+		return $return;
+	}
+}
+
+$obj1 = new A();
+$obj1->value = 3;
+$obj2 = new B();
+$obj2->value = 2;
+
+try {
+	$num1 = $obj1 + 2;
+} catch (InvalidOperator) {
+	echo "OK!".PHP_EOL;
+}
+
+try {
+	$num2 = 2 + $obj1;
+} catch (InvalidOperator) {
+	echo "STILL OK!".PHP_EOL;
+}
+
+$num3 = $obj1 + $obj2;
+
+var_dump($num3->value);
+
+$num4 = $obj2 + $obj1;
+
+var_dump($num4->value);
+
+?>
+--EXPECT--
+OK!
+STILL OK!
+int(5)
+int(5)

Zend/tests/operator_overloads/pow_operator.phpt

@@ -0,0 +1,36 @@
+--TEST--
+operator overload: pow operator with scalars
+--FILE--
+<?php
+
+class A {
+    public int $value;
+
+    public function __pow(int $other, bool $left): A
+    {
+    	$return = new A();
+
+    	if ($left) {
+    		$return->value = $this->value ** $other;
+    	} else {
+    		$return->value = $other ** $this->value;
+    	}
+
+		return $return;
+    }
+}
+
+$obj = new A();
+$obj->value = 2;
+
+$num1 = 5 ** $obj;
+
+var_dump($num1->value);
+
+$num2 = $obj ** 3;
+
+var_dump($num2->value);
+?>
+--EXPECT--
+int(25)
+int(8)

Zend/tests/operator_overloads/sub_operator.phpt

@@ -0,0 +1,36 @@
+--TEST--
+operator overload: sub operator with scalars
+--FILE--
+<?php
+
+class A {
+    public int $value;
+
+    public function __sub(int $other, bool $left): A
+    {
+    	$return = new A();
+
+    	if ($left) {
+    		$return->value = $this->value - $other;
+    	} else {
+    		$return->value = $other - $this->value;
+    	}
+
+		return $return;
+    }
+}
+
+$obj = new A();
+$obj->value = 3;
+
+$num1 = 2 - $obj;
+
+var_dump($num1->value);
+
+$num2 = $obj - 3;
+
+var_dump($num2->value);
+?>
+--EXPECT--
+int(-1)
+int(0)

Zend/zend_API.c

@@ -2426,6 +2426,15 @@ static void zend_check_magic_method_arg_type(uint32_t arg_num, const zend_class_
 		}
 }
 
+static void zend_check_magic_method_explicit_type(uint32_t arg_num, const zend_class_entry *ce, const zend_function *fptr, int error_type)
+{
+	if (!ZEND_TYPE_IS_SET(fptr->common.arg_info[arg_num].type)) {
+		zend_error(error_type, "%s::%s(): Parameter #%d ($%s) must explicitly define a type",
+				   ZSTR_VAL(ce->name), ZSTR_VAL(fptr->common.function_name),
+				   arg_num + 1, ZSTR_VAL(fptr->common.arg_info[arg_num].name));
+	}
+}
+
 static void zend_check_magic_method_return_type(const zend_class_entry *ce, const zend_function *fptr, int error_type, int return_type)
 {
 	if (!(fptr->common.fn_flags & ZEND_ACC_HAS_RETURN_TYPE)) {
@@ -2490,10 +2499,9 @@ static void zend_check_magic_method_binary_operator_overload(
     zend_check_magic_method_args(2, ce, fptr, error_type);
     zend_check_magic_method_non_static(ce, fptr, error_type);
     zend_check_magic_method_public(ce, fptr, error_type);
+	zend_check_magic_method_explicit_type(0, ce, fptr, error_type);
     zend_check_magic_method_arg_type(0, ce, fptr, error_type, MAY_BE_ANY);
     zend_check_magic_method_arg_type(1, ce, fptr, error_type, MAY_BE_BOOL);
-    zend_check_magic_method_return_type(ce, fptr, error_type,
-            (MAY_BE_BOOL|MAY_BE_STRING|MAY_BE_LONG|MAY_BE_DOUBLE|MAY_BE_ARRAY|MAY_BE_OBJECT));
 }
 
 static void zend_check_magic_method_comparison_operator_overload(
@@ -2502,6 +2510,7 @@ static void zend_check_magic_method_comparison_operator_overload(
     zend_check_magic_method_args(1, ce, fptr, error_type);
     zend_check_magic_method_non_static(ce, fptr, error_type);
     zend_check_magic_method_public(ce, fptr, error_type);
+    zend_check_magic_method_explicit_type(0, ce, fptr, error_type);
     zend_check_magic_method_arg_type(0, ce, fptr, error_type, MAY_BE_ANY);
     zend_check_magic_method_return_type(ce, fptr, error_type, MAY_BE_BOOL);
 }
@@ -2626,6 +2635,7 @@ ZEND_API void zend_check_magic_method_implementation(const zend_class_entry *ce,
 	    zend_check_magic_method_args(1, ce, fptr, error_type);
 	    zend_check_magic_method_non_static(ce, fptr, error_type);
 	    zend_check_magic_method_public(ce, fptr, error_type);
+		zend_check_magic_method_explicit_type(0, ce, fptr, error_type);
 	    zend_check_magic_method_arg_type(0, ce, fptr, error_type, MAY_BE_ANY);
 	    zend_check_magic_method_return_type(ce, fptr, error_type, MAY_BE_LONG);
 	}

Zend/zend_compile.c

@@ -2161,6 +2161,8 @@ ZEND_API bool zend_is_smart_branch(const zend_op *opline) /* {{{ */
 		case ZEND_IS_NOT_EQUAL:
 		case ZEND_IS_SMALLER:
 		case ZEND_IS_SMALLER_OR_EQUAL:
+		case ZEND_IS_LARGER:
+		case ZEND_IS_LARGER_OR_EQUAL:
 		case ZEND_CASE:
 		case ZEND_CASE_STRICT:
 		case ZEND_ISSET_ISEMPTY_CV:

Zend/zend_exceptions.c

@@ -42,6 +42,7 @@ ZEND_API zend_class_entry *zend_ce_value_error;
 ZEND_API zend_class_entry *zend_ce_arithmetic_error;
 ZEND_API zend_class_entry *zend_ce_division_by_zero_error;
 ZEND_API zend_class_entry *zend_ce_unhandled_match_error;
+ZEND_API zend_class_entry *zend_ce_operator_error;
 
 /* Internal pseudo-exception that is not exposed to userland. Throwing this exception *does not* execute finally blocks. */
 static zend_class_entry zend_ce_unwind_exit;