minor #6290 PHP7.4 - properties types (SpacePossum)

This PR was merged into the master branch. Discussion ---------- PHP7.4 - properties types part of #6288 Commits ------- 6474f90 PHP7.4 - properties types
PHP-CS-Fixer · Feb 16, 2022 · c753f74 · c753f74
2 parents bc05dce + 6474f90
commit c753f74
Show file tree

Hide file tree

Showing 116 changed files with 278 additions and 716 deletions.
diff --git a/src/AbstractDoctrineAnnotationFixer.php b/src/AbstractDoctrineAnnotationFixer.php
@@ -29,10 +29,7 @@
  */
 abstract class AbstractDoctrineAnnotationFixer extends AbstractFixer implements ConfigurableFixerInterface
 {
-    /**
-     * @var array
-     */
-    private $classyElements;
+    private array $classyElements;
 
     /**
      * {@inheritdoc}

diff --git a/src/AbstractPhpdocToTypeDeclarationFixer.php b/src/AbstractPhpdocToTypeDeclarationFixer.php
@@ -31,15 +31,12 @@
  */
 abstract class AbstractPhpdocToTypeDeclarationFixer extends AbstractFixer implements ConfigurableFixerInterface
 {
-    /**
-     * @var string
-     */
-    private $classRegex = '/^\\\\?[a-zA-Z_\\x7f-\\xff](?:\\\\?[a-zA-Z0-9_\\x7f-\\xff]+)*$/';
+    private const CLASS_REGEX = '/^\\\\?[a-zA-Z_\\x7f-\\xff](?:\\\\?[a-zA-Z0-9_\\x7f-\\xff]+)*$/';
 
     /**
      * @var array<string, int>
      */
-    private $versionSpecificTypes = [
+    private array $versionSpecificTypes = [
         'void' => 70100,
         'iterable' => 70100,
         'object' => 70200,
@@ -49,7 +46,7 @@ abstract class AbstractPhpdocToTypeDeclarationFixer extends AbstractFixer implem
     /**
      * @var array<string, bool>
      */
-    private $scalarTypes = [
+    private array $scalarTypes = [
         'bool' => true,
         'float' => true,
         'int' => true,
@@ -59,7 +56,7 @@ abstract class AbstractPhpdocToTypeDeclarationFixer extends AbstractFixer implem
     /**
      * @var array<string, bool>
      */
-    private static $syntaxValidationCache = [];
+    private static array $syntaxValidationCache = [];
 
     /**
      * {@inheritdoc}
@@ -202,7 +199,7 @@ protected function getCommonTypeFromAnnotation(Annotation $annotation, bool $isR
             if (false === $this->configuration['scalar_types']) {
                 return null;
             }
-        } elseif (1 !== Preg::match($this->classRegex, $commonType)) {
+        } elseif (1 !== Preg::match(self::CLASS_REGEX, $commonType)) {
             return null;
         }
 

diff --git a/src/Cache/Cache.php b/src/Cache/Cache.php
@@ -21,15 +21,12 @@
  */
 final class Cache implements CacheInterface
 {
-    /**
-     * @var SignatureInterface
-     */
-    private $signature;
+    private SignatureInterface $signature;
 
     /**
      * @var array<string, int>
      */
-    private $hashes = [];
+    private array $hashes = [];
 
     public function __construct(SignatureInterface $signature)
     {

diff --git a/src/Cache/Directory.php b/src/Cache/Directory.php
@@ -21,10 +21,7 @@
  */
 final class Directory implements DirectoryInterface
 {
-    /**
-     * @var string
-     */
-    private $directoryName;
+    private string $directoryName;
 
     public function __construct(string $directoryName)
     {

diff --git a/src/Cache/FileCacheManager.php b/src/Cache/FileCacheManager.php
@@ -32,30 +32,18 @@
  */
 final class FileCacheManager implements CacheManagerInterface
 {
-    /**
-     * @var FileHandlerInterface
-     */
-    private $handler;
+    private FileHandlerInterface $handler;
 
-    /**
-     * @var SignatureInterface
-     */
-    private $signature;
+    private SignatureInterface $signature;
 
-    /**
-     * @var CacheInterface
-     */
-    private $cache;
+    private bool $isDryRun;
 
-    /**
-     * @var bool
-     */
-    private $isDryRun;
+    private DirectoryInterface $cacheDirectory;
 
     /**
-     * @var DirectoryInterface
+     * @var CacheInterface
      */
-    private $cacheDirectory;
+    private $cache;
 
     public function __construct(
         FileHandlerInterface $handler,

diff --git a/src/Cache/FileHandler.php b/src/Cache/FileHandler.php
@@ -23,10 +23,7 @@
  */
 final class FileHandler implements FileHandlerInterface
 {
-    /**
-     * @var string
-     */
-    private $file;
+    private string $file;
 
     public function __construct(string $file)
     {

diff --git a/src/Cache/Signature.php b/src/Cache/Signature.php
@@ -21,30 +21,15 @@
  */
 final class Signature implements SignatureInterface
 {
-    /**
-     * @var string
-     */
-    private $phpVersion;
-
-    /**
-     * @var string
-     */
-    private $fixerVersion;
-
-    /**
-     * @var string
-     */
-    private $indent;
-
-    /**
-     * @var string
-     */
-    private $lineEnding;
-
-    /**
-     * @var array
-     */
-    private $rules;
+    private string $phpVersion;
+
+    private string $fixerVersion;
+
+    private string $indent;
+
+    private string $lineEnding;
+
+    private array $rules;
 
     public function __construct(string $phpVersion, string $fixerVersion, string $indent, string $lineEnding, array $rules)
     {

diff --git a/src/Config.php b/src/Config.php
@@ -23,65 +23,38 @@
  */
 class Config implements ConfigInterface
 {
-    /**
-     * @var string
-     */
-    private $cacheFile = '.php-cs-fixer.cache';
+    private string $cacheFile = '.php-cs-fixer.cache';
 
     /**
      * @var FixerInterface[]
      */
-    private $customFixers = [];
+    private array $customFixers = [];
 
     /**
      * @var null|iterable
      */
     private $finder;
 
-    /**
-     * @var string
-     */
-    private $format = 'txt';
+    private string $format = 'txt';
 
-    /**
-     * @var bool
-     */
-    private $hideProgress = false;
+    private bool $hideProgress = false;
 
-    /**
-     * @var string
-     */
-    private $indent = '    ';
+    private string $indent = '    ';
 
-    /**
-     * @var bool
-     */
-    private $isRiskyAllowed = false;
+    private bool $isRiskyAllowed = false;
 
-    /**
-     * @var string
-     */
-    private $lineEnding = "\n";
+    private string $lineEnding = "\n";
 
-    /**
-     * @var string
-     */
-    private $name;
+    private string $name;
 
     /**
      * @var null|string
      */
     private $phpExecutable;
 
-    /**
-     * @var array
-     */
-    private $rules = ['@PSR12' => true];
+    private array $rules = ['@PSR12' => true];
 
-    /**
-     * @var bool
-     */
-    private $usingCache = true;
+    private bool $usingCache = true;
 
     public function __construct(string $name = 'default')
     {

diff --git a/src/ConfigurationException/InvalidFixerConfigurationException.php b/src/ConfigurationException/InvalidFixerConfigurationException.php
@@ -24,10 +24,7 @@
  */
 class InvalidFixerConfigurationException extends InvalidConfigurationException
 {
-    /**
-     * @var string
-     */
-    private $fixerName;
+    private string $fixerName;
 
     public function __construct(string $fixerName, string $message, ?\Throwable $previous = null)
     {
@@ -36,6 +33,7 @@ public function __construct(string $fixerName, string $message, ?\Throwable $pre
             FixCommandExitStatusCalculator::EXIT_STATUS_FLAG_HAS_INVALID_FIXER_CONFIG,
             $previous
         );
+
         $this->fixerName = $fixerName;
     }
 

diff --git a/src/Console/Application.php b/src/Console/Application.php
@@ -42,10 +42,7 @@ final class Application extends BaseApplication
     public const VERSION = '3.6.1-DEV';
     public const VERSION_CODENAME = 'Roe Deer';
 
-    /**
-     * @var ToolInfo
-     */
-    private $toolInfo;
+    private ToolInfo $toolInfo;
 
     public function __construct()
     {

diff --git a/src/Console/Command/DescribeCommand.php b/src/Console/Command/DescribeCommand.php
@@ -56,10 +56,7 @@ final class DescribeCommand extends Command
      */
     private $setNames;
 
-    /**
-     * @var FixerFactory
-     */
-    private $fixerFactory;
+    private FixerFactory $fixerFactory;
 
     /**
      * @var array<string, FixerInterface>

diff --git a/src/Console/Command/DescribeNameNotFoundException.php b/src/Console/Command/DescribeNameNotFoundException.php
@@ -19,15 +19,12 @@
  */
 final class DescribeNameNotFoundException extends \InvalidArgumentException
 {
-    /**
-     * @var string
-     */
-    private $name;
+    private string $name;
 
     /**
-     * @var string 'rule'|'set'
+     * 'rule'|'set'.
      */
-    private $type;
+    private string $type;
 
     public function __construct(string $name, string $type)
     {

diff --git a/src/Console/Command/FixCommand.php b/src/Console/Command/FixCommand.php
@@ -49,39 +49,24 @@ final class FixCommand extends Command
      */
     protected static $defaultName = 'fix';
 
-    /**
-     * @var EventDispatcherInterface
-     */
-    private $eventDispatcher;
+    private EventDispatcherInterface $eventDispatcher;
 
-    /**
-     * @var ErrorsManager
-     */
-    private $errorsManager;
+    private ErrorsManager $errorsManager;
 
-    /**
-     * @var Stopwatch
-     */
-    private $stopwatch;
+    private Stopwatch $stopwatch;
 
-    /**
-     * @var ConfigInterface
-     */
-    private $defaultConfig;
+    private ConfigInterface $defaultConfig;
 
-    /**
-     * @var ToolInfoInterface
-     */
-    private $toolInfo;
+    private ToolInfoInterface $toolInfo;
 
     public function __construct(ToolInfoInterface $toolInfo)
     {
         parent::__construct();
 
-        $this->defaultConfig = new Config();
-        $this->errorsManager = new ErrorsManager();
         $this->eventDispatcher = new EventDispatcher();
+        $this->errorsManager = new ErrorsManager();
         $this->stopwatch = new Stopwatch();
+        $this->defaultConfig = new Config();
         $this->toolInfo = $toolInfo;
     }
 

diff --git a/src/Console/Command/ListFilesCommand.php b/src/Console/Command/ListFilesCommand.php
@@ -36,15 +36,9 @@ final class ListFilesCommand extends Command
      */
     protected static $defaultName = 'list-files';
 
-    /**
-     * @var ConfigInterface
-     */
-    private $defaultConfig;
+    private ConfigInterface $defaultConfig;
 
-    /**
-     * @var ToolInfoInterface
-     */
-    private $toolInfo;
+    private ToolInfoInterface $toolInfo;
 
     public function __construct(ToolInfoInterface $toolInfo)
     {