Merge pull request #561 from ampproject/fix/php85

Author: swissspidy

.github/workflows/sync-local-fallback-files.yml

@@ -2,7 +2,7 @@ name: Sync runtime local fallback files
 on:
   schedule:
     # https://crontab.guru/once-a-week
-    - cron: 0 0 * * 0
+    - cron: 0 12 * */1 1
 
 jobs:
   sync-local-fallback-files:
@@ -92,5 +92,5 @@ jobs:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           pr_title: Sync local fallback files
           pr_body: ${{ steps.body.outputs.text }}
-          pr_reviewer: schlessera
+          pr_reviewer: swissspidy
           pr_label: SSR

.github/workflows/sync-spec-test-suite.yml

@@ -2,7 +2,7 @@ name: Sync spec test suite from NodeJS toolbox
 on:
   schedule:
     # https://crontab.guru/every-night-at-midnight
-    - cron: 0 0 * * *
+    - cron: 0 12 * */1 1
 
 jobs:
   sync-spec-test-suite:
@@ -92,5 +92,5 @@ jobs:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           pr_title: Sync spec test suite
           pr_body: ${{ steps.body.outputs.text }}
-          pr_reviewer: schlessera
+          pr_reviewer: swissspidy
           pr_label: Testing

src/Dom/Document/Filter/NormalizeHtmlEntities.php

@@ -92,6 +92,6 @@ protected function hasHtmlEntities($html)
     {
         // TODO: Discuss other popular entities to look for, especially for languages
         // with different punctuation symbols.
-        return preg_match('/,|.|!|?/', $html);
+        return 1 === preg_match('/,|.|!|?/', $html);
     }
 }

src/FakeEnum.php

@@ -106,6 +106,25 @@ public function __wakeup()
         }
     }
 
+    /**
+     * This method exists only for the compatibility reason when deserializing a previously serialized version
+     * that didn't have the key property.
+     *
+     * @param array $data Data to unserialize from.
+     * @psalm-param array $data
+     */
+    public function __unserialize(array $data): void
+    {
+        /** @psalm-suppress DocblockTypeContradiction key can be null when deserializing an enum without the key */
+        if ($this->key === null) {
+            /**
+             * @psalm-suppress InaccessibleProperty key is not readonly as marked by psalm
+             * @psalm-suppress PossiblyFalsePropertyAssignmentValue deserializing a case that was removed
+             */
+            $this->key = static::search($this->value);
+        }
+    }
+
     /**
      * Create a new enum instance from a value.
      *

src/Optimizer/Transformer/AmpRuntimePreloads.php

@@ -37,7 +37,7 @@ public function transform(Document $document, ErrorCollection $errors)
      * Check whether the AMP runtime script is needed.
      *
      * @param Document $document Document to check in.
-     * @return bool Whether the AMP runtime script is needed.
+     * @return false Whether the AMP runtime script is needed.
      */
     private function isAmpRuntimeScriptNeeded(Document $document)
     {

src/Optimizer/Transformer/ReorderHead.php

@@ -345,7 +345,7 @@ private function containsWord($haystack, $needle)
             return false;
         }
 
-        return preg_match('/(^|\s)' . preg_quote($needle, '/') . '(\s|$)/i', $haystack);
+        return 1 === preg_match('/(^|\s)' . preg_quote($needle, '/') . '(\s|$)/i', $haystack);
     }
 
     /**