Added PHP 8.0 compatibility

.travis.yml

@@ -1,7 +1,6 @@
 language: php
 php:
-    - '7.3'
-    - '7.4'
+    - '8.0'
 
 before_script:
     - composer install

CHANGELOG.md

@@ -4,23 +4,25 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## 1.1.1 - 2020-11-05
+## 1.2.0 - 2021-02-23
+### Added
+- Compatibility for PHP 8.0
 
+## 1.1.1 - 2020-11-05
 ### Fixed
 - Added missing backslashes to generate correct references.
 
 ## 1.1.0 - 2020-11-03
-
 ### Added
 - Option to include private methods.
 - Option to include parent methods.
 
 ## 1.0.0 - 2020-10-19
-
 ### Added
 - The initial implementation of the package.
 
 # Versions
-- [1.1.1 > Unreleased](https://github.com/grizz-it/php-ast-generator/compare/1.1.1...HEAD)
+- [1.2.0 > Unreleased](https://github.com/grizz-it/php-ast-generator/compare/1.2.0...HEAD)
+- [1.1.1 > 1.2.0](https://github.com/grizz-it/php-ast-generator/compare/1.1.1...1.2.0)
 - [1.1.0 > 1.1.1](https://github.com/grizz-it/php-ast-generator/compare/1.1.0...1.1.1)
 - [1.0.0 > 1.1.0](https://github.com/grizz-it/php-ast-generator/compare/1.0.0...1.1.0)

composer.json

@@ -11,8 +11,8 @@
     "prefer-stable": true,
     "minimum-stability": "stable",
     "require": {
-        "php": "^7.3",
-        "grizz-it/ast": "^1.2"
+        "php": "^8.0",
+        "grizz-it/ast": "^1.3"
     },
     "authors": [
         {
@@ -47,7 +47,7 @@
         ]
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.4",
+        "phpunit/phpunit": "^9.5",
         "squizlabs/php_codesniffer": "^3.5"
     }
 }

phpcs.xml

@@ -8,5 +8,7 @@
     <arg name="colors" />
     <arg value="s" />
 
-    <rule ref="PSR12" />
+    <rule ref="PSR12">
+        <exclude name="PSR1.Files.SideEffects.FoundWithSymbols"/>
+    </rule>
 </ruleset>

src/Common/PropertyGeneratorInterface.php

@@ -22,6 +22,6 @@ interface PropertyGeneratorInterface
      */
     public function generate(
         ReflectionProperty $property,
-        $defaultValue = null
+        mixed $defaultValue = null
     ): PropertyInterface;
 }

src/Component/Generator/Definition/ClassGenerator.php

@@ -34,28 +34,28 @@ class ClassGenerator implements DefinitionGeneratorInterface
      *
      * @var bool
      */
-    private $includeParent;
+    private bool $includeParent;
 
     /**
      * Determines whether interfaces should be copied.
      *
      * @var bool
      */
-    private $includeInterfaces;
+    private bool $includeInterfaces;
 
     /**
      * Whether the parents methods should be inherited.
      *
      * @var bool
      */
-    private $includeParentMethods;
+    private bool $includeParentMethods;
 
     /**
      * Whether the private methods should be inherited.
      *
      * @var bool
      */
-    private $includePrivateMethods;
+    private bool $includePrivateMethods;
 
     /**
      * Constructor.
@@ -66,6 +66,8 @@ class ClassGenerator implements DefinitionGeneratorInterface
      * @param MethodGeneratorInterface|null $methodGenerator
      * @param ConstantGeneratorInterface|null $constantGenerator
      * @param PropertyGeneratorInterface|null $propertyGenerator
+     * @param bool $includeParentMethods
+     * @param bool $includePrivateMethods
      */
     public function __construct(
         bool $includeParent,

src/Component/Generator/Definition/InterfaceGenerator.php

@@ -28,21 +28,21 @@ class InterfaceGenerator implements DefinitionGeneratorInterface
      *
      * @var bool
      */
-    private $includeParent;
+    private bool $includeParent;
 
     /**
      * Whether the parents methods should be inherited.
      *
      * @var bool
      */
-    private $includeParentMethods;
+    private bool $includeParentMethods;
 
     /**
      * Whether the private methods should be inherited.
      *
      * @var bool
      */
-    private $includePrivateMethods;
+    private bool $includePrivateMethods;
 
     /**
      * Constructor.

src/Component/Generator/DefinitionGenerator.php

@@ -18,14 +18,14 @@ class DefinitionGenerator implements DefinitionGeneratorInterface
      *
      * @var DefinitionGeneratorInterface
      */
-    private $classGenerator;
+    private DefinitionGeneratorInterface $classGenerator;
 
     /**
      * Contains the interface generator.
      *
      * @var DefinitionGeneratorInterface
      */
-    private $interfaceGenerator;
+    private DefinitionGeneratorInterface $interfaceGenerator;
 
     /**
      * Constructor.

src/Component/Generator/Extractor/ExtractConstantsTrait.php

@@ -9,6 +9,7 @@
 
 use ReflectionClass;
 use GrizzIt\Ast\Common\Php\PropertyInterface;
+use GrizzIt\PhpAstGenerator\Common\ConstantGeneratorInterface;
 
 trait ExtractConstantsTrait
 {
@@ -17,7 +18,7 @@ trait ExtractConstantsTrait
      *
      * @var ConstantGeneratorInterface|null
      */
-    private $constantGenerator;
+    private ?ConstantGeneratorInterface $constantGenerator;
 
     /**
      * Retrieves the direct interfaces.

src/Component/Generator/Extractor/ExtractMethodsTrait.php

@@ -18,7 +18,7 @@ trait ExtractMethodsTrait
      *
      * @var MethodGeneratorInterface|null
      */
-    private $methodGenerator;
+    private ?MethodGeneratorInterface $methodGenerator;
 
      /**
       * Retrieves the methods.

src/Component/Generator/Extractor/ExtractPropertiesTrait.php

@@ -18,7 +18,7 @@ trait ExtractPropertiesTrait
      *
      * @var PropertyGeneratorInterface|null
      */
-    private $propertyGenerator;
+    private ?PropertyGeneratorInterface $propertyGenerator;
 
     /**
      * Retrieves the properties of the reflection object.

src/Component/Generator/Extractor/ExtractTraitsTrait.php

@@ -18,7 +18,7 @@ trait ExtractTraitsTrait
      *
      * @var ReferenceGeneratorInterface|null
      */
-    private $referenceGenerator;
+    private ?ReferenceGeneratorInterface $referenceGenerator;
 
     /**
      * Retrieves the traits of the reflection object.

src/Component/Generator/MethodGenerator.php

@@ -20,7 +20,7 @@ class MethodGenerator implements MethodGeneratorInterface
      *
      * @var VariableGeneratorInterface
      */
-    private $variableGenerator;
+    private VariableGeneratorInterface $variableGenerator;
 
     /**
      * Constructor

src/Component/Generator/PropertyGenerator.php

@@ -25,7 +25,7 @@ class PropertyGenerator implements PropertyGeneratorInterface
      */
     public function generate(
         ReflectionProperty $property,
-        $defaultValue = null
+        mixed $defaultValue = null
     ): PropertyInterface {
         $type = method_exists($property, 'getType') ? $property->getType() : null;
         $astProperty = new Property(

src/Factory/ClassGeneratorFactory.php

@@ -26,6 +26,8 @@ class ClassGeneratorFactory
      * @param bool $includeMethods
      * @param bool $includeConstants
      * @param bool $includeProperties
+     * @param bool $includeParentMethods
+     * @param bool $includePrivateMethods
      *
      * @return DefinitionGeneratorInterface
      */

src/Factory/DuplicateGeneratorFactory.php

@@ -28,6 +28,8 @@ class DuplicateGeneratorFactory
      * @param bool $includeMethods
      * @param bool $includeConstants
      * @param bool $includeProperties
+     * @param bool $includeParentMethods
+     * @param bool $includePrivateMethods
      *
      * @return DefinitionGeneratorInterface
      */

src/Factory/InterfaceGeneratorFactory.php

@@ -21,6 +21,8 @@ class InterfaceGeneratorFactory
      * @param bool $includeParent
      * @param bool $includeMethods
      * @param bool $includeConstants
+     * @param bool $includeParentMethods
+     * @param bool $includePrivateMethods
      *
      * @return DefinitionGeneratorInterface
      */

tests/MockObjects/MockClass.php

@@ -11,7 +11,7 @@ class MockClass implements MockInterface
 {
     use MockTrait;
 
-    private $privateProperty = 'foo';
+    private string $privateProperty = 'foo';
 
     public static $publicStaticProperty;
 

tests/MockObjects/MockTrait.php

@@ -9,7 +9,7 @@
 
 trait MockTrait
 {
-    public $publicProperty = [];
+    public array $publicProperty = [];
 
     public function setPublicProperty(array $publicProperty): void
     {