Merge branch '2.x' into add-properties-of

Author: mspirkov

composer.lock

@@ -11,17 +11,28 @@
  * @link      http://phpdoc.org
  */
 
-namespace phpDocumentor\Reflection\Types;
+namespace phpDocumentor\Reflection\PseudoTypes;
 
+use phpDocumentor\Reflection\PseudoType;
 use phpDocumentor\Reflection\Type;
+use phpDocumentor\Reflection\Types\Boolean;
+use phpDocumentor\Reflection\Types\Compound;
+use phpDocumentor\Reflection\Types\Float_;
+use phpDocumentor\Reflection\Types\Integer;
+use phpDocumentor\Reflection\Types\String_;
 
 /**
  * Value Object representing the 'scalar' pseudo-type, which is either a string, integer, float or boolean.
  *
  * @psalm-immutable
  */
-final class Scalar implements Type
+final class Scalar implements PseudoType
 {
+    public function underlyingType(): Type
+    {
+        return new Compound([new String_(), new Integer(), new Float_(), new Boolean()]);
+    }
+
     /**
      * Returns a rendered output of the Type as it would be used in a DocBlock.
      */

src/Types/Scalar.php src/PseudoTypes/Scalar.phpsrc/Types/Scalar.php renamed to src/PseudoTypes/Scalar.php

@@ -54,6 +54,7 @@
 use phpDocumentor\Reflection\PseudoTypes\PropertiesOf;
 use phpDocumentor\Reflection\PseudoTypes\ProtectedPropertiesOf;
 use phpDocumentor\Reflection\PseudoTypes\PublicPropertiesOf;
+use phpDocumentor\Reflection\PseudoTypes\Scalar;
 use phpDocumentor\Reflection\PseudoTypes\StringValue;
 use phpDocumentor\Reflection\PseudoTypes\TraitString;
 use phpDocumentor\Reflection\PseudoTypes\True_;
@@ -77,7 +78,6 @@
 use phpDocumentor\Reflection\Types\Object_;
 use phpDocumentor\Reflection\Types\Parent_;
 use phpDocumentor\Reflection\Types\Resource_;
-use phpDocumentor\Reflection\Types\Scalar;
 use phpDocumentor\Reflection\Types\Self_;
 use phpDocumentor\Reflection\Types\Static_;
 use phpDocumentor\Reflection\Types\String_;

src/TypeResolver.php

@@ -15,7 +15,7 @@
 use phpDocumentor\Reflection\Type;
 
 /**
- * Value Object representing a Compound Type.
+ * Value Object representing a Intersection Type.
  *
  * A Intersection Type is not so much a special keyword or object reference but is a series of Types that are separated
  * using an AND operator (`&`). This combination of types signifies that whatever is associated with this Intersection

src/Types/Intersection.php

@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of phpDocumentor.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\PseudoTypes;
+
+use phpDocumentor\Reflection\Types\Boolean;
+use phpDocumentor\Reflection\Types\Compound;
+use phpDocumentor\Reflection\Types\Float_;
+use phpDocumentor\Reflection\Types\Integer;
+use phpDocumentor\Reflection\Types\String_;
+use PHPUnit\Framework\TestCase;
+
+final class ScalarTest extends TestCase
+{
+    public function testCreate(): void
+    {
+        $type = new Scalar();
+
+        $expectedUnderlyingType = new Compound([new String_(), new Integer(), new Float_(), new Boolean()]);
+        $this->assertEquals($expectedUnderlyingType, $type->underlyingType());
+    }
+
+    public function testToString(): void
+    {
+        $type = new Scalar();
+
+        $this->assertSame('scalar', (string) $type);
+    }
+}

tests/unit/PseudoTypes/ScalarTest.php

@@ -54,6 +54,7 @@
 use phpDocumentor\Reflection\PseudoTypes\PropertiesOf;
 use phpDocumentor\Reflection\PseudoTypes\ProtectedPropertiesOf;
 use phpDocumentor\Reflection\PseudoTypes\PublicPropertiesOf;
+use phpDocumentor\Reflection\PseudoTypes\Scalar;
 use phpDocumentor\Reflection\PseudoTypes\StringValue;
 use phpDocumentor\Reflection\PseudoTypes\TraitString;
 use phpDocumentor\Reflection\PseudoTypes\True_;
@@ -76,7 +77,6 @@
 use phpDocumentor\Reflection\Types\Object_;
 use phpDocumentor\Reflection\Types\Parent_;
 use phpDocumentor\Reflection\Types\Resource_;
-use phpDocumentor\Reflection\Types\Scalar;
 use phpDocumentor\Reflection\Types\Self_;
 use phpDocumentor\Reflection\Types\Static_;
 use phpDocumentor\Reflection\Types\String_;