Merge pull request #3 from makeey/feature-php-7.4

Move application to the php 7.4. Fix a couple bugs with function

Author: makeey

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: php:7.2.17
+      - image: php:7.4
     steps:
       - run:
           name: Install system packages

composer.json

@@ -18,7 +18,7 @@
     ],
     "license": "MIT",
     "require": {
-        "php": "^7.2",
+        "php": "^7.4",
         "php-di/php-di": "^6.0",
         "php-ds/php-ds": "^1.2",
         "symfony/console": "^5.0"

src/Application.php

@@ -8,8 +8,7 @@
 
 class Application implements IApplication
 {
-    /** @var \Symfony\Component\Console\Application */
-    private $application;
+    private \Symfony\Component\Console\Application $application;
 
     public function __construct(Command ...$commands)
     {

src/Command/GenerateCommand.php

@@ -11,17 +11,15 @@
 
 class GenerateCommand extends Command
 {
-    /** @var Generator */
-    private $generator;
+    protected static $defaultName = 'generate';
+    private Generator $generator;
 
     public function __construct(Generator $generator, string $name = null)
     {
         $this->generator = $generator;
         parent::__construct($name);
     }
 
-    protected static $defaultName = 'generate';
-
     protected function configure(): void
     {
         $this->setDescription("Generate class diagram")

src/FileWriter.php

@@ -4,8 +4,7 @@
 
 class FileWriter implements IWriter
 {
-    /** @var string|null */
-    private $path;
+    private ?string $path;
 
     public function setOutput(string $path): IWriter
     {

src/Generator.php

@@ -11,18 +11,12 @@
 
 class Generator
 {
-    /** @var IWriter * */
-    private $writer;
-    /** @var IFileCollector * */
-    private $fileCollector;
-    /** @var IUMLDiagramFactory * */
-    private $umlFactory;
-    /** @var SourceParser * */
-    private $sourceParser;
-    /** @var IFormatter * */
-    private $formatter;
-    /** @var IFileTransform */
-    private $fileTransform;
+    private IWriter $writer;
+    private IFileCollector $fileCollector;
+    private IUMLDiagramFactory $umlFactory;
+    private SourceParser $sourceParser;
+    private IFormatter $formatter;
+    private IFileTransform $fileTransform;
 
     public function __construct(
         IWriter $writer,

src/Parser/Entity/PhpClass.php

@@ -4,18 +4,15 @@
 
 final class PhpClass
 {
-    /** @var string */
-    private $namespace;
-    /** @var string */
-    private $name;
+    private string $namespace;
+    private string $name;
     /** @var PhpClassMember[] */
-    private $properties;
+    private array $properties;
     /** @var PhpMethod[] */
-    private $methods;
-    /** @var string|null */
-    private $parent;
+    private array $methods;
+    private ?string $parent;
     /** @var string[] */
-    private $implements;
+    private array $implements;
 
     public function __construct(
         string $name,

src/Parser/Entity/PhpClassMember.php

@@ -4,12 +4,9 @@
 
 final class PhpClassMember
 {
-    /** @var string|null */
-    private $type;
-    /** @var string */
-    private $name;
-    /** @var string */
-    private $accessModifier;
+    private ?string $type;
+    private string $name;
+    private string $accessModifier;
 
     public function __construct(string $name, string $accessModifier, ?string $type)
     {

src/Parser/Entity/PhpFile.php

@@ -6,14 +6,12 @@
 
 class PhpFile
 {
-    /** @var string */
-    private $namespace;
+    private ?string $namespace = null;
     /** @var PhpClass[] */
-    private $classes = [];
+    private array $classes = [];
     /** @var PhpInterface[] */
-    private $interfaces = [];
-    /** @var array */
-    private $usedClasses = [];
+    private array $interfaces = [];
+    private array $usedClasses = [];
 
     public function appendClasses(PhpClass ...$classes): self
     {

src/Parser/Entity/PhpInterface.php

@@ -4,14 +4,11 @@
 
 final class PhpInterface
 {
-    /** @var string **/
-    private $namespace;
-    /** @var string */
-    private $interfaceName;
+    private string $namespace;
+    private string $interfaceName;
     /** @var PhpMethod[] */
-    private $methods;
-    /** @var string|null */
-    private $parent;
+    private array $methods;
+    private ?string $parent;
 
     public function __construct(string $interfaceName, array $methods, string $namespace, ?string $parent)
     {