refactor: Cleanup phpstan baseline (#2)

Also adjust the readme file.

Classes/DataProcessing/ResponsiveImagesProcessor.php

@@ -84,7 +84,7 @@ public function process(
             return $processedData;
         }
 
-        $this->contentElementSizes = Rootline::make($processedData['data'])->getFinalSizes();
+        $this->contentElementSizes = (new Rootline($processedData['data']))->getFinalSizes();
         $this->fetchContentElementFieldConfiguration();
         $this->calculateFileDimensions();
 
@@ -175,7 +175,7 @@ private function getBreakpoints(): array
 
         if (is_iterable($breakpointsByPath)) {
             foreach ($breakpointsByPath as $breakpointIdentifier => $breakpointData) {
-                $breakpoints[$breakpointIdentifier] = Breakpoint::make($breakpointIdentifier, $breakpointData);
+                $breakpoints[$breakpointIdentifier] = new Breakpoint($breakpointIdentifier, $breakpointData);
             }
         }
 

Classes/Sizes/BackendLayout.php

@@ -46,11 +46,6 @@ public function __construct(
         $this->determineColumns();
     }
 
-    public static function make(mixed ...$arguments): static
-    {
-        return new self(...$arguments);
-    }
-
     public function getSizes(): array
     {
         return $this->sizes;
@@ -71,7 +66,7 @@ public function setActiveColumn(Column $column): void
         $this->activeColumn = $column;
     }
 
-    public function getActiveColumn(): ?Column
+    public function getActiveColumn(): Column
     {
         return $this->activeColumn;
     }
@@ -100,8 +95,8 @@ private function determineColumns(): array
         $breakpointsByPath = $this->configurationManager->getByPath($sizesPath);
 
         if (is_iterable($breakpointsByPath)) {
-            foreach ($this->configurationManager->getByPath($sizesPath) as $columnIdentifier => $columnData) {
-                $this->columns[$columnIdentifier] = Column::make((string) $columnIdentifier, $columnData);
+            foreach ($breakpointsByPath as $columnIdentifier => $columnData) {
+                $this->columns[$columnIdentifier] = new Column($columnIdentifier, $columnData);
             }
         }
 

Classes/Sizes/BackendLayout/Column.php

@@ -33,18 +33,13 @@ class Column
     private readonly array $multiplier;
 
     public function __construct(
-        private readonly string $identifier,
+        private readonly int $identifier,
         array $data
     ) {
         $this->multiplier = array_map(static fn ($multiplier): float => Multiplier::parse($multiplier), $data['multiplier']);
     }
 
-    public static function make(mixed ...$arguments): self
-    {
-        return new self(...$arguments);
-    }
-
-    public function getIdentifier(): string
+    public function getIdentifier(): int
     {
         return $this->identifier;
     }

Classes/Sizes/Breakpoint.php

@@ -35,11 +35,6 @@ public function __construct(
     ) {
     }
 
-    public static function make(mixed ...$arguments): static
-    {
-        return new self(...$arguments);
-    }
-
     public function getIdentifier(): string
     {
         return $this->identifier;

Classes/Sizes/Container.php

@@ -66,7 +66,7 @@ private function determineColumns(): void
         $columnsByPath = $this->configurationManager->getByPath($sizesPath);
         if (is_iterable($columnsByPath)) {
             foreach ($columnsByPath as $columnIdentifier => $columnData) {
-                $this->columns[$columnIdentifier] = Column::make((string) $columnIdentifier, $columnData);
+                $this->columns[$columnIdentifier] = new Column($columnIdentifier, $columnData);
             }
         }
     }

Classes/Sizes/ContentElement.php

@@ -44,11 +44,6 @@ public function __construct(
         $this->colPos = $data['colPos'];
     }
 
-    public static function make(mixed ...$arguments): static
-    {
-        return new static(...$arguments);
-    }
-
     public function getData(?string $dataIdentifier = null): mixed
     {
         if ($dataIdentifier === null) {

Classes/Sizes/ContentElementInterface.php

@@ -12,8 +12,6 @@ interface ContentElementInterface
 {
     public function __construct(array $data);
 
-    public static function make(mixed ...$arguments): static;
-
     public function getData(?string $dataIdentifier = null): mixed;
 
     public function getContentType(): string;

Classes/Sizes/Rootline.php

@@ -49,11 +49,6 @@ public function __construct(array $data)
         $this->calculateSizes();
     }
 
-    public static function make(mixed ...$arguments): static
-    {
-        return new self(...$arguments);
-    }
-
     public function getFinalSizes(): array
     {
         return $this->finalSizes;
@@ -82,16 +77,16 @@ private function determineBackendLayout(): void
             ->getLayoutForPage($typoscriptFrontendController->page, $typoscriptFrontendController->rootLine)
         ;
 
-        $this->backendLayout = BackendLayout::make($backendLayoutIdentifier);
+        $this->backendLayout = new BackendLayout($backendLayoutIdentifier);
     }
 
     private function determineContentElement(array $data): ContentElementInterface
     {
         if (str_contains((string) $data['CType'], '_container-')) {
-            return Container::make($data);
+            return new Container($data);
         }
 
-        return ContentElement::make($data);
+        return new ContentElement($data);
     }
 
     private function determineRootline(): void

README.md

@@ -10,9 +10,7 @@ In this development state the extension is only used in one project.
 ##  Missing Features
 
 The extension does not yet:
-- contains tests.
 - work out of the box without configuration.
-- handles b13/containers as optional.
-- support other grid/container frameworks.
+- support content block grids.
 - provide flexible enough configuration for more use cases.
 - support EXT:fluid_styled_content.

phpstan-baseline.neon

@@ -1,41 +1,2 @@
 parameters:
 	ignoreErrors:
-		-
-			message: "#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\\.$#"
-			count: 1
-			path: Classes/Sizes/BackendLayout.php
-
-		-
-			message: "#^Cannot cast mixed to string\\.$#"
-			count: 1
-			path: Classes/Sizes/BackendLayout.php
-
-		-
-			message: "#^Parameter \\#1 \\$identifier of class Codappix\\\\ResponsiveImages\\\\Sizes\\\\BackendLayout constructor expects string, mixed given\\.$#"
-			count: 1
-			path: Classes/Sizes/BackendLayout.php
-
-		-
-			message: "#^Parameter \\#1 \\$identifier of class Codappix\\\\ResponsiveImages\\\\Sizes\\\\BackendLayout\\\\Column constructor expects string, mixed given\\.$#"
-			count: 1
-			path: Classes/Sizes/BackendLayout/Column.php
-
-		-
-			message: "#^Parameter \\#1 \\$identifier of class Codappix\\\\ResponsiveImages\\\\Sizes\\\\Breakpoint constructor expects string, mixed given\\.$#"
-			count: 1
-			path: Classes/Sizes/Breakpoint.php
-
-		-
-			message: "#^Parameter \\#1 \\$data of class Codappix\\\\ResponsiveImages\\\\Sizes\\\\ContentElement constructor expects array, mixed given\\.$#"
-			count: 1
-			path: Classes/Sizes/ContentElement.php
-
-		-
-			message: "#^Cannot call method getMultiplier\\(\\) on Codappix\\\\ResponsiveImages\\\\Sizes\\\\BackendLayout\\\\Column\\|null\\.$#"
-			count: 1
-			path: Classes/Sizes/Rootline.php
-
-		-
-			message: "#^Parameter \\#1 \\$data of class Codappix\\\\ResponsiveImages\\\\Sizes\\\\Rootline constructor expects array, mixed given\\.$#"
-			count: 1
-			path: Classes/Sizes/Rootline.php