Adding support for PHP 7.4 typed properties

.scrutinizer.yml

@@ -7,7 +7,7 @@ build:
         tests-and-coverage:
             environment:
                 php:
-                    version: 7.1
+                    version: 7.4
             tests:
                 override:
                     - phpcs-run

.travis.yml

@@ -2,9 +2,6 @@ sudo: false
 
 language: php
 php:
-  - 7.1
-  - 7.2
-  - 7.3
   - 7.4
 
 env:
@@ -13,12 +10,6 @@ env:
   - SF_CACHE=4.3
   - SF_CACHE=5
 
-jobs:
-  exclude:
-    - php: 7.1
-      env:
-        - SF_CACHE=5
-
 before_script:
   - composer install --no-interaction -o
   - if [ "$SF_CACHE" = "3" ]; then composer require symfony/cache:^3.3; fi;

composer.json

@@ -10,7 +10,7 @@
         }
     ],
     "require": {
-        "php": ">=7.1",
+        "php": ">=7.4",
         "phpdocumentor/reflection-docblock": "^3.2.3|^4.0.1",
         "tebru/php-type": "^0.1.7",
         "tebru/doctrine-annotation-reader": "^0.3.7",

src/Internal/TypeTokenFactory.php

@@ -100,6 +100,11 @@ public function create(
             }
         }
 
+        if ($property !== null && $property->getType() !== null) {
+            $propertyType = TypeToken::create($property->getType()->getName());
+            return $this->checkGenericArray($propertyType, $property, $getterMethod, $setterMethod);
+        }
+
         $type = $this->checkDocBlocks($property, $getterMethod, $setterMethod);
         if ($type !== null) {
             return $this->checkGenericArray(

tests/Mock/AddressMock.php

@@ -18,10 +18,7 @@ class AddressMock
      */
     private $street;
 
-    /**
-     * @var string
-     */
-    private $city;
+    private string $city;
 
     /**
      * @var string

tests/Mock/AnnotatedMock.php

@@ -21,7 +21,7 @@ class AnnotatedMock
      */
     private $fooBar;
 
-    private $fooBarBaz;
+    private float $fooBarBaz;
 
     /**
      * @Gson\VirtualProperty("vfoo")

tests/Mock/ChildClass.php

@@ -41,6 +41,8 @@ class ChildClass extends ChildClassParent
      */
     private $default = 1;
 
+    private array $typedArray;
+
     public function getBaz()
     {
         return $this->baz;

tests/Mock/ChildClassParent.php

@@ -26,6 +26,6 @@ class ChildClassParent extends ChildClassParent2
      * @QuxAnnotation("qux")
      */
     private $foo;
-    private $bar;
+    private string $bar;
     protected $baz;
 }

tests/Mock/ClassWithoutParent.php

@@ -24,7 +24,7 @@ class ClassWithoutParent
      * @FooAnnotation("foo")
      * @BarAnnotation("bar")
      */
-    private $foo;
+    private int $foo;
 
     /**
      * @FooAnnotation("foo2")

tests/Mock/DocblockType/DocblockMock.php

@@ -113,13 +113,18 @@ class DocblockMock
     /**
      * @var ArrayObject
      */
-    private $classGlobal;
+    private ArrayObject $classGlobal;
 
     /**
      * @var array
      */
     private $array;
 
+    /**
+     * @var int[]
+     */
+    private array $fullyTypedArray;
+
     /**
      * @var int[]
      */
@@ -160,6 +165,16 @@ class DocblockMock
      */
     private $differentSetter;
 
+    /**
+     * @var ArrayObject
+     */
+    private ArrayObject $differentGetterTyped;
+
+    /**
+     * @var ArrayObject
+     */
+    private ArrayObject $differentSetterTyped;
+
     /**
      * @return int
      */
@@ -197,4 +212,20 @@ public function setDifferentSetter(array $foos): void
     {
         $this->differentSetter = $foos;
     }
+
+    /**
+     * @return DocblockFoo[]
+     */
+    public function getDifferentGetterTyped(): array
+    {
+        return $this->differentGetterTyped->getArrayCopy();
+    }
+
+    /**
+     * @param DocblockFoo[] $foos
+     */
+    public function setDifferentSetterTyped(array $foos): void
+    {
+        $this->differentSetterTyped = new ArrayObject($foos);
+    }
 }

tests/Mock/ExcludedClassMock.php

@@ -21,5 +21,5 @@ class ExcludedClassMock
      * @Type("Tebru\Gson\Test\Mock\GsonMock")
      */
     private $foo;
-    private $bar;
+    private bool $bar;
 }

