Remove FQCN type hints on properties

fabpot · fabpot · commit d5818ed8c269 · 2021-12-08T16:13:44.000+01:00
diff --git a/Application.php b/Application.php
@@ -72,20 +72,20 @@ class Application implements ResetInterface
 {
     private array $commands = [];
     private bool $wantHelps = false;
-    private ?Command $runningCommand = null;
+    private $runningCommand = null;
     private string $name;
     private string $version;
-    private ?CommandLoaderInterface $commandLoader = null;
+    private $commandLoader = null;
     private bool $catchExceptions = true;
     private bool $autoExit = true;
-    private InputDefinition $definition;
-    private HelperSet $helperSet;
-    private ?EventDispatcherInterface $dispatcher = null;
-    private Terminal $terminal;
+    private $definition;
+    private $helperSet;
+    private $dispatcher = null;
+    private $terminal;
     private string $defaultCommand;
     private bool $singleCommand = false;
     private bool $initialized = false;
-    private SignalRegistry $signalRegistry;
+    private $signalRegistry;
     private array $signalsToDispatchEvent = [];
 
     public function __construct(string $name = 'UNKNOWN', string $version = 'UNKNOWN')
diff --git a/CI/GithubActionReporter.php b/CI/GithubActionReporter.php
@@ -20,7 +20,7 @@
  */
 class GithubActionReporter
 {
-    private OutputInterface $output;
+    private $output;
 
     /**
      * @see https://github.com/actions/toolkit/blob/5e5e1b7aacba68a53836a34db4a288c3c1c1585b/packages/core/src/command.ts#L80-L85
diff --git a/Command/Command.php b/Command/Command.php
@@ -47,20 +47,20 @@ class Command
      */
     protected static $defaultDescription;
 
-    private ?Application $application = null;
+    private $application = null;
     private ?string $name = null;
     private ?string $processTitle = null;
     private array $aliases = [];
-    private InputDefinition $definition;
+    private $definition;
     private bool $hidden = false;
     private string $help = '';
     private string $description = '';
-    private ?InputDefinition $fullDefinition = null;
+    private $fullDefinition = null;
     private bool $ignoreValidationErrors = false;
     private ?\Closure $code = null;
     private array $synopsis = [];
     private array $usages = [];
-    private ?HelperSet $helperSet = null;
+    private $helperSet = null;
 
     public static function getDefaultName(): ?string
     {
diff --git a/Command/HelpCommand.php b/Command/HelpCommand.php
@@ -27,7 +27,7 @@
  */
 class HelpCommand extends Command
 {
-    private Command $command;
+    private $command;
 
     /**
      * {@inheritdoc}
diff --git a/Command/LazyCommand.php b/Command/LazyCommand.php
@@ -24,7 +24,7 @@
  */
 final class LazyCommand extends Command
 {
-    private \Closure|Command $command;
+    private $command;
     private ?bool $isEnabled;
 
     public function __construct(string $name, array $aliases, string $description, bool $isHidden, \Closure $commandFactory, ?bool $isEnabled = true)
diff --git a/Command/LockableTrait.php b/Command/LockableTrait.php
@@ -13,7 +13,6 @@
 
 use Symfony\Component\Console\Exception\LogicException;
 use Symfony\Component\Lock\LockFactory;
-use Symfony\Component\Lock\LockInterface;
 use Symfony\Component\Lock\Store\FlockStore;
 use Symfony\Component\Lock\Store\SemaphoreStore;
 
@@ -24,7 +23,7 @@
  */
 trait LockableTrait
 {
-    private ?LockInterface $lock = null;
+    private $lock = null;
 
     /**
      * Locks a command.
diff --git a/CommandLoader/ContainerCommandLoader.php b/CommandLoader/ContainerCommandLoader.php
@@ -22,7 +22,7 @@
  */
 class ContainerCommandLoader implements CommandLoaderInterface
 {
-    private ContainerInterface $container;
+    private $container;
     private array $commandMap;
 
     /**
diff --git a/Cursor.php b/Cursor.php
@@ -18,7 +18,7 @@
  */
 final class Cursor
 {
-    private OutputInterface $output;
+    private $output;
     private $input;
 
     /**
diff --git a/Descriptor/ApplicationDescription.php b/Descriptor/ApplicationDescription.php
@@ -24,7 +24,7 @@ class ApplicationDescription
 {
     public const GLOBAL_NAMESPACE = '_global';
 
-    private Application $application;
+    private $application;
     private ?string $namespace;
     private bool $showHidden;
     private array $namespaces;
diff --git a/Event/ConsoleEvent.php b/Event/ConsoleEvent.php
@@ -25,8 +25,8 @@ class ConsoleEvent extends Event
 {
     protected $command;
 
-    private InputInterface $input;
-    private OutputInterface $output;
+    private $input;
+    private $output;
 
     public function __construct(?Command $command, InputInterface $input, OutputInterface $output)
     {
diff --git a/EventListener/ErrorListener.php b/EventListener/ErrorListener.php
@@ -24,7 +24,7 @@
  */
 class ErrorListener implements EventSubscriberInterface
 {
-    private ?LoggerInterface $logger;
+    private $logger;
 
     public function __construct(LoggerInterface $logger = null)
     {
diff --git a/Formatter/NullOutputFormatter.php b/Formatter/NullOutputFormatter.php
@@ -16,7 +16,7 @@
  */
 final class NullOutputFormatter implements OutputFormatterInterface
 {
-    private NullOutputFormatterStyle $style;
+    private $style;
 
     /**
      * {@inheritdoc}
diff --git a/Formatter/OutputFormatter.php b/Formatter/OutputFormatter.php
@@ -23,7 +23,7 @@ class OutputFormatter implements WrappableOutputFormatterInterface
 {
     private bool $decorated;
     private array $styles = [];
-    private OutputFormatterStyleStack $styleStack;
+    private $styleStack;
 
     public function __clone()
     {
diff --git a/Formatter/OutputFormatterStyle.php b/Formatter/OutputFormatterStyle.php
@@ -20,7 +20,7 @@
  */
 class OutputFormatterStyle implements OutputFormatterStyleInterface
 {
-    private Color $color;
+    private $color;
     private string $foreground;
     private string $background;
     private array $options;
diff --git a/Formatter/OutputFormatterStyleStack.php b/Formatter/OutputFormatterStyleStack.php
@@ -24,7 +24,7 @@ class OutputFormatterStyleStack implements ResetInterface
      */
     private array $styles = [];
 
-    private OutputFormatterStyleInterface $emptyStyle;
+    private $emptyStyle;
 
     public function __construct(OutputFormatterStyleInterface $emptyStyle = null)
     {
diff --git a/Helper/Dumper.php b/Helper/Dumper.php
@@ -21,9 +21,9 @@
  */
 final class Dumper
 {
-    private OutputInterface $output;
-    private ?CliDumper $dumper;
-    private ?ClonerInterface $cloner;
+    private $output;
+    private $dumper;
+    private $cloner;
     private \Closure $handler;
 
     public function __construct(OutputInterface $output, CliDumper $dumper = null, ClonerInterface $cloner = null)
diff --git a/Helper/ProgressBar.php b/Helper/ProgressBar.php
@@ -47,7 +47,7 @@ final class ProgressBar
     private float $lastWriteTime = 0;
     private float $minSecondsBetweenRedraws = 0;
     private float $maxSecondsBetweenRedraws = 1;
-    private OutputInterface $output;
+    private $output;
     private int $step = 0;
     private ?int $max = null;
     private int $startTime;
@@ -56,9 +56,9 @@ final class ProgressBar
     private int $formatLineCount;
     private array $messages = [];
     private bool $overwrite = true;
-    private Terminal $terminal;
+    private $terminal;
     private ?string $previousMessage = null;
-    private Cursor $cursor;
+    private $cursor;
 
     private static array $formatters;
     private static array $formats;
diff --git a/Helper/ProgressIndicator.php b/Helper/ProgressIndicator.php
@@ -31,7 +31,7 @@ class ProgressIndicator
         'very_verbose_no_ansi' => ' %message% (%elapsed:6s%, %memory:6s%)',
     ];
 
-    private OutputInterface $output;
+    private $output;
     private int $startTime;
     private ?string $format = null;
     private ?string $message = null;
diff --git a/Helper/Table.php b/Helper/Table.php
@@ -43,8 +43,8 @@ class Table
     private bool $horizontal = false;
     private array $effectiveColumnWidths = [];
     private int $numberOfColumns;
-    private OutputInterface $output;
-    private TableStyle $style;
+    private $output;
+    private $style;
     private array $columnStyles = [];
     private array $columnWidths = [];
     private array $columnMaxWidths = [];
diff --git a/Input/InputDefinition.php b/Input/InputDefinition.php
@@ -30,8 +30,8 @@ class InputDefinition
 {
     private array $arguments = [];
     private int $requiredCount = 0;
-    private ?InputArgument $lastArrayArgument = null;
-    private ?InputArgument $lastOptionalArgument = null;
+    private $lastArrayArgument = null;
+    private $lastOptionalArgument = null;
     private array $options = [];
     private array $negations = [];
     private array $shortcuts = [];
diff --git a/Logger/ConsoleLogger.php b/Logger/ConsoleLogger.php
@@ -29,7 +29,7 @@ class ConsoleLogger extends AbstractLogger
     public const INFO = 'info';
     public const ERROR = 'error';
 
-    private OutputInterface $output;
+    private $output;
     private array $verbosityLevelMap = [
         LogLevel::EMERGENCY => OutputInterface::VERBOSITY_NORMAL,
         LogLevel::ALERT => OutputInterface::VERBOSITY_NORMAL,
diff --git a/Output/ConsoleOutput.php b/Output/ConsoleOutput.php
@@ -29,7 +29,7 @@
  */
 class ConsoleOutput extends StreamOutput implements ConsoleOutputInterface
 {
-    private OutputInterface $stderr;
+    private $stderr;
     private array $consoleSectionOutputs = [];
 
     /**
diff --git a/Output/ConsoleSectionOutput.php b/Output/ConsoleSectionOutput.php
@@ -24,7 +24,7 @@ class ConsoleSectionOutput extends StreamOutput
     private array $content = [];
     private int $lines = 0;
     private array $sections;
-    private Terminal $terminal;
+    private $terminal;
 
     /**
      * @param resource               $stream
diff --git a/Output/NullOutput.php b/Output/NullOutput.php
@@ -24,7 +24,7 @@
  */
 class NullOutput implements OutputInterface
 {
-    private NullOutputFormatter $formatter;
+    private $formatter;
 
     /**
      * {@inheritdoc}
diff --git a/Output/Output.php b/Output/Output.php
@@ -30,7 +30,7 @@
 abstract class Output implements OutputInterface
 {
     private int $verbosity;
-    private OutputFormatterInterface $formatter;
+    private $formatter;
 
     /**
      * @param int|null                      $verbosity The verbosity level (one of the VERBOSITY constants in OutputInterface)
diff --git a/Style/OutputStyle.php b/Style/OutputStyle.php
@@ -23,7 +23,7 @@
  */
 abstract class OutputStyle implements OutputInterface, StyleInterface
 {
-    private OutputInterface $output;
+    private $output;
 
     public function __construct(OutputInterface $output)
     {
diff --git a/Style/SymfonyStyle.php b/Style/SymfonyStyle.php
@@ -38,12 +38,12 @@ class SymfonyStyle extends OutputStyle
 {
     public const MAX_LINE_LENGTH = 120;
 
-    private InputInterface $input;
-    private OutputInterface $output;
-    private SymfonyQuestionHelper $questionHelper;
-    private ProgressBar $progressBar;
+    private $input;
+    private $output;
+    private $questionHelper;
+    private $progressBar;
     private int $lineLength;
-    private TrimmedBufferOutput $bufferedOutput;
+    private $bufferedOutput;
 
     public function __construct(InputInterface $input, OutputInterface $output)
     {
diff --git a/Tester/ApplicationTester.php b/Tester/ApplicationTester.php
@@ -28,7 +28,7 @@ class ApplicationTester
 {
     use TesterTrait;
 
-    private Application $application;
+    private $application;
 
     public function __construct(Application $application)
     {
diff --git a/Tester/CommandTester.php b/Tester/CommandTester.php
@@ -24,7 +24,7 @@ class CommandTester
 {
     use TesterTrait;
 
-    private Command $command;
+    private $command;
 
     public function __construct(Command $command)
     {
diff --git a/Tester/TesterTrait.php b/Tester/TesterTrait.php
@@ -23,10 +23,10 @@
  */
 trait TesterTrait
 {
-    private StreamOutput $output;
+    private $output;
     private array $inputs = [];
     private bool $captureStreamsIndependently = false;
-    private InputInterface $input;
+    private $input;
     private int $statusCode;
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`*/`
`21`	`21`	`class GithubActionReporter`
`22`	`22`	`{`
`23`		`- private OutputInterface $output;`
	`23`	`+ private $output;`
`24`	`24`
`25`	`25`	`/**`
`26`	`26`	`* @see https://github.com/actions/toolkit/blob/5e5e1b7aacba68a53836a34db4a288c3c1c1585b/packages/core/src/command.ts#L80-L85`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`*/`
`28`	`28`	`class HelpCommand extends Command`
`29`	`29`	`{`
`30`		`- private Command $command;`
	`30`	`+ private $command;`
`31`	`31`
`32`	`32`	`/**`
`33`	`33`	`* {@inheritdoc}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`*/`
`25`	`25`	`final class LazyCommand extends Command`
`26`	`26`	`{`
`27`		`- private \Closure\|Command $command;`
	`27`	`+ private $command;`
`28`	`28`	`private ?bool $isEnabled;`
`29`	`29`
`30`	`30`	`public function __construct(string $name, array $aliases, string $description, bool $isHidden, \Closure $commandFactory, ?bool $isEnabled = true)`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`*/`
`23`	`23`	`class ContainerCommandLoader implements CommandLoaderInterface`
`24`	`24`	`{`
`25`		`- private ContainerInterface $container;`
	`25`	`+ private $container;`
`26`	`26`	`private array $commandMap;`
`27`	`27`
`28`	`28`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`*/`
`19`	`19`	`final class Cursor`
`20`	`20`	`{`
`21`		`- private OutputInterface $output;`
	`21`	`+ private $output;`
`22`	`22`	`private $input;`
`23`	`23`
`24`	`24`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class ApplicationDescription`
`24`	`24`	`{`
`25`	`25`	`public const GLOBAL_NAMESPACE = '_global';`
`26`	`26`
`27`		`- private Application $application;`
	`27`	`+ private $application;`
`28`	`28`	`private ?string $namespace;`
`29`	`29`	`private bool $showHidden;`
`30`	`30`	`private array $namespaces;`
Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,8 @@ class ConsoleEvent extends Event`
`25`	`25`	`{`
`26`	`26`	`protected $command;`
`27`	`27`
`28`		`- private InputInterface $input;`
`29`		`- private OutputInterface $output;`
	`28`	`+ private $input;`
	`29`	`+ private $output;`
`30`	`30`
`31`	`31`	`public function __construct(?Command $command, InputInterface $input, OutputInterface $output)`
`32`	`32`	`{`