Renamed complex types.

Author: Sevavietl

README.md

@@ -7,8 +7,8 @@ Table of Contents
 =================  
 * [General usage](#general-usage)  
     - [1. Simple signature](#simple-signature)
-    - [2. Conjoined types](#conjoined-types)
-    - [3. Disjoined types](#disjoined-types)
+    - [2. Union types](#union-types)
+    - [3. Intersection types](#intersection-types)
     - [4. Optional parameters](#optional-parameters)
 
 <a name="General usage"></a>
@@ -33,9 +33,9 @@ Parameters signature is a list of types separeted by comma.
     var_dump($func('1', '1')) // => '11'
 ```
 
-<a name="conjoined-types"></a>
+<a name="union-types"></a>
 
-### 2. Conjoined types:
+### 2. Union types:
 
 Sometimes your parameter need to be of a kind, that implements not one interface, but several.
 
@@ -47,9 +47,9 @@ Sometimes your parameter need to be of a kind, that implements not one interface
     var_dump($func(new ArrayIterator)) // => bool(true)
 ```
 
-<a name="disjoined-types"></a>
+<a name="intersection-types"></a>
 
-### 3. Disjoined types:
+### 3. Intersection types:
 
 Sometimes you allow parameter to be not of one type, but of several types.
 

bootstrap.php

@@ -1,3 +1,4 @@
 <?php
 
 $loader = require __DIR__ . '/vendor/autoload.php';
+

src/Signature/Signature.php

@@ -3,12 +3,15 @@
 namespace Sevavietl\OverloadedFunction\Signature;
 
 use Sevavietl\OverloadedFunction\Signature\Types\Type;
-use Sevavietl\OverloadedFunction\Signature\Types\DisjoinedType;
-use Sevavietl\OverloadedFunction\Signature\Types\ConjoinedType;
+use Sevavietl\OverloadedFunction\Signature\Types\UnionType;
+use Sevavietl\OverloadedFunction\Signature\Types\IntersectionType;
 use Sevavietl\OverloadedFunction\Signature\Types\OptionalType;
 
 class Signature
 {
+    const UNION_TYPE_SEPARATOR = '|';
+    const INTERSECTION_TYPE_SEPARATOR = '&';
+
     private $types;
 
     public function __construct($stringRepresentation)
@@ -25,10 +28,10 @@ private function parseStringRepresentation($stringRepresentation)
                 $paramType = substr($paramType, 1);
             }
 
-            if ($this->isDisjoined($paramType)) {
-                $type = new DisjoinedType(explode('|', $paramType));
-            } elseif ($this->isConjoined($paramType)) {
-                $type = new ConjoinedType(explode('&', $paramType));
+            if ($this->isUnion($paramType)) {
+                $type = new UnionType(explode(self::UNION_TYPE_SEPARATOR, $paramType));
+            } elseif ($this->isIntersection($paramType)) {
+                $type = new IntersectionType(explode(self::INTERSECTION_TYPE_SEPARATOR, $paramType));
             } else {
                 $type = new Type($paramType);
             }
@@ -42,14 +45,14 @@ private function isOptional($paramType)
         return strpos($paramType, '?') === 0;
     }
 
-    private function isDisjoined($paramType)
+    private function isUnion($paramType)
     {
-        return strpos($paramType, '|') !== false;
+        return strpos($paramType, self::UNION_TYPE_SEPARATOR) !== false;
     }
 
-    private function isConjoined($paramType)
+    private function isIntersection($paramType)
     {
-        return strpos($paramType, '&') !== false;
+        return strpos($paramType, self::INTERSECTION_TYPE_SEPARATOR) !== false;
     }
 
     public function match(array $params)

src/Signature/Types/ConjoinedType.php renamed to src/Signature/Types/IntersectionType.php

@@ -2,7 +2,7 @@
 
 namespace Sevavietl\OverloadedFunction\Signature\Types;
 
-class ConjoinedType implements IType
+class IntersectionType implements IType
 {
     private $types;
 

src/Signature/Types/DisjoinedType.php renamed to src/Signature/Types/UnionType.php

@@ -2,7 +2,7 @@
 
 namespace Sevavietl\OverloadedFunction\Signature\Types;
 
-class DisjoinedType implements IType
+class UnionType implements IType
 {
     private $types;
 

tests/unit/Signature/Types/ConjoinedTypeTest.php renamed to tests/unit/Signature/Types/IntersectionTypeTest.php

@@ -2,16 +2,16 @@
 
 namespace Sevavietl\OverloadedFunction\Tests\Unit\Signature\Types;
 
-use Sevavietl\OverloadedFunction\Signature\Types\ConjoinedType;
+use Sevavietl\OverloadedFunction\Signature\Types\IntersectionType;
 
-class ConjoinedTypeTest extends \TestCase
+class IntersectionTypeTest extends \TestCase
 {
     /**
      * @dataProvider matchDataProvider
      */
     public function testMatch($typeStrings, $param, $result)
     {
-        $this->assertEquals($result, (new ConjoinedType($typeStrings))->match($param));
+        $this->assertEquals($result, (new IntersectionType($typeStrings))->match($param));
     }
 
     public function matchDataProvider()

tests/unit/Signature/Types/DisjoinedTypeTest.php renamed to tests/unit/Signature/Types/UnionTypeTest.php

@@ -2,7 +2,7 @@
 
 namespace Sevavietl\OverloadedFunction\Tests\Unit\Signature\Types;
 
-use Sevavietl\OverloadedFunction\Signature\Types\DisjoinedType;
+use Sevavietl\OverloadedFunction\Signature\Types\UnionType;
 
 class DisjoinedTypeTest extends \TestCase
 {
@@ -11,7 +11,7 @@ class DisjoinedTypeTest extends \TestCase
      */
     public function testMatch($typeStrings, $param, $result)
     {
-        $this->assertEquals($result, (new DisjoinedType($typeStrings))->match($param));
+        $this->assertEquals($result, (new UnionType($typeStrings))->match($param));
     }
 
     public function matchDataProvider()