Merge pull request #2 from pureware/php74

add rectorphp

composer.json

@@ -11,7 +11,8 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5",
-        "symfony/var-dumper": "^6.0|^5.0"
+        "symfony/var-dumper": "^6.0|^5.0",
+        "rector/rector": "^0.14.8"
     },
     "minimum-stability": "dev",
     "prefer-stable" : true,

rector.php

@@ -0,0 +1,28 @@
+<?php declare(strict_types=1);
+
+use Rector\CodingStyle\Rector\MethodCall\PreferThisOrSelfMethodCallRector;
+use Rector\Php74\Rector\Property\TypedPropertyRector;
+use Rector\Set\ValueObject\SetList;
+use Rector\Config\RectorConfig;
+
+return static function (RectorConfig $rectorConfig): void {
+    // here we can define, what sets of rules will be applied
+    // tip: use "SetList" class to autocomplete sets
+    $rectorConfig->sets([
+        SetList::DEAD_CODE,
+        SetList::PHP_74,
+        \Rector\Set\ValueObject\DowngradeLevelSetList::DOWN_TO_PHP_74
+
+    ]);
+    $rectorConfig->paths(
+        [
+            __DIR__ . '/src',
+            __DIR__ . '/tests'
+        ]
+    );
+    $rectorConfig->skip(
+        [
+            __DIR__ . '/src/Resources'
+        ]
+    );
+};

src/Generator/DirectoryGenerator.php

@@ -48,14 +48,10 @@ public function generate(Directory $directory)
     }
 
     protected function getFiles(Directory $directory): FileCollection {
-        $files = new FileCollection();
-
         if ($this->force) {
             $files = $directory->getFiles();
         } else {
-            $files = $directory->getFiles()->filter(function (File $file) {
-               return !$this->filesystem->exists($this->buildFilePath($file));
-            });
+            $files = $directory->getFiles()->filter(fn(File $file) => !$this->filesystem->exists($this->buildFilePath($file)));
         }
 
 

src/Parser/TwigParser.php

@@ -46,8 +46,6 @@ public function parseFile(File $file): File
     }
 
     /**
-     * @param string $string
-     * @return string
      * @throws LoaderError
      * @throws SyntaxError
      */

src/TreeBuilder/Directory/DirectoryCollection.php

@@ -32,43 +32,26 @@ public function getFiles(): ?FileCollection
 
     }
 
-    /**
-     * @param FileCollection $files
-     */
     public function setFiles(FileCollection $files): void
     {
         $this->files = $files;
     }
 
-    /**
-     * @param FileInterface $file
-     * @return void
-     */
     public function addFile(FileInterface $file): void
     {
         $this->files->add($file);
     }
 
-    /**
-     * @return DirectoryCollection|null
-     */
     public function getDirectories(): ?DirectoryCollection
     {
         return $this->items;
     }
 
-    /**
-     * @param DirectoryCollection|null $directories
-     */
     public function setDirectories(?DirectoryCollection $directories): void
     {
         $this->items = $directories;
     }
 
-    /**
-     * @param DirectoryInterface $directory
-     * @return void
-     */
     public function addDirectories(DirectoryInterface $directory): void
     {
         $this->directories->add($directory);

src/TreeBuilder/File/File.php

@@ -21,73 +21,46 @@ public function __construct(string $name, $fileNamespace)
         $this->fileNamespace = $fileNamespace;
     }
 
-    /**
-     * @return string
-     */
     public function getContent(): string
     {
         return $this->content;
     }
 
-    /**
-     * @param string $content
-     */
     public function setContent(string $content): void
     {
         $this->content = $content;
     }
 
-    /**
-     * @return string
-     */
     public function getParsedFileContent(): string
     {
         return $this->parsedFileContent;
     }
 
-    /**
-     * @param string $parsedFileContent
-     */
     public function setParsedFileContent(string $parsedFileContent): void
     {
         $this->parsedFileContent = $parsedFileContent;
     }
 
-    /**
-     * @return string
-     */
     public function getParsedFileName(): string
     {
         return $this->parsedFile ?? $this->getName();
     }
 
-    /**
-     * @param string $parsedFileName
-     */
     public function setParsedFileName(string $parsedFileName): void
     {
         $this->parsedFile = $parsedFileName;
     }
 
-    /**
-     * @return string
-     */
     public function getName(): string
     {
         return $this->name;
     }
 
-    /**
-     * @param string $name
-     */
     public function setName(string $name): void
     {
         $this->name = $name;
     }
 
-    /**
-     * @return string
-     */
     public function getFileNamespace(): string
     {
         return $this->fileNamespace;