tests/Mock/UserMock.php

@@ -33,10 +33,7 @@ class UserMock
      */
     private $password;
 
-    /**
-     * @var string
-     */
-    private $name;
+    private string $name;
 
     /**
      * @var AddressMock

tests/Mock/UserMockVirtual.php

@@ -35,10 +35,7 @@ class UserMockVirtual
      */
     private $password;
 
-    /**
-     * @var string
-     */
-    private $name;
+    private string $name;
 
     /**
      * @var AddressMock

tests/Unit/Internal/Data/ReflectionPropertySetFactoryTest.php

@@ -48,6 +48,7 @@ public function testCreateWithParents(): void
             new ReflectionProperty(ChildClass::class, 'overridden'),
             new ReflectionProperty(ChildClass::class, 'withTypehint'),
             new ReflectionProperty(ChildClass::class, 'default'),
+            new ReflectionProperty(ChildClass::class, 'typedArray'),
             new ReflectionProperty(ChildClassParent::class, 'baz'),
             new ReflectionProperty(ChildClassParent2::class, 'qux'),
             new ReflectionProperty(ChildClassParent::class, 'bar'),

tests/Unit/Internal/TypeTokenFactoryTest.php

@@ -46,6 +46,40 @@ public function testCreateFromAnnotation(): void
         self::assertSame(ChildClass::class, $phpType->getRawType());
     }
 
+    public function testCreateFromAnnotationWithTypedProperty(): void
+    {
+        $type = new Type(['value' => ChildClass::class]);
+        $annotations = new AnnotationCollection();
+        $annotations->add($type);
+
+        $factory = new TypeTokenFactory();
+        $property = new ReflectionProperty(ChildClass::class, 'typedArray');
+        $phpType = $factory->create($annotations, null, null, $property);
+
+        self::assertSame(ChildClass::class, $phpType->getRawType());
+    }
+
+    public function testCreateFromPropertyType(): void
+    {
+        $annotations = new AnnotationCollection();
+        $factory = new TypeTokenFactory();
+        $property = new ReflectionProperty(ChildClass::class, 'typedArray');
+        $phpType = $factory->create($annotations, null, null, $property);
+
+        self::assertSame('array', $phpType->getRawType());
+    }
+
+    public function testCreateFromArrayPropertyTypeWithGeneric(): void
+    {
+        $annotations = new AnnotationCollection();
+        $factory = new TypeTokenFactory();
+        $property = new ReflectionProperty(DocblockMock::class, 'fullyTypedArray');
+        $phpType = $factory->create($annotations, null, null, $property);
+
+        self::assertSame(TypeToken::HASH, $phpType->getRawType());
+        self::assertSame(TypeToken::INTEGER, $phpType->getGenerics()[0]->getRawType());
+    }
+
     public function testCreateFromSetterTypehint(): void
     {
         $annotations = new AnnotationCollection();
@@ -360,6 +394,28 @@ public function testCreateFromDocblockDifferentSetter(): void
         self::assertSame('array<Tebru\Gson\Test\Mock\DocblockType\DocblockFoo>', (string)$phpType);
     }
 
+    public function testCreateFromDocblockDifferentGetterWithTypedProperty(): void
+    {
+        $annotations = new AnnotationCollection();
+        $factory = new TypeTokenFactory();
+        $property = new ReflectionProperty(DocblockMock::class, 'differentGetterTyped');
+        $getter = new ReflectionMethod(DocblockMock::class, 'getDifferentGetterTyped');
+        $phpType = $factory->create($annotations, $getter, null, $property);
+
+        self::assertSame('array<Tebru\Gson\Test\Mock\DocblockType\DocblockFoo>', (string)$phpType);
+    }
+
+    public function testCreateFromDocblockDifferentSetterWithTypedProperty(): void
+    {
+        $annotations = new AnnotationCollection();
+        $factory = new TypeTokenFactory();
+        $property = new ReflectionProperty(DocblockMock::class, 'differentSetterTyped');
+        $setter = new ReflectionMethod(DocblockMock::class, 'setDifferentSetterTyped');
+        $phpType = $factory->create($annotations, null, $setter, $property);
+
+        self::assertSame('array<Tebru\Gson\Test\Mock\DocblockType\DocblockFoo>', (string)$phpType);
+    }
+
     public function testCreateFromGetter(): void
     {
         $annotations = new AnnotationCollection();