refactor: Break out into getBlockFields() to make PHPstan happy

lsst-epo · Jan 29, 2024 · 221021d · 221021d
1 parent 06b6739
commit 221021d
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 6 deletions.
diff --git a/src/migrations/m231108_024521_change_to_json_column.php b/src/migrations/m231108_024521_change_to_json_column.php
@@ -63,10 +63,9 @@ public function safeDown(): bool
      */
     private function changeBlockTypeToJsonColumn(string $fieldType): void
     {
-        $blockFields = Craft::$app->getFields()->getFieldsByType($fieldType);
+        $blockFields = $this->getBlockFields($fieldType);
         foreach ($blockFields as $blockField) {
             // Block types have the same methods as Matrix
-            /* @var Matrix $blockField */
             $fields = $blockField->getBlockTypeFields();
             // Filter out any non-CantoDamAsset fields
             $fields = (new Collection($fields))->filter(fn($value) => $value instanceof CantoDamAsset)->toArray();
@@ -115,4 +114,15 @@ private function alterColumnUsingPgsql($table, $column, $type, $using): void
         $cmd->execute();
         $this->endCommand($time);
     }
+
+    /**
+     * Block type fields  have the same methods as Matrix
+     *
+     * @param string $fieldType
+     * @return Matrix[]
+     */
+    private function getBlockFields(string $fieldType): array
+    {
+        return Craft::$app->getFields()->getFieldsByType($fieldType);
+    }
 }
diff --git a/src/services/Assets.php b/src/services/Assets.php
@@ -143,12 +143,9 @@ protected function updateEntryContent(string $value, CantoFieldData $cantoFieldD
      */
     protected function updateBlockTypeContent(string $fieldType, string $value, CantoFieldData $cantoFieldData, ?string $columnKey): void
     {
-        $blockFields = Craft::$app->getFields()->getFieldsByType($fieldType);
+        $blockFields = $this->getBlockFields($fieldType);
         foreach ($blockFields as $blockField) {
-            // Block types have the same methods as Matrix
-            /* @var Matrix $blockField */
             $contentTableName = $blockField->contentTable;
-            /* @var Matrix $blockField */
             $fields = $blockField->getBlockTypeFields();
             // Filter out any non-CantoDamAsset fields
             $fields = (new Collection($fields))->filter(fn($value) => $value instanceof CantoDamAsset)->toArray();
@@ -184,4 +181,15 @@ protected function updateContent(string $value, CantoFieldData $cantoFieldData,
             }
         }
     }
+
+    /**
+     * Block type fields  have the same methods as Matrix
+     *
+     * @param string $fieldType
+     * @return Matrix[]
+     */
+    private function getBlockFields(string $fieldType): array
+    {
+        return Craft::$app->getFields()->getFieldsByType($fieldType);
+    }
 }