Some style fixes

Author: ircmaxell

lib/PHPCfg/Types/Helper.php

@@ -282,7 +282,8 @@ public static function fromOpType(Op\Type $type): Type
             return static::union(...array_map(fn($sub) => static::fromOpType($sub), $type->subtypes))->simplify();
         }
         if ($type instanceof Op\Type\Intersection) {
-            return static::intersection(...array_map(fn($sub) => static::fromOpType($sub), $type->subtypes)
+            return static::intersection(
+                ...array_map(fn($sub) => static::fromOpType($sub), $type->subtypes)
             )->simplify();
         }
         throw new LogicException("Unknown type " . $type->getType());

lib/PHPCfg/Types/Type.php

@@ -235,7 +235,7 @@ public function equals(Type $type): bool
         if ($type->type === Type::TYPE_OBJECT) {
             if ($type->userType === null && $this->userType === null) {
                 // not reachable since top $type === $this check catches
-            } elseif ($type->userType !== null XOR $this->userType !== null) {
+            } elseif ($type->userType !== null xor $this->userType !== null) {
                 // One is typed, the other isn't
                 return false;
             }

test/Types/TypeTest.php

@@ -46,7 +46,7 @@ public function testToString($decl, $result)
     {
         $this->assertEquals($decl, (string) $result);
     }
-    
+
     public function testHasSubTypes()
     {
         $this->assertFalse((new Type(Type::TYPE_LONG))->hasSubTypes());
@@ -67,7 +67,7 @@ public static function provideTestAllowsNull()
             Helper::union(Helper::int(), Helper::null(), Helper::string()),
             Helper::union(Helper::int(), Helper::null())
         ), false];
-    }   
+    }
 
     #[DataProvider("provideTestAllowsNull")]
     public function testAllowsNull(Type $type, $isAllowed)
@@ -86,28 +86,42 @@ public static function provideTestSimplification()
         yield ["empty intersection", new Type(Type::TYPE_INTERSECTION, []), Helper::void()];
 
         // Nested same complex types
-        yield ["nested same union", new Type(Type::TYPE_UNION, [
-            new Type(Type::TYPE_UNION, [Helper::int()])
-        ]), Helper::int()];
-        yield ["nested same intersection", new Type(Type::TYPE_INTERSECTION, [
-            new Type(Type::TYPE_INTERSECTION, [Helper::int()])
-        ]), Helper::int()];
+        yield [
+            "nested same union",
+            new Type(Type::TYPE_UNION, [
+                new Type(Type::TYPE_UNION, [Helper::int()]),
+            ]),
+            Helper::int(),
+        ];
+        yield [
+            "nested same intersection",
+            new Type(Type::TYPE_INTERSECTION, [
+                new Type(Type::TYPE_INTERSECTION, [Helper::int()]),
+            ]),
+            Helper::int(),
+        ];
 
         // Nested different complex types
-        yield ["nested intersection unions", new Type(Type::TYPE_UNION, [
-            new Type(Type::TYPE_INTERSECTION, [Helper::int(), Helper::float()]),
-            new Type(Type::TYPE_INTERSECTION, [Helper::string(), Helper::float()])
-        ]), Helper::union(
-            Helper::intersection(Helper::int(), Helper::float()),
-            Helper::intersection(Helper::string(), Helper::float())
-        )];
+        yield [
+            "nested intersection unions",
+            new Type(Type::TYPE_UNION, [
+                new Type(Type::TYPE_INTERSECTION, [Helper::int(), Helper::float()]),
+                new Type(Type::TYPE_INTERSECTION, [Helper::string(), Helper::float()]),
+            ]),
+            Helper::union(
+                Helper::intersection(Helper::int(), Helper::float()),
+                Helper::intersection(Helper::string(), Helper::float())
+            ),
+        ];
 
         // Nested same complex types. Tests elimination of duplicated types
-        yield ["nested intersection unions", new Type(Type::TYPE_UNION, [
+        yield [
+            "nested intersection unions",
+            new Type(Type::TYPE_UNION, [
                 new Type(Type::TYPE_INTERSECTION, [Helper::int(), Helper::float()]),
-                new Type(Type::TYPE_INTERSECTION, [Helper::int(), Helper::float()])
-            ]), 
-            Helper::intersection(Helper::int(), Helper::float())
+                new Type(Type::TYPE_INTERSECTION, [Helper::int(), Helper::float()]),
+            ]),
+            Helper::intersection(Helper::int(), Helper::float()),
         ];
     }