release PHP 7.2 downgraded

app/ClassNameResolver.php

@@ -1,42 +1,45 @@
 <?php
 
-declare(strict_types=1);
-
+declare (strict_types=1);
 namespace TomasVotruba\ClassLeak;
 
-use PhpParser\NodeTraverser;
-use PhpParser\Parser;
+use ClassLeak202307\PhpParser\NodeTraverser;
+use ClassLeak202307\PhpParser\Parser;
 use TomasVotruba\ClassLeak\NodeDecorator\FullyQualifiedNameNodeDecorator;
 use TomasVotruba\ClassLeak\NodeVisitor\ClassNameNodeVisitor;
-
 /**
  * @see \TomasVotruba\ClassLeak\Tests\ClassNameResolver\ClassNameResolverTest
  */
 final class ClassNameResolver
 {
-    public function __construct(
-        private readonly Parser $parser,
-        private readonly FullyQualifiedNameNodeDecorator $fullyQualifiedNameNodeDecorator
-    ) {
+    /**
+     * @readonly
+     * @var \PhpParser\Parser
+     */
+    private $parser;
+    /**
+     * @readonly
+     * @var \TomasVotruba\ClassLeak\NodeDecorator\FullyQualifiedNameNodeDecorator
+     */
+    private $fullyQualifiedNameNodeDecorator;
+    public function __construct(Parser $parser, FullyQualifiedNameNodeDecorator $fullyQualifiedNameNodeDecorator)
+    {
+        $this->parser = $parser;
+        $this->fullyQualifiedNameNodeDecorator = $fullyQualifiedNameNodeDecorator;
     }
-
-    public function resolveFromFromFilePath(string $filePath): ?string
+    public function resolveFromFromFilePath(string $filePath) : ?string
     {
         /** @var string $fileContents */
-        $fileContents = file_get_contents($filePath);
-
+        $fileContents = \file_get_contents($filePath);
         $stmts = $this->parser->parse($fileContents);
         if ($stmts === null) {
             return null;
         }
-
         $this->fullyQualifiedNameNodeDecorator->decorate($stmts);
-
         $classNameNodeVisitor = new ClassNameNodeVisitor();
         $nodeTraverser = new NodeTraverser();
         $nodeTraverser->addVisitor($classNameNodeVisitor);
         $nodeTraverser->traverse($stmts);
-
         return $classNameNodeVisitor->getClassName();
     }
 }

app/Console/ClassLeakApplication.php

@@ -1,18 +1,15 @@
 <?php
 
-declare(strict_types=1);
-
+declare (strict_types=1);
 namespace TomasVotruba\ClassLeak\Console;
 
-use Symfony\Component\Console\Application;
+use ClassLeak202307\Symfony\Component\Console\Application;
 use TomasVotruba\ClassLeak\Console\Commands\CheckCommand;
-
 final class ClassLeakApplication extends Application
 {
     public function __construct(CheckCommand $checkCommand)
     {
         parent::__construct('Class Leak', '0.1');
-
         $this->add($checkCommand);
     }
 }

app/Console/Commands/CheckCommand.php

@@ -1,102 +1,99 @@
 <?php
 
-declare(strict_types=1);
-
+declare (strict_types=1);
 namespace TomasVotruba\ClassLeak\Console\Commands;
 
 use Closure;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Style\SymfonyStyle;
+use ClassLeak202307\Symfony\Component\Console\Command\Command;
+use ClassLeak202307\Symfony\Component\Console\Input\InputArgument;
+use ClassLeak202307\Symfony\Component\Console\Input\InputInterface;
+use ClassLeak202307\Symfony\Component\Console\Input\InputOption;
+use ClassLeak202307\Symfony\Component\Console\Output\OutputInterface;
+use ClassLeak202307\Symfony\Component\Console\Style\SymfonyStyle;
 use TomasVotruba\ClassLeak\Filtering\PossiblyUnusedClassesFilter;
 use TomasVotruba\ClassLeak\Finder\ClassNamesFinder;
 use TomasVotruba\ClassLeak\Finder\PhpFilesFinder;
 use TomasVotruba\ClassLeak\Reporting\UnusedClassReporter;
 use TomasVotruba\ClassLeak\UseImportsResolver;
-
 final class CheckCommand extends Command
 {
-    public function __construct(
-        private readonly ClassNamesFinder $classNamesFinder,
-        private readonly UseImportsResolver $useImportsResolver,
-        private readonly PossiblyUnusedClassesFilter $possiblyUnusedClassesFilter,
-        private readonly UnusedClassReporter $unusedClassReporter,
-        private readonly SymfonyStyle $symfonyStyle,
-        private readonly PhpFilesFinder $phpFilesFinder,
-    ) {
+    /**
+     * @readonly
+     * @var \TomasVotruba\ClassLeak\Finder\ClassNamesFinder
+     */
+    private $classNamesFinder;
+    /**
+     * @readonly
+     * @var \TomasVotruba\ClassLeak\UseImportsResolver
+     */
+    private $useImportsResolver;
+    /**
+     * @readonly
+     * @var \TomasVotruba\ClassLeak\Filtering\PossiblyUnusedClassesFilter
+     */
+    private $possiblyUnusedClassesFilter;
+    /**
+     * @readonly
+     * @var \TomasVotruba\ClassLeak\Reporting\UnusedClassReporter
+     */
+    private $unusedClassReporter;
+    /**
+     * @readonly
+     * @var \Symfony\Component\Console\Style\SymfonyStyle
+     */
+    private $symfonyStyle;
+    /**
+     * @readonly
+     * @var \TomasVotruba\ClassLeak\Finder\PhpFilesFinder
+     */
+    private $phpFilesFinder;
+    public function __construct(ClassNamesFinder $classNamesFinder, UseImportsResolver $useImportsResolver, PossiblyUnusedClassesFilter $possiblyUnusedClassesFilter, UnusedClassReporter $unusedClassReporter, SymfonyStyle $symfonyStyle, PhpFilesFinder $phpFilesFinder)
+    {
+        $this->classNamesFinder = $classNamesFinder;
+        $this->useImportsResolver = $useImportsResolver;
+        $this->possiblyUnusedClassesFilter = $possiblyUnusedClassesFilter;
+        $this->unusedClassReporter = $unusedClassReporter;
+        $this->symfonyStyle = $symfonyStyle;
+        $this->phpFilesFinder = $phpFilesFinder;
         parent::__construct();
     }
-
-    protected function configure(): void
+    protected function configure() : void
     {
         $this->setName('check');
         $this->setDescription('Check classes that are not used in any config and in the code');
-
-        $this->addArgument(
-            'paths',
-            InputArgument::REQUIRED | InputArgument::IS_ARRAY,
-            'Files and directories to analyze'
-        );
-        $this->addOption(
-            'skip-type',
-            null,
-            InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED,
-            'Class types that should be skipped'
-        );
+        $this->addArgument('paths', InputArgument::REQUIRED | InputArgument::IS_ARRAY, 'Files and directories to analyze');
+        $this->addOption('skip-type', null, InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED, 'Class types that should be skipped');
     }
-
-    protected function execute(InputInterface $input, OutputInterface $output): int
+    protected function execute(InputInterface $input, OutputInterface $output) : int
     {
         /** @var string[] $paths */
         $paths = (array) $input->getArgument('paths');
-
         /** @var string[] $typesToSkip */
         $typesToSkip = (array) $input->getOption('skip-type');
-
         $phpFilePaths = $this->phpFilesFinder->findPhpFiles($paths);
-
-        $this->symfonyStyle->progressStart(count($phpFilePaths));
+        $this->symfonyStyle->progressStart(\count($phpFilePaths));
         $this->symfonyStyle->newLine();
-
-        $usedNames = $this->resolveUsedClassNames($phpFilePaths, function (): void {
+        $usedNames = $this->resolveUsedClassNames($phpFilePaths, function () : void {
             $this->symfonyStyle->progressAdvance();
         });
-
         $existingFilesWithClasses = $this->classNamesFinder->resolveClassNamesToCheck($phpFilePaths);
-
-        $possiblyUnusedFilesWithClasses = $this->possiblyUnusedClassesFilter->filter(
-            $existingFilesWithClasses,
-            $usedNames,
-            $typesToSkip
-        );
-
-        return $this->unusedClassReporter->reportResult(
-            $possiblyUnusedFilesWithClasses,
-            $existingFilesWithClasses
-        );
+        $possiblyUnusedFilesWithClasses = $this->possiblyUnusedClassesFilter->filter($existingFilesWithClasses, $usedNames, $typesToSkip);
+        return $this->unusedClassReporter->reportResult($possiblyUnusedFilesWithClasses, $existingFilesWithClasses);
     }
-
     /**
      * @param string[] $phpFilePaths
      * @return string[]
      */
-    private function resolveUsedClassNames(array $phpFilePaths, Closure $progressClosure): array
+    private function resolveUsedClassNames(array $phpFilePaths, Closure $progressClosure) : array
     {
         $usedNames = [];
-
         foreach ($phpFilePaths as $phpFilePath) {
             $currentUsedNames = $this->useImportsResolver->resolve($phpFilePath);
-            $usedNames = array_merge($usedNames, $currentUsedNames);
-
+            $usedNames = \array_merge($usedNames, $currentUsedNames);
             $progressClosure();
         }
-
-        $usedNames = array_unique($usedNames);
-        sort($usedNames);
-
+        $usedNames = \array_unique($usedNames);
+        \sort($usedNames);
         return $usedNames;
     }
 }

app/DependencyInjection/ContainerFactory.php

@@ -1,37 +1,29 @@
 <?php
 
-declare(strict_types=1);
-
+declare (strict_types=1);
 namespace TomasVotruba\ClassLeak\DependencyInjection;
 
-use Illuminate\Container\Container;
-use PhpParser\Parser;
-use PhpParser\ParserFactory;
-use Symfony\Component\Console\Input\ArrayInput;
-use Symfony\Component\Console\Output\ConsoleOutput;
-use Symfony\Component\Console\Output\NullOutput;
-use Symfony\Component\Console\Style\SymfonyStyle;
-
+use ClassLeak202307\Illuminate\Container\Container;
+use ClassLeak202307\PhpParser\Parser;
+use ClassLeak202307\PhpParser\ParserFactory;
+use ClassLeak202307\Symfony\Component\Console\Input\ArrayInput;
+use ClassLeak202307\Symfony\Component\Console\Output\ConsoleOutput;
+use ClassLeak202307\Symfony\Component\Console\Output\NullOutput;
+use ClassLeak202307\Symfony\Component\Console\Style\SymfonyStyle;
 final class ContainerFactory
 {
-    public function create(): Container
+    public function create() : Container
     {
         $container = new Container();
-
-        $container->singleton(Parser::class, static function (): Parser {
+        $container->singleton(Parser::class, static function () : Parser {
             $parserFactory = new ParserFactory();
             return $parserFactory->create(ParserFactory::PREFER_PHP7);
         });
-
-        $container->singleton(
-            SymfonyStyle::class,
-            static function (): SymfonyStyle {
-                // use null output ofr tests to avoid printing
-                $consoleOutput = defined('PHPUNIT_COMPOSER_INSTALL') ? new NullOutput() : new ConsoleOutput();
-                return new SymfonyStyle(new ArrayInput([]), $consoleOutput);
-            }
-        );
-
+        $container->singleton(SymfonyStyle::class, static function () : SymfonyStyle {
+            // use null output ofr tests to avoid printing
+            $consoleOutput = \defined('PHPUNIT_COMPOSER_INSTALL') ? new NullOutput() : new ConsoleOutput();
+            return new SymfonyStyle(new ArrayInput([]), $consoleOutput);
+        });
         return $container;
     }
 }

app/FileSystem/StaticRelativeFilePathHelper.php

@@ -1,18 +1,17 @@
 <?php
 
-declare(strict_types=1);
-
+declare (strict_types=1);
 namespace TomasVotruba\ClassLeak\FileSystem;
 
 /**
  * @see \TomasVotruba\ClassLeak\Tests\FileSystem\StaticRelativeFilePathHelperTest
  */
 final class StaticRelativeFilePathHelper
 {
-    public static function resolveFromCwd(string $filePath): string
+    public static function resolveFromCwd(string $filePath) : string
     {
         // make path relative with native PHP
-        $relativeFilePath = (string) realpath($filePath);
-        return str_replace(getcwd() . DIRECTORY_SEPARATOR, '', $relativeFilePath);
+        $relativeFilePath = (string) \realpath($filePath);
+        return \str_replace(\getcwd() . \DIRECTORY_SEPARATOR, '', $relativeFilePath);
     }
 }