cleanups

oliwierptak · Aug 8, 2021 · b55a61c · b55a61c
1 parent 2260140
commit b55a61c
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 29 deletions.
diff --git a/src/Popo/Model/Generate/GenerateModel.php b/src/Popo/Model/Generate/GenerateModel.php
@@ -6,7 +6,6 @@
 
 use Popo\Builder\PopoBuilder;
 use Popo\Builder\SchemaBuilder;
-use Popo\Model\Generate\GenerateResult;
 use Popo\PopoConfigurator;
 
 class GenerateModel
@@ -20,7 +19,6 @@ public function __construct(
     public function generate(PopoConfigurator $configurator): GenerateResult
     {
         $result = new GenerateResult;
-
         $data = $this->schemaBuilder->build($configurator);
 
         foreach ($data as $schemaName => $schemaCollection) {

diff --git a/src/Popo/Model/Report/ReportModel.php b/src/Popo/Model/Report/ReportModel.php
@@ -37,24 +37,22 @@ protected function generateReport(array $data, SchemaFile $sharedSchemaFile): Re
         $sharedSchemaFileConfig = [];
 
         foreach ($sharedFileConfig as $dataItem) {
-            $result->add(
-                (new ReportResultItem())
-                    ->setName($dataItem['name'])
-                    ->setData($dataItem)
-                    ->setSchemaFilename($sharedSchemaFile->getFilename()->getPathname())
-                    ->markAsFileConfig()
+            $result->add((new ReportResultItem())
+                ->setName($dataItem['name'])
+                ->setData($dataItem)
+                ->setSchemaFilename($sharedSchemaFile->getFilename()->getPathname())
+                ->markAsFileConfig()
             );
         }
 
         foreach ($data as $schemaFile) {
             $fileConfig = $schemaFile->getFileConfig()['property'] ?? [];
             foreach ($fileConfig as $dataItem) {
-                $result->add(
-                    (new ReportResultItem())
-                        ->setName($dataItem['name'])
-                        ->setData($dataItem)
-                        ->setSchemaFilename($schemaFile->getFilename()->getPathname())
-                        ->markAsFileConfig()
+                $result->add((new ReportResultItem())
+                    ->setName($dataItem['name'])
+                    ->setData($dataItem)
+                    ->setSchemaFilename($schemaFile->getFilename()->getPathname())
+                    ->markAsFileConfig()
                 );
             }
 
@@ -64,26 +62,24 @@ protected function generateReport(array $data, SchemaFile $sharedSchemaFile): Re
                         ->getSchemaConfig()[$schemaName]['property'] ?? [];
 
                 foreach ($schemaConfig as $dataItem) {
-                    $result->add(
-                        (new ReportResultItem())
-                            ->setName($dataItem['name'])
-                            ->setData($dataItem)
-                            ->setSchemaName($schemaName)
-                            ->setSchemaFilename($schemaFile->getFilename()->getPathname())
-                            ->markAsSchemaConfig()
+                    $result->add((new ReportResultItem())
+                        ->setName($dataItem['name'])
+                        ->setData($dataItem)
+                        ->setSchemaName($schemaName)
+                        ->setSchemaFilename($schemaFile->getFilename()->getPathname())
+                        ->markAsSchemaConfig()
                     );
                 }
 
                 foreach ($popoCollection as $popoName => $popoData) {
                     foreach ($popoData['property'] as $propertyData) {
-                        $result->add(
-                            (new ReportResultItem())
-                                ->setName($propertyData['name'])
-                                ->setData($propertyData)
-                                ->setPopoName($popoName)
-                                ->setSchemaName($schemaName)
-                                ->setSchemaFilename($schemaFile->getFilename()->getPathname())
-                                ->markAsPropertyConfig()
+                        $result->add((new ReportResultItem())
+                            ->setName($propertyData['name'])
+                            ->setData($propertyData)
+                            ->setPopoName($popoName)
+                            ->setSchemaName($schemaName)
+                            ->setSchemaFilename($schemaFile->getFilename()->getPathname())
+                            ->markAsPropertyConfig()
                         );
                     }
                 }