refactor: Clean up types

nystudio107 · Jul 19, 2024 · 7276fb1 · 7276fb1
1 parent 47d6af5
commit 7276fb1
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 12 deletions.
diff --git a/src/helpers/Sitemap.php b/src/helpers/Sitemap.php
@@ -446,11 +446,11 @@ public static function generateSitemap(array $params): ?string
     /**
      * Return the total number of elements in a sitemap, respecting metabundle settings.
      *
-     * @param SeoElementInterface $seoElementClass
+     * @param class-string<SeoElementInterface> $seoElementClass
      * @param MetaBundle $metaBundle
      * @return int|null
      */
-    public static function getTotalElementsInSitemap(SeoElementInterface $seoElementClass, MetaBundle $metaBundle)
+    public static function getTotalElementsInSitemap(string $seoElementClass, MetaBundle $metaBundle)
     {
         $totalElements = $seoElementClass::sitemapElementsQuery($metaBundle)->count();
 

diff --git a/src/seoelements/SeoCampaign.php b/src/seoelements/SeoCampaign.php
@@ -448,7 +448,6 @@ public static function createContentMetaBundle(Model $sourceModel)
         /** @var Site $site */
         foreach ($sites as $site) {
             $seoElement = self::class;
-            /** @var SeoElementInterface $seoElement */
             Seomatic::$plugin->metaBundles->createMetaBundleFromSeoElement($seoElement, $sourceModel, $site->id);
         }
     }

diff --git a/src/seoelements/SeoCategory.php b/src/seoelements/SeoCategory.php
@@ -437,7 +437,6 @@ public static function createContentMetaBundle(Model $sourceModel)
         /** @var Site $site */
         foreach ($sites as $site) {
             $seoElement = self::class;
-            /** @var SeoElementInterface $seoElement */
             Seomatic::$plugin->metaBundles->createMetaBundleFromSeoElement($seoElement, $sourceModel, $site->id);
         }
     }

diff --git a/src/seoelements/SeoDigitalProduct.php b/src/seoelements/SeoDigitalProduct.php
@@ -445,7 +445,6 @@ public static function createContentMetaBundle(Model $sourceModel)
         /** @var Site $site */
         foreach ($sites as $site) {
             $seoElement = self::class;
-            /** @var SeoElementInterface $seoElement */
             Seomatic::$plugin->metaBundles->createMetaBundleFromSeoElement($seoElement, $sourceModel, $site->id);
         }
     }

diff --git a/src/seoelements/SeoEntry.php b/src/seoelements/SeoEntry.php
@@ -453,7 +453,6 @@ public static function createContentMetaBundle(Model $sourceModel)
         /** @var Site $site */
         foreach ($sites as $site) {
             $seoElement = self::class;
-            /** @var SeoElementInterface $seoElement */
             Seomatic::$plugin->metaBundles->createMetaBundleFromSeoElement($seoElement, $sourceModel, $site->id);
         }
     }

diff --git a/src/seoelements/SeoEvent.php b/src/seoelements/SeoEvent.php
@@ -212,7 +212,6 @@ public static function createContentMetaBundle(Model $sourceModel)
         /** @var Site $site */
         foreach ($sites as $site) {
             $seoElement = self::class;
-            /** @var SeoElementInterface $seoElement */
             Seomatic::$plugin->metaBundles->createMetaBundleFromSeoElement($seoElement, $sourceModel, $site->id);
         }
     }

diff --git a/src/seoelements/SeoProduct.php b/src/seoelements/SeoProduct.php
@@ -445,7 +445,6 @@ public static function createContentMetaBundle(Model $sourceModel)
         /** @var Site $site */
         foreach ($sites as $site) {
             $seoElement = self::class;
-            /** @var SeoElementInterface $seoElement */
             Seomatic::$plugin->metaBundles->createMetaBundleFromSeoElement($seoElement, $sourceModel, $site->id);
         }
     }

diff --git a/src/services/MetaBundles.php b/src/services/MetaBundles.php
@@ -336,7 +336,7 @@ public function updateMetaBundle(MetaBundle $metaBundle, int $siteId)
     }
 
     /**
-     * @param SeoElementInterface $seoElement
+     * @param class-string<SeoElementInterface> $seoElement
      * @param Model $sourceModel
      * @param int $sourceSiteId
      * @param MetaBundle|null $baseConfig

diff --git a/src/services/SeoElements.php b/src/services/SeoElements.php
@@ -79,14 +79,13 @@ class SeoElements extends Component
     /**
      * @param null|string $metaBundleType
      *
-     * @return SeoElementInterface|null
+     * @return class-string<SeoElementInterface>|null
      */
     public function getSeoElementByMetaBundleType($metaBundleType)
     {
         if ($metaBundleType === null) {
             return null;
         }
-        /** @var SeoElementInterface[] $seoElements */
         $seoElements = $this->getAllSeoElementTypes();
 
         return $seoElements[$metaBundleType] ?? null;
@@ -95,7 +94,7 @@ public function getSeoElementByMetaBundleType($metaBundleType)
     /**
      * Returns all available field type classes.
      *
-     * @return string[] The available field type classes
+     * @return class-string<SeoElementInterface>[] The available field type classes
      */
     public function getAllSeoElementTypes(bool $useCache = true): array
     {