Merge pull request #556 from ampproject/chore/maintenance

swissspidy · web-flow · commit a64119819ec8 · 2025-09-09T15:59:22.000+02:00
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,9 +1,18 @@
 version: 2
 updates:
 - package-ecosystem: composer
-  directory: "/"
+  directory: '/'
   schedule:
-    interval: daily
-    time: "12:00"
-    timezone: America/Los_Angeles
+    interval: monthly
   open-pull-requests-limit: 10
+- package-ecosystem: github-actions
+  directory: '/'
+  schedule:
+    interval: monthly
+  open-pull-requests-limit: 10
+  labels:
+    - Dependencies
+  groups:
+    github-actions:
+      patterns:
+        - '*'
diff --git a/.github/workflows/sync-local-fallback-files.yml b/.github/workflows/sync-local-fallback-files.yml
@@ -26,7 +26,7 @@ jobs:
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
       - name: Configure Composer cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
diff --git a/.github/workflows/sync-spec-test-suite.yml b/.github/workflows/sync-spec-test-suite.yml
@@ -26,7 +26,7 @@ jobs:
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
       - name: Configure Composer cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -16,11 +16,11 @@ jobs:
         coverage: [false]
         random: [false]
         include:
-          - php: '8.2'
+          - php: '8.4'
             coverage: true
-          - php: '8.2'
-            random: true
           - php: '8.4'
+            random: true
+          - php: '8.5'
             experimental: true
 
     steps:
@@ -41,7 +41,7 @@ jobs:
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
       - name: Configure Composer cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -98,7 +98,7 @@ jobs:
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
       - name: Configure Composer cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -137,7 +137,7 @@ jobs:
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
       - name: Configure Composer cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
diff --git a/composer.json b/composer.json
@@ -13,7 +13,7 @@
   },
   "require-dev": {
     "ext-zip": "*",
-    "civicrm/composer-downloads-plugin": "^2.1 || ^3.0",
+    "civicrm/composer-downloads-plugin": "^4.0",
     "dealerdirect/phpcodesniffer-composer-installer": "^0.7.1 || ^1.0.0",
     "mikey179/vfsstream": "^1.6",
     "php-parallel-lint/php-parallel-lint": "^1.2",
@@ -22,7 +22,7 @@
     "roave/security-advisories": "dev-master",
     "sirbrillig/phpcs-variable-analysis": "^2.11.2",
     "squizlabs/php_codesniffer": "^3",
-    "wp-coding-standards/wpcs": "^2.3",
+    "wp-coding-standards/wpcs": "^3.2",
     "yoast/phpunit-polyfills": "^0.2.0 || ^1.0.0"
   },
   "suggest": {
@@ -81,8 +81,8 @@
     "sync-fallback-files":  "bin/sync-amp-runtime-local-fallback-resources.php",
     "sync-test-specs":  "rm -rf tests/spec && bin/sync-amp-toolbox-test-suite.php",
     "sync": [
-      "sync-fallback-files",
-      "sync-test-specs"
+      "@sync-fallback-files",
+      "@sync-test-specs"
     ]
   }
 }
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -4,15 +4,13 @@ includes:
 parameters:
 	level: 5
 	inferPrivatePropertyTypeFromConstructor: true
+	treatPhpDocTypesAsCertain: false
 	paths:
 		- include/
 		- src/
 	ignoreErrors:
 		- '#^PHPDoc tag @throws with type AmpProject\\Exception\\FailedRemoteRequest is not subtype of Throwable$#'
 		- '#^Parameter \#1 (\$exception_handler|\$callback) of function set_exception_handler expects#'
-
-		# @see https://github.com/phpstan/phpstan/issues/5655
-		- '#^PHPDoc tag @var for constant (?:.*) with type array(?:.*) is not subtype of value array(?:.*)\.$#'
 	excludePaths:
 		analyse:
 			- src/FakeEnum.php
@@ -22,3 +20,4 @@ parameters:
 			- src/Validator/ValidationErrorCollection.php
 			- src/Validator/ValidationHandler.php
 			- src/Validator/ValidatorRules.php
