Merge branch 'release/v0.15.6'

decodelabs · Sep 6, 2024 · 17ae2b1 · 17ae2b1
2 parents abec815 + 6e7f9d0
commit 17ae2b1
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## v0.15.6 (2024-09-06)
+* Updated Cosmos extension intefaces
+* Added @phpstan-require-implements constraints
+
 ## v0.15.5 (2024-08-21)
 * Converted consts to protected PascalCase
 * Updated Veneer dependency and Stub

diff --git a/composer.json b/composer.json
@@ -15,7 +15,7 @@
 
         "decodelabs/coercion": "^0.2",
         "decodelabs/collections": "^0.9",
-        "decodelabs/cosmos": "^0.1.2",
+        "decodelabs/cosmos": "^0.2",
         "decodelabs/elementary": "^0.4",
         "decodelabs/exceptional": "^0.4",
         "decodelabs/glitch-support": "^0.4",
@@ -41,5 +41,10 @@
         }
     },
     "repositories": {
+    },
+    "config": {
+        "allow-plugins": {
+            "phpstan/extension-installer": true
+        }
     }
 }
diff --git a/src/AssetTrait.php b/src/AssetTrait.php
@@ -11,6 +11,9 @@
 
 use DecodeLabs\Collections\AttributeContainerTrait;
 
+/**
+ * @phpstan-require-implements Asset
+ */
 trait AssetTrait
 {
     use AttributeContainerTrait;

diff --git a/src/Embed/MediaTrait.php b/src/Embed/MediaTrait.php
@@ -12,6 +12,9 @@
 use DecodeLabs\Coercion;
 use DecodeLabs\Exceptional;
 
+/**
+ * @phpstan-require-implements Media
+ */
 trait MediaTrait
 {
     //protected const UrlMap = [];

diff --git a/src/Plugins/Time.php b/src/Plugins/Time.php
@@ -10,15 +10,13 @@
 namespace DecodeLabs\Tagged\Plugins;
 
 use DateInterval;
-use DateTime;
+use DateTimeInterface;
 use DateTimeZone;
-
 use DecodeLabs\Cosmos\Extension\Time as TimePlugin;
 use DecodeLabs\Cosmos\Extension\TimeTrait as TimePluginTrait;
 use DecodeLabs\Cosmos\Locale;
 use DecodeLabs\Tagged\Element;
 use DecodeLabs\Tagged\Factory;
-
 use Stringable;
 
 /**
@@ -46,7 +44,7 @@ public function __construct(
      * Custom format a date and wrap it
      */
     public function format(
-        DateTime|DateInterval|string|Stringable|int|null $date,
+        DateTimeInterface|DateInterval|string|Stringable|int|null $date,
         string $format,
         DateTimeZone|string|Stringable|bool|null $timezone = true
     ): ?Element {
@@ -55,7 +53,7 @@ public function format(
         }
 
         return $this->wrap(
-            $date->format($timezone === false ? 'Y-m-d' : DateTime::W3C),
+            $date->format($timezone === false ? 'Y-m-d' : DateTimeInterface::W3C),
             $date->format($format)
         );
     }
@@ -64,7 +62,7 @@ public function format(
      * Custom format a date and wrap it
      */
     public function formatDate(
-        DateTime|DateInterval|string|Stringable|int|null $date,
+        DateTimeInterface|DateInterval|string|Stringable|int|null $date,
         string $format
     ): ?Element {
         if (!$date = $this->prepare($date, false, true)) {
@@ -81,7 +79,7 @@ public function formatDate(
      * Custom locale format a date with ICU and wrap it
      */
     public function pattern(
-        DateTime|DateInterval|string|Stringable|int|null $date,
+        DateTimeInterface|DateInterval|string|Stringable|int|null $date,
         string $pattern,
         DateTimeZone|string|Stringable|bool|null $timezone = true,
         string|Locale|null $locale = null
@@ -93,7 +91,7 @@ public function pattern(
         }
 
         return $this->wrap(
-            $date->format($timezone === false ? 'Y-m-d' : DateTime::W3C),
+            $date->format($timezone === false ? 'Y-m-d' : DateTimeInterface::W3C),
             $output
         );
     }
@@ -102,7 +100,7 @@ public function pattern(
      * Format date according to locale
      */
     public function locale(
-        DateTime|DateInterval|string|Stringable|int|null $date,
+        DateTimeInterface|DateInterval|string|Stringable|int|null $date,
         string|int|bool|null $dateSize = true,
         string|int|bool|null $timeSize = true,
         DateTimeZone|string|Stringable|bool|null $timezone = true,
@@ -124,10 +122,9 @@ public function locale(
 
     /**
      * Format interval
-     * @param DateTime|DateInterval|string|Stringable|int|null $date
      */
     protected function formatNowInterval(
-        DateTime|DateInterval|string|Stringable|int|null $date,
+        DateTimeInterface|DateInterval|string|Stringable|int|null $date,
         bool $invert,
         ?int $parts,
         bool $short = false,
@@ -142,7 +139,7 @@ protected function formatNowInterval(
         }
 
         $output = $this->wrap(
-            $date->format(DateTime::W3C),
+            $date->format(DateTimeInterface::W3C),
             $output,
             $this->formatRawLocaleDate($date, true, true, true, $locale)
         );
@@ -172,8 +169,8 @@ protected function formatNowInterval(
      * Format interval until date
      */
     protected function formatBetweenInterval(
-        DateTime|DateInterval|string|Stringable|int|null $date1,
-        DateTime|DateInterval|string|Stringable|int|null $date2,
+        DateTimeInterface|DateInterval|string|Stringable|int|null $date1,
+        DateTimeInterface|DateInterval|string|Stringable|int|null $date2,
         ?int $parts = 1,
         bool $short = false,
         string|Locale|null $locale = null