update stan

cakephp · May 2, 2023 · 63c7745 · 63c7745
1 parent 7dadeeb
commit 63c7745
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 32 deletions.
diff --git a/.phive/phars.xml b/.phive/phars.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="phpstan" version="1.9.12" installed="1.9.12" location="./tools/phpstan" copy="false"/>
-  <phar name="psalm" version="5.4.0" installed="5.4.0" location="./tools/psalm" copy="false"/>
+  <phar name="phpstan" version="1.10.14" installed="1.10.14" location="./tools/phpstan" copy="false"/>
+  <phar name="psalm" version="5.10.0" installed="5.10.0" location="./tools/psalm" copy="false"/>
 </phive>
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="dev-master@">
+<files psalm-version="5.10.0@a5effd2d2dddd1a7ea7a0f6a051ce63ff979e356">
   <file src="src/Chronos.php">
-    <ImpureFunctionCall occurrences="4">
+    <ImpureFunctionCall>
       <code>array_filter</code>
       <code>date_default_timezone_get</code>
       <code>date_default_timezone_get</code>
       <code>iterator_to_array</code>
     </ImpureFunctionCall>
-    <ImpureMethodCall occurrences="42">
+    <ImpureMethodCall>
       <code>diffForHumans</code>
       <code>diffFormatter</code>
       <code>format</code>
@@ -51,7 +51,7 @@
       <code>tomorrow</code>
       <code>yesterday</code>
     </ImpureMethodCall>
-    <ImpureStaticProperty occurrences="13">
+    <ImpureStaticProperty>
       <code>static::$days</code>
       <code>static::$days</code>
       <code>static::$days</code>
@@ -66,15 +66,35 @@
       <code>static::$weekStartsAt</code>
       <code>static::$weekStartsAt</code>
     </ImpureStaticProperty>
-    <ImpureStaticVariable occurrences="1"/>
+    <ImpureStaticVariable>
+      <code><![CDATA[static $formats = [
+            'year' => 'Y',
+            'yearIso' => 'o',
+            'month' => 'n',
+            'day' => 'j',
+            'hour' => 'G',
+            'minute' => 'i',
+            'second' => 's',
+            'micro' => 'u',
+            'microsecond' => 'u',
+            'dayOfWeek' => 'N',
+            'dayOfYear' => 'z',
+            'weekOfYear' => 'W',
+            'daysInMonth' => 't',
+            'timestamp' => 'U',
+        ];]]></code>
+    </ImpureStaticVariable>
+    <InaccessibleProperty>
+      <code><![CDATA[$instance->f]]></code>
+    </InaccessibleProperty>
   </file>
   <file src="src/ChronosDate.php">
-    <ImpureFunctionCall occurrences="3">
+    <ImpureFunctionCall>
       <code>array_filter</code>
       <code>date_default_timezone_get</code>
       <code>iterator_to_array</code>
     </ImpureFunctionCall>
-    <ImpureMethodCall occurrences="24">
+    <ImpureMethodCall>
       <code>diffForHumans</code>
       <code>diffFormatter</code>
       <code>format</code>
@@ -100,7 +120,7 @@
       <code>tomorrow</code>
       <code>yesterday</code>
     </ImpureMethodCall>
-    <ImpureStaticProperty occurrences="9">
+    <ImpureStaticProperty>
       <code>static::$days</code>
       <code>static::$days</code>
       <code>static::$days</code>
@@ -111,10 +131,21 @@
       <code>static::$days</code>
       <code>static::$days</code>
     </ImpureStaticProperty>
-    <ImpureStaticVariable occurrences="1"/>
+    <ImpureStaticVariable>
+      <code><![CDATA[static $formats = [
+            'year' => 'Y',
+            'yearIso' => 'o',
+            'month' => 'n',
+            'day' => 'j',
+            'dayOfWeek' => 'N',
+            'dayOfYear' => 'z',
+            'weekOfYear' => 'W',
+            'daysInMonth' => 't',
+        ];]]></code>
+    </ImpureStaticVariable>
   </file>
   <file src="src/ChronosTime.php">
-    <ImpureMethodCall occurrences="6">
+    <ImpureMethodCall>
       <code>format</code>
       <code>mod</code>
       <code>mod</code>

diff --git a/psalm.xml b/psalm.xml
@@ -6,6 +6,9 @@
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
     errorBaseline="psalm-baseline.xml"
+    findUnusedPsalmSuppress="true"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="false"
 >
     <projectFiles>
         <directory name="src" />

diff --git a/src/Chronos.php b/src/Chronos.php
@@ -366,26 +366,6 @@ public static function hasRelativeKeywords(?string $time): bool
         return false;
     }
 
-    /**
-     * Determines if there is no fixed date in the time string.
-     *
-     * @param \Cake\Chronos\Chronos|\Cake\Chronos\ChronosDate|\DateTimeInterface|string|null $time The time string to check
-     * @return bool true if doesn't contain a fixed date
-     */
-    private static function isRelativeOnly(Chronos|ChronosDate|DateTimeInterface|string|null $time): bool
-    {
-        if ($time === null) {
-            return true;
-        }
-
-        if (!is_string($time)) {
-            return false;
-        }
-
-        // must not contain fixed date before relative keywords or time expression
-        return preg_match('/[0-9]{4}-[0-9]{1,2}-[0-9]{1,2}/', $time) !== 1;
-    }
-
     /**
      * Get weekend days
      *