+			- src/Validator/Spec
diff --git a/resources/local_fallback/rtv/metadata b/resources/local_fallback/rtv/metadata
diff --git a/src/Cli/AmpExecutable.php b/src/Cli/AmpExecutable.php
@@ -38,6 +38,7 @@ protected function setup(Options $options)
     {
         foreach (self::COMMAND_CLASSES as $commandClass) {
             /** @var Command $command */
+            // @phpstan-ignore varTag.nativeType
             $command = new $commandClass($this);
 
             $command->register($options);
diff --git a/src/Cli/Options.php b/src/Cli/Options.php
@@ -542,8 +542,6 @@ private function readPHPArgv()
         }
 
         if (
-            is_array($_SERVER)
-            &&
             array_key_exists('argv', $_SERVER)
             &&
             is_array($_SERVER['argv'])
diff --git a/src/CssLength.php b/src/CssLength.php
@@ -111,7 +111,7 @@ public function validate($allowAuto, $allowFluid)
         $pattern = '/^(?<numeral>\d+(?:\.\d+)?)(?<unit>px|em|rem|vh|vw|vmin|vmax)?$/';
         if (preg_match($pattern, $this->attrValue, $match)) {
             $this->isValid = true;
-            $this->numeral = isset($match['numeral']) ? (float)$match['numeral'] : $this->numeral;
+            $this->numeral = (float)$match['numeral'];
             $this->unit    = $match['unit'] ?? $this->unit;
         }
     }
diff --git a/src/Dom/Document.php b/src/Dom/Document.php
@@ -434,11 +434,7 @@ public function saveHTMLFragment(?DOMNode $node = null)
             }
         }
 
