Removed type restrictions from CompoundType

TimoLehnertz · TimoLehnertz · commit e0f8cb0bacde · 2024-12-22T16:18:42.000+01:00
diff --git a/src/type/ArrayType.php b/src/type/ArrayType.php
@@ -32,7 +32,7 @@ protected function typeAssignableBy(Type $type): bool {
     return $keysCompatible && $elementsCompatible;
   }
 
-  public function equals(Type $type): bool {
+  public function typeEquals(Type $type): bool {
     if (!($type instanceof ArrayType)) {
       return false;
     }
diff --git a/src/type/BooleanType.php b/src/type/BooleanType.php
@@ -19,7 +19,7 @@ protected function typeAssignableBy(Type $type): bool {
     return $this->equals($type);
   }
 
-  public function equals(Type $type): bool {
+  public function typeEquals(Type $type): bool {
     return $type instanceof BooleanType;
   }
 
diff --git a/src/type/CompoundType.php b/src/type/CompoundType.php
@@ -18,16 +18,7 @@ class CompoundType extends Type {
    * @param array<Type> $types
    */
   private function __construct(array $types) {
-    $restrictedValues = [];
-    foreach ($types as $type) {
-      if($type->getRestrictedValues() !== null) {
-        $restrictedValues = array_merge($restrictedValues, $type->getRestrictedValues());
-      } else {
-        $restrictedValues = null;
-        break;
-      }
-    }
-    parent::__construct($restrictedValues);
+    parent::__construct();
     $this->types = $types;
   }
 
@@ -121,7 +112,7 @@ protected function typeAssignableBy(Type $type): bool {
     }
   }
 
-  public function equals(Type $type): bool {
+  public function typeEquals(Type $type): bool {
     if($type instanceof CompoundType) {
       if(count($type->types) !== count($this->types)) {
         return false;
diff --git a/src/type/DateIntervalType.php b/src/type/DateIntervalType.php
@@ -15,7 +15,7 @@ protected function typeAssignableBy(Type $type): bool {
     return $this->equals($type);
   }
 
-  public function equals(Type $type): bool {
+  public function typeEquals(Type $type): bool {
     return $type instanceof DateIntervalType;
   }
 
diff --git a/src/type/DateTimeImmutableType.php b/src/type/DateTimeImmutableType.php
@@ -16,7 +16,7 @@ protected function typeAssignableBy(Type $type): bool {
     return $this->equals($type);
   }
 
-  public function equals(Type $type): bool {
+  public function typeEquals(Type $type): bool {
     return $type instanceof DateTimeImmutableType;
   }
 
diff --git a/src/type/EnumInstanceType.php b/src/type/EnumInstanceType.php
@@ -19,7 +19,7 @@ protected function typeAssignableBy(Type $type): bool {
     return $type instanceof EnumInstanceType && $this->enumType->equals($type->enumType);
   }
 
-  public function equals(Type $type): bool {
+  public function typeEquals(Type $type): bool {
     return $type instanceof EnumInstanceType && $this->enumType->equals($type->enumType);
   }
 
diff --git a/src/type/FloatType.php b/src/type/FloatType.php
@@ -17,7 +17,7 @@ protected function typeAssignableBy(Type $type): bool {
     return $this->equals($type);
   }
 
-  public function equals(Type $type): bool {
+  public function typeEquals(Type $type): bool {
     return $type instanceof FloatType;
   }
 
diff --git a/src/type/IntegerType.php b/src/type/IntegerType.php
@@ -17,7 +17,7 @@ protected function typeAssignableBy(Type $type): bool {
     return $this->equals($type);
   }
 
-  public function equals(Type $type): bool {
+  public function typeEquals(Type $type): bool {
     return $type instanceof IntegerType;
   }
 
diff --git a/src/type/MemberAccsessType.php b/src/type/MemberAccsessType.php
@@ -24,7 +24,7 @@ protected function typeAssignableBy(Type $type): bool {
     return $this->equals($type);
   }
 
-  public function equals(Type $type): bool {
+  public function typeEquals(Type $type): bool {
     return ($type instanceof MemberAccsessType) && $type->memberIdentifier === $this->memberIdentifier;
   }
 
diff --git a/src/type/MixedType.php b/src/type/MixedType.php
@@ -22,7 +22,7 @@ protected function typeAssignableBy(Type $type): bool {
     return true;
   }
 
-  public function equals(Type $type): bool {
+  public function typeEquals(Type $type): bool {
     return $type instanceof MixedType;
   }
 
diff --git a/src/type/NeverType.php b/src/type/NeverType.php
@@ -17,7 +17,7 @@ protected function typeAssignableBy(Type $type): bool {
     return $this->equals($type);
   }
 
-  public function equals(Type $type): bool {
+  public function typeEquals(Type $type): bool {
     return $type instanceof NeverType;
   }
 
diff --git a/src/type/NullType.php b/src/type/NullType.php
@@ -19,7 +19,7 @@ protected function typeAssignableBy(Type $type): bool {
     return $this->equals($type);
   }
 
-  public function equals(Type $type): bool {
+  public function typeEquals(Type $type): bool {
     return $type instanceof NullType;
   }
 
diff --git a/src/type/StringType.php b/src/type/StringType.php
@@ -20,7 +20,7 @@ protected function typeAssignableBy(Type $type): bool {
     return $this->equals($type);
   }
 
-  public function equals(Type $type): bool {
+  public function typeEquals(Type $type): bool {
     return $type instanceof StringType;
   }
 
diff --git a/src/type/Type.php b/src/type/Type.php
@@ -24,7 +24,7 @@ abstract class Type implements OperatorMeta, FormulaPart {
    * Otherwise null.
    * @var array<Value>|null
    */
-  private ?array $restrictedValues = null;
+  protected ?array $restrictedValues = null;
 
   public function __construct(?array $restrictedValues = null) {
     $this->restrictedValues = $restrictedValues;
@@ -163,6 +163,31 @@ public function setRestrictedValues(?array $restrictedValues): Type {
     return $clone;
   }
 
+  public function equals(Type $other, bool $ignoreRestrictions = true): bool {
+    if(!$this->typeEquals($other)) {
+      return false;
+    }
+    if($ignoreRestrictions) {
+      return true;
+    }
+    if(($this->restrictedValues === null) !== ($other->restrictedValues === null)) {
+      return false;
+    }
+    if($this->restrictedValues === null) {
+      return true;
+    }
+    if(count($this->restrictedValues) !== count($other->restrictedValues)) {
+      return false;
+    }
+    $count = count($this->restrictedValues);
+    for ($i=0; $i < $count; $i++) { 
+      if(!$this->restrictedValues[$i]->valueEquals($other->restrictedValues[$i])) {
+        return false;
+      }
+    }
+    return true;
+  }
+
   public function getRestrictedValues(): ?array {
     return $this->restrictedValues;
   }
@@ -179,7 +204,7 @@ protected abstract function getTypeOperatorResultType(ImplementableOperator $ope
    */
   public abstract function getIdentifier(bool $nested = false): string;
 
-  public abstract function equals(Type $type): bool;
+  public abstract function typeEquals(Type $type): bool;
 
   public function assignableBy(Type $type): bool {
     return $this->typeAssignableBy($type);
diff --git a/src/type/TypeType.php b/src/type/TypeType.php
@@ -24,7 +24,7 @@ protected function typeAssignableBy(Type $type): bool {
     return $type instanceof TypeType;
   }
 
-  public function equals(Type $type): bool {
+  public function typeEquals(Type $type): bool {
     return ($type instanceof TypeType) && $type->type->equals($this->type);
   }
 
diff --git a/src/type/VoidType.php b/src/type/VoidType.php
@@ -21,7 +21,7 @@ protected function typeAssignableBy(Type $type): bool {
     return $type instanceof VoidType;
   }
 
-  public function equals(Type $type): bool {
+  public function typeEquals(Type $type): bool {
     return $type instanceof VoidType;
   }
 
diff --git a/src/type/classes/ClassType.php b/src/type/classes/ClassType.php
@@ -51,7 +51,7 @@ public function extends(ClassType $classType): bool {
     return $this->parentType->extends($classType);
   }
 
-  public function equals(Type $type): bool {
+  public function typeEquals(Type $type): bool {
     if(!($type instanceof ClassType)) {
       return false;
     }
diff --git a/src/type/classes/ClassTypeType.php b/src/type/classes/ClassTypeType.php
@@ -30,7 +30,7 @@ public function getIdentifier(bool $nested = false): string {
     return 'ClassTypeType';
   }
 
-  public function equals(Type $type): bool {
+  public function typeEquals(Type $type): bool {
     if($type instanceof ClassTypeType) {
       return $this->constructorType->equals($type->constructorType);
     }
diff --git a/src/type/functions/FunctionType.php b/src/type/functions/FunctionType.php
@@ -33,7 +33,7 @@ protected function typeAssignableBy(Type $type): bool {
     return $this->arguments->assignableBy($type->arguments, true) && $this->generalReturnType->assignableBy($type->generalReturnType, true);
   }
 
-  public function equals(Type $type): bool {
+  public function typeEquals(Type $type): bool {
     if($type instanceof FunctionType) {
       return $this->arguments->equals($type->arguments) && $this->generalReturnType->equals($type->generalReturnType) && $this->specificReturnType == $type->specificReturnType;
     } else {
diff --git a/src/type/functions/OuterFunctionArgumentListType.php b/src/type/functions/OuterFunctionArgumentListType.php
@@ -99,7 +99,7 @@ protected function typeAssignableBy(Type $type): bool {
     return true;
   }
 
-  public function equals(Type $type): bool {
+  public function typeEquals(Type $type): bool {
     if (!($type instanceof OuterFunctionArgumentListType)) {
       return false;
     }
diff --git a/test/FormulaIntegrationTest.php b/test/FormulaIntegrationTest.php
@@ -33,4 +33,18 @@ public function testTypeRestrictions(): void {
     }
     $this->assertEquals([1, 2, 3], $argumentValues);
   }
+
+  public function testThatEnumsAreNotEqual(): void {
+    $scope = new Scope();
+    $scope->definePHP(true, 'TestEnum', TestEnum::class);
+    $formula = new Formula('TestEnum.A == TestEnum.B', $scope);
+    $this->assertFalse($formula->calculate()->toPHPValue());
+    $formula = new Formula('TestEnum.A == TestEnum.A', $scope);
+    $this->assertTrue($formula->calculate()->toPHPValue());
+  }
+}
+
+enum TestEnum {
+  case A;
+  case B;
 }
diff --git a/test/other/CustomType.php b/test/other/CustomType.php
@@ -16,7 +16,7 @@ protected function typeAssignableBy(Type $type): bool {
     return $this->equals($type);
   }
 
-  public function equals(Type $type): bool {
+  public function typeEquals(Type $type): bool {
     return $type instanceof CustomType;
   }
 
diff --git a/test/other/CustomTypeTest.php b/test/other/CustomTypeTest.php
@@ -57,7 +57,7 @@ protected function typeAssignableBy(Type $type): bool {
     return $this->equals($type);
   }
 
-  public function equals(Type $type): bool {
+  public function typeEquals(Type $type): bool {
     return $type instanceof CustomArrayType;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ protected function typeAssignableBy(Type $type): bool {`
`32`	`32`	`return $keysCompatible && $elementsCompatible;`
`33`	`33`	`}`
`34`	`34`
`35`		`- public function equals(Type $type): bool {`
	`35`	`+ public function typeEquals(Type $type): bool {`
`36`	`36`	`if (!($type instanceof ArrayType)) {`
`37`	`37`	`return false;`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ protected function typeAssignableBy(Type $type): bool {`
`19`	`19`	`return $this->equals($type);`
`20`	`20`	`}`
`21`	`21`
`22`		`- public function equals(Type $type): bool {`
	`22`	`+ public function typeEquals(Type $type): bool {`
`23`	`23`	`return $type instanceof BooleanType;`
`24`	`24`	`}`
`25`	`25`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ protected function typeAssignableBy(Type $type): bool {`
`15`	`15`	`return $this->equals($type);`
`16`	`16`	`}`
`17`	`17`
`18`		`- public function equals(Type $type): bool {`
	`18`	`+ public function typeEquals(Type $type): bool {`
`19`	`19`	`return $type instanceof DateIntervalType;`
`20`	`20`	`}`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ protected function typeAssignableBy(Type $type): bool {`
`16`	`16`	`return $this->equals($type);`
`17`	`17`	`}`
`18`	`18`
`19`		`- public function equals(Type $type): bool {`
	`19`	`+ public function typeEquals(Type $type): bool {`
`20`	`20`	`return $type instanceof DateTimeImmutableType;`
`21`	`21`	`}`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ protected function typeAssignableBy(Type $type): bool {`
`17`	`17`	`return $this->equals($type);`
`18`	`18`	`}`
`19`	`19`
`20`		`- public function equals(Type $type): bool {`
	`20`	`+ public function typeEquals(Type $type): bool {`
`21`	`21`	`return $type instanceof FloatType;`
`22`	`22`	`}`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ protected function typeAssignableBy(Type $type): bool {`
`24`	`24`	`return $this->equals($type);`
`25`	`25`	`}`
`26`	`26`
`27`		`- public function equals(Type $type): bool {`
	`27`	`+ public function typeEquals(Type $type): bool {`
`28`	`28`	`return ($type instanceof MemberAccsessType) && $type->memberIdentifier === $this->memberIdentifier;`
`29`	`29`	`}`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ protected function typeAssignableBy(Type $type): bool {`
`22`	`22`	`return true;`
`23`	`23`	`}`
`24`	`24`
`25`		`- public function equals(Type $type): bool {`
	`25`	`+ public function typeEquals(Type $type): bool {`
`26`	`26`	`return $type instanceof MixedType;`
`27`	`27`	`}`
`28`	`28`