Merge pull request #629 from phil-davis/update-20231109

Update CI stuff
sabre-io · Nov 9, 2023 · 9341286 · 9341286
2 parents e43d668 + 639475b
commit 9341286
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 26 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,7 +21,7 @@ jobs:
             code-analysis: 'yes'
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP, with composer and extensions
         uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php

diff --git a/composer.json b/composer.json
@@ -38,10 +38,10 @@
         "sabre/xml"    : "^3.0 || ^4.0"
     },
     "require-dev" : {
-        "friendsofphp/php-cs-fixer": "^3.14",
+        "friendsofphp/php-cs-fixer": "^3.38",
         "phpunit/phpunit" : "^9.6",
         "phpunit/php-invoker" : "^2.0 || ^3.1",
-        "phpstan/phpstan": "^1.9"
+        "phpstan/phpstan": "^1.10"
     },
     "suggest" : {
         "hoa/bench"       : "If you would like to run the benchmark scripts"

diff --git a/lib/Component/VCard.php b/lib/Component/VCard.php
@@ -272,17 +272,17 @@ public function validate(int $options = 0): array
                     }
                     $repaired = true;
 
-                    // Otherwise, the ORG property may work
+                // Otherwise, the ORG property may work
                 } elseif (isset($this->ORG)) {
                     $this->FN = (string) $this->ORG;
                     $repaired = true;
 
-                    // Otherwise, the NICKNAME property may work
+                // Otherwise, the NICKNAME property may work
                 } elseif (isset($this->NICKNAME)) {
                     $this->FN = (string) $this->NICKNAME;
                     $repaired = true;
 
-                    // Otherwise, the EMAIL property may work
+                // Otherwise, the EMAIL property may work
                 } elseif (isset($this->EMAIL)) {
                     $this->FN = (string) $this->EMAIL;
                     $repaired = true;

diff --git a/lib/Node.php b/lib/Node.php
@@ -92,8 +92,6 @@ public function destroy(): void
 
     /**
      * Returns the iterator for this object.
-     *
-     * @return ElementList
      */
     #[\ReturnTypeWillChange]
     public function getIterator(): ?ElementList

diff --git a/lib/Parser/MimeDir.php b/lib/Parser/MimeDir.php
@@ -265,8 +265,6 @@ protected function parseLine(string $line)
      *
      * This method strips any newlines and also takes care of unfolding.
      *
-     * @return string
-     *
      * @throws EofException|ParseException
      */
     protected function readLine(): ?string

diff --git a/lib/Property/VCard/DateAndOrTime.php b/lib/Property/VCard/DateAndOrTime.php
@@ -259,11 +259,11 @@ protected function xmlSerializeValue(Xml\Writer $writer): void
                 $value .= '---'.$r('date');
             }
 
-            // # 4.3.2
-            // value-time = element time {
-            //     xsd:string { pattern = "(\d\d(\d\d(\d\d)?)?|-\d\d(\d\d?)|--\d\d)"
-            //                          ~ "(Z|[+\-]\d\d(\d\d)?)?" }
-            //   }
+        // # 4.3.2
+        // value-time = element time {
+        //     xsd:string { pattern = "(\d\d(\d\d(\d\d)?)?|-\d\d(\d\d?)|--\d\d)"
+        //                          ~ "(Z|[+\-]\d\d(\d\d)?)?" }
+        //   }
         } elseif ((!$d('year') && !$d('month') && !$d('date'))
                   && ($d('hour') || $d('minute') || $d('second'))) {
             if ($d('hour')) {
@@ -276,11 +276,11 @@ protected function xmlSerializeValue(Xml\Writer $writer): void
 
             $value .= $r('timezone');
 
-            // # 4.3.3
-            // value-date-time = element date-time {
-            //     xsd:string { pattern = "(\d{8}|--\d{4}|---\d\d)T\d\d(\d\d(\d\d)?)?"
-            //                          ~ "(Z|[+\-]\d\d(\d\d)?)?" }
-            //   }
+        // # 4.3.3
+        // value-date-time = element date-time {
+        //     xsd:string { pattern = "(\d{8}|--\d{4}|---\d\d)T\d\d(\d\d(\d\d)?)?"
+        //                          ~ "(Z|[+\-]\d\d(\d\d)?)?" }
+        //   }
         } elseif ($d('date') && $d('hour')) {
             if ($d('year') && $d('month') && $d('date')) {
                 $value .= $r('year').$r('month').$r('date');

diff --git a/lib/Recur/EventIterator.php b/lib/Recur/EventIterator.php
@@ -191,8 +191,6 @@ public function __construct($input, string $uid = null, \DateTimeZone $timeZone
 
     /**
      * Returns the date for the current position of the iterator.
-     *
-     * @return \DateTimeImmutable
      */
     #[\ReturnTypeWillChange]
     public function current(): ?\DateTimeImmutable
@@ -207,8 +205,6 @@ public function current(): ?\DateTimeImmutable
     /**
      * This method returns the start date for the current iteration of the
      * event.
-     *
-     * @return \DateTimeImmutable
      */
     public function getDtStart(): ?\DateTimeImmutable
     {
@@ -223,8 +219,6 @@ public function getDtStart(): ?\DateTimeImmutable
      * This method returns the end date for the current iteration of the
      * event.
      *
-     * @return \DateTimeImmutable
-     *
      * @throws MaxInstancesExceededException|InvalidDataException
      */
     public function getDtEnd(): ?\DateTimeImmutable