-        if (null === $node || PHP_VERSION_ID >= 70300) {
-            $html = parent::saveHTML($node);
-        } else {
-            $html = $this->extractNodeViaFragmentBoundaries($node);
-        }
+        $html = parent::saveHTML($node);
 
         foreach ($filtersInReverse as $filter) {
             if ($filter instanceof AfterSaveFilter) {
@@ -474,43 +470,6 @@ private function insertMissingCharset()
         $this->head->insertBefore($charset, $this->head->firstChild);
     }
 
-    /**
-     * Extract a node's HTML via fragment boundaries.
-     *
-     * Temporarily adds fragment boundary comments in order to locate the desired node to extract from
-     * the given HTML document. This is required because libxml seems to only preserve whitespace when
-     * serializing when calling DOMDocument::saveHTML() on the entire document. If you pass the element
-     * to DOMDocument::saveHTML() then formatting whitespace gets added unexpectedly. This is seen to
-     * be fixed in PHP 7.3, but for older versions of PHP the following workaround is needed.
-     *
-     * @param DOMNode $node Node to extract the HTML for.
-     * @return string Extracted HTML string.
-     */
-    private function extractNodeViaFragmentBoundaries(DOMNode $node)
-    {
-        $boundary      = $this->uniqueIdManager->getUniqueId('fragment_boundary');
-        $startBoundary = $boundary . ':start';
-        $endBoundary   = $boundary . ':end';
-        $commentStart  = $this->createComment($startBoundary);
-        $commentEnd    = $this->createComment($endBoundary);
-
-        $node->parentNode->insertBefore($commentStart, $node);
-        $node->parentNode->insertBefore($commentEnd, $node->nextSibling);
-
-        $pattern = '/^.*?'
-                   . preg_quote("<!--{$startBoundary}-->", '/')
-                   . '(.*)'
-                   . preg_quote("<!--{$endBoundary}-->", '/')
-                   . '.*?\s*$/s';
-
-        $html = preg_replace($pattern, '$1', parent::saveHTML());
-
-        $node->parentNode->removeChild($commentStart);
-        $node->parentNode->removeChild($commentEnd);
-
-        return $html;
-    }
-
     /**
      * Normalize the document structure.
      *
@@ -1144,16 +1103,10 @@ private function instantiateFilter($filterClass)
         foreach ($parameters as $parameter) {
             $dependencyType = null;
 
-            // The use of `ReflectionParameter::getClass()` is deprecated in PHP 8, and is superseded
-            // by `ReflectionParameter::getType()`. See https://github.com/php/php-src/pull/5209.
-            if (PHP_VERSION_ID >= 70100) {
-                if ($parameter->getType()) {
-                    /** @var ReflectionNamedType $returnType */
-                    $returnType = $parameter->getType();
-                    $dependencyType = new ReflectionClass($returnType->getName());
-                }
-            } else {
-                $dependencyType = $parameter->getClass();
+            if ($parameter->getType()) {
+                /** @var ReflectionNamedType $returnType */
+                $returnType = $parameter->getType();
+                $dependencyType = new ReflectionClass($returnType->getName());
             }
 
             if ($dependencyType === null) {
diff --git a/src/Dom/Document/Filter/MustacheScriptTemplates.php b/src/Dom/Document/Filter/MustacheScriptTemplates.php
@@ -127,6 +127,8 @@ static function ($matches) use ($mustacheTagPlaceholders) {
                     // entities. In the case of a URL value like '/foo/?bar=1&baz=2' the result is a warning for an
                     // unterminated entity reference "baz". When the attribute value is updated via setAttribute() this
                     // same problem does not occur, so that is why the following is used.
+
+                    // @phpstan-ignore method.notFound
                     $attribute->parentNode->setAttribute($attribute->nodeName, $value);
 
                     $this->mustacheTagsReplaced = true;
diff --git a/src/Dom/Element.php b/src/Dom/Element.php
@@ -77,7 +77,7 @@ public function addInlineStyle($style, $prepend = false)
      * @return DOMAttr|false The new or modified DOMAttr or false if an error occurred.
      * @throws MaxCssByteCountExceeded If the allowed max byte count is exceeded.
      */
-    public function setAttribute($name, $value)
+    public function setAttribute($name, $value) // @phpstan-ignore return.unusedType
     {
         // Make sure $value is always a string and not null.
         $value = strval($value);
@@ -191,7 +191,7 @@ public static function mergeAmpActions($first, $second)
             $matches = [];
             $results = preg_match_all(self::AMP_EVENT_ACTIONS_REGEX_PATTERN, $eventActionString, $matches);
 
-            if (! $results || ! isset($matches['event'])) {
+            if (! $results) {
                 continue;
             }
 
@@ -209,7 +209,7 @@ static function ($actions) use (&$actionsArray) {
                     $matches = [];
                     $results = preg_match_all(self::AMP_ACTION_REGEX_PATTERN, $actions, $matches);
 
-                    if (! $results || ! isset($matches['action'])) {
+                    if (! $results) {
                         $actionsArray[] = $actions;
                         return;
                     }
diff --git a/src/Html/Parser/ParsedTag.php b/src/Html/Parser/ParsedTag.php
@@ -77,13 +77,6 @@ public function __construct($tagName, $alternatingAttributes = [])
 
         // Sort the attribute array by (lower case) name.
         usort($this->attributes, function (ParsedAttribute $a, ParsedAttribute $b) {
-            if (PHP_MAJOR_VERSION < 7 && $a->name() === $b->name()) {
-                // Hack required for PHP 5.6, as it does not maintain stable order for equal items.
-                // See https://bugs.php.net/bug.php?id=69158.
-                // To get around this, we compare the index within $this->attributes instead to maintain existing order.
-                return strcmp(array_search($a, $this->attributes, true), array_search($b, $this->attributes, true));
-            }
-
             return strcmp($a->name(), $b->name());
         });
 
diff --git a/src/Optimizer/ImageDimensions.php b/src/Optimizer/ImageDimensions.php
@@ -47,14 +47,14 @@ final class ImageDimensions
     /**
      * Unit of the width of the image.
      *
-     * @var int|float|string|null
+     * @var string|null
      */
     private $widthUnit;
 
     /**
      * Unit of the height of the image.
      *
-     * @var int|float|string|null
+     * @var string|null
      */
     private $heightUnit;
 
diff --git a/src/Optimizer/TransformationEngine.php b/src/Optimizer/TransformationEngine.php
@@ -127,16 +127,10 @@ private function getTransformerDependencies($transformerClass)
         foreach ($constructor->getParameters() as $parameter) {
             $dependencyType = null;
 
-            // The use of `ReflectionParameter::getClass()` is deprecated in PHP 8, and is superseded
-            // by `ReflectionParameter::getType()`. See https://github.com/php/php-src/pull/5209.
-            if (PHP_VERSION_ID >= 70100) {
-                if ($parameter->getType()) {
-                    /** @var \ReflectionNamedType $returnType */
-                    $returnType = $parameter->getType();
-                    $dependencyType = new ReflectionClass($returnType->getName());
-                }
-            } else {
-                $dependencyType = $parameter->getClass();
+            if ($parameter->getType()) {
+                /** @var \ReflectionNamedType $returnType */
+                $returnType = $parameter->getType();
+                $dependencyType = new ReflectionClass($returnType->getName());
             }
 
             if ($dependencyType === null) {
diff --git a/src/Optimizer/Transformer/OptimizeViewport.php b/src/Optimizer/Transformer/OptimizeViewport.php
@@ -82,6 +82,7 @@ public function transform(Document $document, ErrorCollection $errors)
             // Merge one or more meta[name=viewport] tags into one.
             $parsedRules = [];
 
+            /** @var \DOMElement $metaTag */
             foreach ($metaTags as $metaTag) {
                 $propertyPairs = explode(',', $metaTag->getAttribute('content'));
 
diff --git a/src/RemoteRequest/CurlRemoteGetRequest.php b/src/RemoteRequest/CurlRemoteGetRequest.php
@@ -136,7 +136,9 @@ static function ($curl, $header) use (&$headers) {
             $status = curl_getinfo($curlHandle, CURLINFO_HTTP_CODE);
 
             $curlErrno = curl_errno($curlHandle);
-            curl_close($curlHandle);
+            if (PHP_VERSION_ID < 80000) {
+                curl_close($curlHandle);
+            }
 
             if ($body === false || $status < 200 || $status >= 300) {
                 if (! $retriesLeft || in_array($curlErrno, self::RETRYABLE_ERROR_CODES, true) === false) {
diff --git a/src/RemoteRequest/TemporaryFileCachedRemoteGetRequest.php b/src/RemoteRequest/TemporaryFileCachedRemoteGetRequest.php
@@ -86,12 +86,7 @@ public function get($url, $headers = [])
 
         // phpcs:disable PHPCompatibility.FunctionUse.NewFunctionParameters.unserialize_optionsFound
         if ($cachedResponse !== false) {
-            if (PHP_MAJOR_VERSION >= 7) {
-                $cachedResponse = unserialize($cachedResponse, [RemoteGetRequestResponse::class]);
-            } else {
-                // PHP 5.6 does not provide the second $options argument yet.
-                $cachedResponse = unserialize($cachedResponse);
-            }
+            $cachedResponse = unserialize($cachedResponse, [RemoteGetRequestResponse::class]);
         }
         // phpcs:enable PHPCompatibility.FunctionUse.NewFunctionParameters.unserialize_optionsFound
 
diff --git a/src/Validator/ValidationErrorCollection.php b/src/Validator/ValidationErrorCollection.php
diff --git a/src/Validator/ValidationSeverity.php b/src/Validator/ValidationSeverity.php
diff --git a/src/Validator/ValidationStatus.php b/src/Validator/ValidationStatus.php
diff --git a/tests/Optimizer/SpecTest.php b/tests/Optimizer/SpecTest.php
diff --git a/tests/Optimizer/TransformationEngineTest.php b/tests/Optimizer/TransformationEngineTest.php
diff --git a/tests/spec/transformers/valid/RewriteAmpUrls/adds_lts_ampjs/expected_output.html b/tests/spec/transformers/valid/RewriteAmpUrls/adds_lts_ampjs/expected_output.html
diff --git a/tests/spec/transformers/valid/RewriteAmpUrls/adds_preloads_ampjs/expected_output.html b/tests/spec/transformers/valid/RewriteAmpUrls/adds_preloads_ampjs/expected_output.html
diff --git a/tests/src/PrivateAccess.php b/tests/src/PrivateAccess.php

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ protected function setup(Options $options)`
`38`	`38`	`{`
`39`	`39`	`foreach (self::COMMAND_CLASSES as $commandClass) {`
`40`	`40`	`/** @var Command $command */`
	`41`	`+ // @phpstan-ignore varTag.nativeType`
`41`	`42`	`$command = new $commandClass($this);`
`42`	`43`
`43`	`44`	`$command->register($options);`
Original file line number	Diff line number	Diff line change
`@@ -542,8 +542,6 @@ private function readPHPArgv()`
`542`	`542`	`}`
`543`	`543`
`544`	`544`	`if (`
`545`		`- is_array($_SERVER)`
`546`		`- &&`
`547`	`545`	`array_key_exists('argv', $_SERVER)`
`548`	`546`	`&&`
`549`	`547`	`is_array($_SERVER['argv'])`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ public function validate($allowAuto, $allowFluid)`
`111`	`111`	`$pattern = '/^(?<numeral>\d+(?:\.\d+)?)(?<unit>px\|em\|rem\|vh\|vw\|vmin\|vmax)?$/';`
`112`	`112`	`if (preg_match($pattern, $this->attrValue, $match)) {`
`113`	`113`	`$this->isValid = true;`
`114`		`- $this->numeral = isset($match['numeral']) ? (float)$match['numeral'] : $this->numeral;`
	`114`	`+ $this->numeral = (float)$match['numeral'];`
`115`	`115`	`$this->unit = $match['unit'] ?? $this->unit;`
`116`	`116`	`}`
`117`	`117`	`}`