Merge pull request #214 from spatie/update-dependencies

Update composer dependencies, require PHP 8.3+

Author: alies-dev

.github/workflows/run-tests.yml

@@ -24,7 +24,7 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest]
-        php: [8.1, 8.2, 8.3]
+        php: [8.3, 8.4, 8.5]
         dependency-version: [prefer-lowest, prefer-stable]
 
     name: P${{ matrix.php }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}

composer.json

@@ -16,13 +16,13 @@
     ],
     "homepage": "https://github.com/spatie/calendar-links",
     "require": {
-        "php": "^8.1"
+        "php": "^8.3"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^3.49",
-        "phpunit/phpunit": "^10.5",
-        "spatie/phpunit-snapshot-assertions": "^5.1",
-        "vimeo/psalm": "^5.22"
+        "friendsofphp/php-cs-fixer": "^3.93",
+        "phpunit/phpunit": "^12.5 || ^13.0",
+        "spatie/phpunit-snapshot-assertions": "^5.3",
+        "vimeo/psalm": "^6.15"
     },
     "autoload": {
         "psr-4": {

src/Exceptions/InvalidLink.php

@@ -7,9 +7,10 @@
 use DateTimeInterface;
 use InvalidArgumentException;
 
+/** @api */
 class InvalidLink extends InvalidArgumentException
 {
-    private const DATETIME_FORMAT = 'Y-m-d H:i:s';
+    private const string DATETIME_FORMAT = 'Y-m-d H:i:s';
 
     public static function negativeDateRange(DateTimeInterface $from, DateTimeInterface $to): self
     {

src/Generators/BaseOutlook.php

@@ -15,10 +15,10 @@
 abstract class BaseOutlook implements Generator
 {
     /** @see https://www.php.net/manual/en/function.date.php */
-    private const DATE_FORMAT = 'Y-m-d';
+    private const string DATE_FORMAT = 'Y-m-d';
 
     /** @see https://www.php.net/manual/en/function.date.php */
-    private const DATETIME_FORMAT = 'Y-m-d\TH:i:s\Z';
+    private const string DATETIME_FORMAT = 'Y-m-d\TH:i:s\Z';
 
     /** @psalm-var OutlookUrlParameters */
     protected array $urlParameters = [];
@@ -36,6 +36,7 @@ public function __construct(array $urlParameters = [])
     }
 
     /** @inheritDoc */
+    #[\Override]
     public function generate(Link $link): string
     {
         $url = $this->baseUrl();

src/Generators/Google.php

@@ -8,16 +8,17 @@
 use Spatie\CalendarLinks\Link;
 
 /**
+ * @api
  * @see https://github.com/InteractionDesignFoundation/add-event-to-calendar-docs/blob/main/services/google.md
  * @psalm-type GoogleUrlParameters = array<string, scalar|null>
  */
 class Google implements Generator
 {
     /** @see https://www.php.net/manual/en/function.date.php */
-    private const DATE_FORMAT = 'Ymd';
+    private const string DATE_FORMAT = 'Ymd';
 
     /** @see https://www.php.net/manual/en/function.date.php */
-    private const DATETIME_FORMAT = 'Ymd\THis';
+    private const string DATETIME_FORMAT = 'Ymd\THis';
 
     /** @psalm-var GoogleUrlParameters */
     protected array $urlParameters = [];
@@ -29,9 +30,10 @@ public function __construct(array $urlParameters = [])
     }
 
     /** @var non-empty-string */
-    protected const BASE_URL = 'https://calendar.google.com/calendar/render?action=TEMPLATE';
+    protected const string BASE_URL = 'https://calendar.google.com/calendar/render?action=TEMPLATE';
 
     /** @inheritDoc */
+    #[\Override]
     public function generate(Link $link): string
     {
         $url = self::BASE_URL;

src/Generators/Ics.php

@@ -8,14 +8,15 @@
 use Spatie\CalendarLinks\Link;
 
 /**
+ * @api
  * @see https://icalendar.org/RFC-Specifications/iCalendar-RFC-5545/
  * @psalm-type IcsOptions = array{UID?: string, URL?: string, PRODID?: string, REMINDER?: array{DESCRIPTION?: string, TIME?: \DateTimeInterface}}
  * @psalm-type IcsPresentationOptions = array{format?: self::FORMAT_*}
  */
 class Ics implements Generator
 {
-    public const FORMAT_HTML = 'html';
-    public const FORMAT_FILE = 'file';
+    public const string FORMAT_HTML = 'html';
+    public const string FORMAT_FILE = 'file';
 
     /** @see https://www.php.net/manual/en/function.date.php */
     protected string $dateFormat = 'Ymd';
@@ -39,6 +40,7 @@ public function __construct(array $options = [], array $presentationOptions = []
     }
 
     /** @inheritDoc */
+    #[\Override]
     public function generate(Link $link): string
     {
         $url = [
@@ -56,7 +58,7 @@ public function generate(Link $link): string
         if ($link->allDay) {
             $url[] = 'DTSTAMP:'.gmdate($this->dateTimeFormat, $link->from->getTimestamp());
             $url[] = 'DTSTART;VALUE=DATE:'.$link->from->format($dateTimeFormat);
-            $url[] = 'DURATION:P'.(max(1, $link->from->diff($link->to)->days)).'D';
+            $url[] = 'DURATION:P'.(max(1, (int) $link->from->diff($link->to)->days)).'D';
         } else {
             $url[] = 'DTSTAMP:'.gmdate($dateTimeFormat, $link->from->getTimestamp());
             $url[] = 'DTSTART:'.gmdate($dateTimeFormat, $link->from->getTimestamp());

src/Generators/WebOffice.php

@@ -10,6 +10,7 @@ final class WebOffice extends BaseOutlook
     private const BASE_URL = 'https://outlook.office.com/calendar/deeplink/compose?path=/calendar/action/compose&rru=addevent';
 
     /** @inheritDoc */
+    #[\Override]
     protected function baseUrl(): string
     {
         return static::BASE_URL;

src/Generators/WebOutlook.php

@@ -10,6 +10,7 @@ final class WebOutlook extends BaseOutlook
     private const BASE_URL = 'https://outlook.live.com/calendar/action/compose?path=/calendar/action/compose&rru=addevent';
 
     /** @inheritDoc */
+    #[\Override]
     protected function baseUrl(): string
     {
         return static::BASE_URL;

src/Generators/Yahoo.php

@@ -9,21 +9,21 @@
 use Spatie\CalendarLinks\Link;
 
 /**
+ * @api
  * @see https://github.com/InteractionDesignFoundation/add-event-to-calendar-docs/blob/main/services/yahoo.md
  * @psalm-type YahooUrlParameters = array<string, scalar|null>
  */
 class Yahoo implements Generator
 {
     /** @see https://www.php.net/manual/en/function.date.php */
-    private const DATE_FORMAT = 'Ymd';
+    private const string DATE_FORMAT = 'Ymd';
 
     /** @see https://www.php.net/manual/en/function.date.php */
-    private const DATETIME_FORMAT = 'Ymd\THis\Z';
+    private const string DATETIME_FORMAT = 'Ymd\THis\Z';
 
     /** @var non-empty-string */
-    protected const BASE_URL = 'https://calendar.yahoo.com/?v=60&view=d&type=20';
+    protected const string BASE_URL = 'https://calendar.yahoo.com/?v=60&view=d&type=20';
 
-    /** @inheritDoc */
     /** @psalm-var YahooUrlParameters */
     protected array $urlParameters = [];
 
@@ -34,6 +34,7 @@ public function __construct(array $urlParameters = [])
     }
 
     /** {@inheritDoc} */
+    #[\Override]
     public function generate(Link $link): string
     {
         $url = self::BASE_URL;

src/Link.php

@@ -12,6 +12,7 @@
 use Spatie\CalendarLinks\Generators\Yahoo;
 
 /**
+ * @api
  * @psalm-import-type IcsOptions from \Spatie\CalendarLinks\Generators\Ics
  * @psalm-import-type GoogleUrlParameters from \Spatie\CalendarLinks\Generators\Google
  * @psalm-import-type YahooUrlParameters from \Spatie\CalendarLinks\Generators\Yahoo