Merge pull request #493 from ergebnis/feature/php74

Enhancement: Use `Php74` rule set
ergebnis · Dec 30, 2021 · 2ba59ad · 2ba59ad
2 parents 52d2f3a + d214c6e
commit 2ba59ad
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 39 deletions.
diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
@@ -26,7 +26,7 @@
 
 $license->save();
 
-$config = PhpCsFixer\Config\Factory::fromRuleSet(new PhpCsFixer\Config\RuleSet\Php73($license->header()));
+$config = PhpCsFixer\Config\Factory::fromRuleSet(new PhpCsFixer\Config\RuleSet\Php74($license->header()));
 
 $config->getFinder()
     ->exclude([

diff --git a/src/Construct.php b/src/Construct.php
@@ -18,15 +18,12 @@
  */
 final class Construct
 {
-    /**
-     * @var string
-     */
-    private $name;
+    private string $name;
 
     /**
      * @var array<int, string>
      */
-    private $fileNames = [];
+    private array $fileNames = [];
 
     private function __construct(string $name)
     {

diff --git a/src/Exception/DirectoryDoesNotExist.php b/src/Exception/DirectoryDoesNotExist.php
@@ -15,10 +15,7 @@
 
 final class DirectoryDoesNotExist extends \InvalidArgumentException implements ExceptionInterface
 {
-    /**
-     * @var string
-     */
-    private $directory;
+    private string $directory;
 
     /**
      * Returns a new exception from a directory.

diff --git a/src/Exception/MultipleDefinitionsFound.php b/src/Exception/MultipleDefinitionsFound.php
@@ -20,7 +20,7 @@ final class MultipleDefinitionsFound extends \RuntimeException implements Except
     /**
      * @var array<int, Construct>
      */
-    private $constructs;
+    private array $constructs;
 
     /**
      * Returns a new exception from constructs.

diff --git a/test/Unit/ConstructsTest.php b/test/Unit/ConstructsTest.php
@@ -31,10 +31,7 @@
  */
 final class ConstructsTest extends Framework\TestCase
 {
-    /**
-     * @var string
-     */
-    private $fileWithParseError = __DIR__ . '/../Fixture/ParseError/MessedUp.php';
+    private string $fileWithParseError = __DIR__ . '/../Fixture/ParseError/MessedUp.php';
 
     protected function setUp(): void
     {

diff --git a/test/Util/PhpVersion.php b/test/Util/PhpVersion.php
@@ -18,10 +18,7 @@
  */
 final class PhpVersion
 {
-    /**
-     * @var int
-     */
-    private $value;
+    private int $value;
 
     private function __construct(int $value)
     {

diff --git a/test/Util/Scenario.php b/test/Util/Scenario.php
@@ -20,30 +20,15 @@
  */
 final class Scenario
 {
-    /**
-     * @var PhpVersion
-     */
-    private $phpVersion;
-
-    /**
-     * @var string
-     */
-    private $description;
-
-    /**
-     * @var string
-     */
-    private $fileName;
-
-    /**
-     * @var string
-     */
-    private $fileContent;
+    private PhpVersion $phpVersion;
+    private string $description;
+    private string $fileName;
+    private string $fileContent;
 
     /**
      * @var array<int, Classy\Construct>
      */
-    private $constructs;
+    private array $constructs;
 
     private function __construct(
         PhpVersion $phpVersion,