refactor

imanghafoori1 · Dec 25, 2023 · 5984e33 · 5984e33
1 parent 350e973
commit 5984e33
Show file tree

Hide file tree

Showing 33 changed files with 719 additions and 516 deletions.
diff --git a/microscope b/microscope
@@ -1,9 +1,10 @@
 <?php
 
 use Imanghafoori\LaravelMicroscope\ErrorReporters\ErrorPrinter;
-use Imanghafoori\LaravelMicroscope\Features\CheckImports\CheckImportReporter;
 use Imanghafoori\LaravelMicroscope\Features\CheckImports\Checks\CheckClassReferencesAreValid;
 use Imanghafoori\LaravelMicroscope\Features\CheckImports\Handlers\PrintWrongClassRefs;
+use Imanghafoori\LaravelMicroscope\Features\CheckImports\Reporters\CheckImportReporter;
+use Imanghafoori\LaravelMicroscope\Features\CheckImports\Reporters\Psr4Report;
 use Imanghafoori\LaravelMicroscope\FileReaders\FilePath;
 use Imanghafoori\LaravelMicroscope\ForPsr4LoadedClasses;
 use Imanghafoori\TokenAnalyzer\ParseUseStatement;
@@ -55,6 +56,6 @@ $psr4Stats = ForPsr4LoadedClasses::check([CheckClassReferencesAreValid::class],
 $output = new ConsoleOutput();
 ErrorPrinter::singleton($output)->logErrors();
 
-$output->writeln(CheckImportReporter::totalImportsMsg());
-$output->writeln(CheckImportReporter::printPsr4($psr4Stats));
-$output->writeln(CheckImportReporter::printErrorsCount());
+$output->writeln(CheckImportReporter::totalImportsMsg(1));
+$output->writeln(Psr4Report::printPsr4($psr4Stats));
+//$output->writeln(CheckImportReporter::printErrorsCount());
diff --git a/src/Analyzers/ComposerJson.php b/src/Analyzers/ComposerJson.php
@@ -29,11 +29,11 @@ public static function getClassMaps($basePath)
         $result = [];
         foreach (self::make()->readAutoloadClassMap() as $compPath => $classMaps) {
             foreach ($classMaps as $classmap) {
-                $compPath = trim($compPath, '/');
-                $compPath = $compPath ? $compPath.DIRECTORY_SEPARATOR : '';
-                $classmap = $basePath.DIRECTORY_SEPARATOR.$compPath.$classmap;
-                $classmap = array_values(ClassMapGenerator::createMap($classmap));
-                $result = array_merge($classmap, $result);
+                $compPath1 = trim($compPath, '/');
+                $compPath1 = $compPath1 ? $compPath1.DIRECTORY_SEPARATOR : '';
+                $classmapFullPath = $basePath.DIRECTORY_SEPARATOR.$compPath1.$classmap;
+                $classes = array_values(ClassMapGenerator::createMap($classmapFullPath));
+                $result[$compPath][$classmap] = $classes;
             }
         }
 

diff --git a/src/BladeFiles.php b/src/BladeFiles.php
diff --git a/src/Commands/CheckBadPractice.php b/src/Commands/CheckBadPractice.php
@@ -79,6 +79,7 @@ private function checkPsr4Classes()
             LaravelPaths::configDirs()
         );
 
+        $configs = iterator_to_array($configs);
         foreach (ComposerJson::readAutoload() as $psr4) {
             foreach ($psr4 as $dirPath) {
                 foreach (FilePath::getAllPhpFiles($dirPath) as $filePath) {

diff --git a/src/Commands/CheckBladeQueries.php b/src/Commands/CheckBladeQueries.php
@@ -3,9 +3,9 @@
 namespace Imanghafoori\LaravelMicroscope\Commands;
 
 use Illuminate\Console\Command;
-use Imanghafoori\LaravelMicroscope\BladeFiles;
 use Imanghafoori\LaravelMicroscope\Checks\CheckIsQuery;
 use Imanghafoori\LaravelMicroscope\ErrorReporters\ErrorPrinter;
+use Imanghafoori\LaravelMicroscope\Iterators\BladeFiles;
 use Imanghafoori\LaravelMicroscope\Traits\LogsErrors;
 
 class CheckBladeQueries extends Command

diff --git a/src/Commands/CheckExtractBladeIncludes.php b/src/Commands/CheckExtractBladeIncludes.php
@@ -3,9 +3,9 @@
 namespace Imanghafoori\LaravelMicroscope\Commands;
 
 use Illuminate\Console\Command;
-use Imanghafoori\LaravelMicroscope\BladeFiles;
 use Imanghafoori\LaravelMicroscope\Checks\ExtractBladePartial;
 use Imanghafoori\LaravelMicroscope\ErrorReporters\ErrorPrinter;
+use Imanghafoori\LaravelMicroscope\Iterators\BladeFiles;
 use Imanghafoori\LaravelMicroscope\Traits\LogsErrors;
 
 class CheckExtractBladeIncludes extends Command

diff --git a/src/Commands/CheckRoutes.php b/src/Commands/CheckRoutes.php
@@ -7,11 +7,11 @@
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Routing\Router;
 use Illuminate\Support\Str;
-use Imanghafoori\LaravelMicroscope\BladeFiles;
 use Imanghafoori\LaravelMicroscope\Checks\CheckRouteCalls;
 use Imanghafoori\LaravelMicroscope\ErrorReporters\ErrorPrinter;
 use Imanghafoori\LaravelMicroscope\Features\ActionComments\ActionsComments;
 use Imanghafoori\LaravelMicroscope\ForPsr4LoadedClasses;
+use Imanghafoori\LaravelMicroscope\Iterators\BladeFiles;
 use Imanghafoori\LaravelMicroscope\Traits\LogsErrors;
 
 class CheckRoutes extends Command

diff --git a/src/Features/CheckImports/CheckImportReporter.php b/src/Features/CheckImports/CheckImportReporter.php