Misc test fixes

.github/workflows/test.yml

@@ -5,9 +5,6 @@ jobs:
   unit-test:
     name: Unit test${{ matrix.coverage && ' (with coverage)' || '' }}${{ matrix.random && ' (in random order)' || '' }} / PHP ${{ matrix.php }}
     runs-on: ubuntu-latest
-    # We want to run on external PRs, but not on our own internal PRs as they'll be run
-    # by the push to the branch. This avoids running the workflows twice in such a case.
-    if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
     continue-on-error: ${{ matrix.experimental == true }}
     strategy:
       fail-fast: false

composer.json

@@ -66,7 +66,7 @@
   },
   "scripts": {
     "cbf": "phpcbf",
-    "compat": "if [ -z $TEST_SKIP_PHPCOMPAT ]; then phpcs --standard=PHPCompatibility -s -p src --runtime-set testVersion 5.6; fi",
+    "compat": "if [ -z $TEST_SKIP_PHPCOMPAT ]; then phpcs --standard=PHPCompatibility -s -p src --runtime-set testVersion 7.4; fi",
     "cs": "if [ -z $TEST_SKIP_PHPCS ]; then phpcs; fi",
     "lint": "if [ -z $TEST_SKIP_LINTING ]; then parallel-lint -j 10 --colors --exclude vendor .; fi",
     "test": [

src/Amp.php

@@ -49,6 +49,23 @@ final class Amp
      */
     const CACHE_HOST = 'https://cdn.ampproject.org';
 
+    /**
+     * Alternative host and scheme of the AMP cache.
+     *
+     * @var string
+     */
+    const CACHE_HOST_AMPJS = 'https://ampjs.org';
+
+    /**
+     * List of valid AMP cache hosts.
+     *
+     * @var string[]
+     */
+    const CACHE_HOSTS = [
+        self::CACHE_HOST,
+        self::CACHE_HOST_AMPJS,
+    ];
+
     /**
      * URL of the AMP cache.
      *
@@ -152,7 +169,15 @@ public static function isRuntimeScript(DOMNode $node)
 
         $src = $node->getAttribute(Attribute::SRC);
 
-        if (strpos($src, self::CACHE_ROOT_URL) !== 0) {
+        $hasCacheHost = false;
+        foreach (self::CACHE_HOSTS as $cacheHost) {
+            if (strpos($src, $cacheHost . '/') === 0) {
+                $hasCacheHost = true;
+                break;
+            }
+        }
+
+        if (! $hasCacheHost) {
             return false;
         }
 
@@ -190,7 +215,15 @@ public static function isViewerScript(DOMNode $node)
 
         $src = $node->getAttribute(Attribute::SRC);
 
-        if (strpos($src, self::CACHE_HOST . '/v0/amp-viewer-integration-') !== 0) {
+        $hasViewerHost = false;
+        foreach (self::CACHE_HOSTS as $cacheHost) {
+            if (strpos($src, $cacheHost . '/v0/amp-viewer-integration-') === 0) {
+                $hasViewerHost = true;
+                break;
+            }
+        }
+
+        if (! $hasViewerHost) {
             return false;
         }
 

src/Optimizer/Transformer/RewriteAmpUrls.php

@@ -1,4 +1,4 @@
 <?php
 
 namespace AmpProject\Optimizer\Transformer;
 
@@ -56,7 +56,7 @@
  *
  * @package ampproject/amp-toolbox
  */
 final class RewriteAmpUrls implements Transformer
 {
     /**
      * Configuration to use.
@@ -70,10 +70,10 @@
      *
      * @param TransformerConfiguration $configuration Configuration to use.
      */
     public function __construct(TransformerConfiguration $configuration)
     {
         $this->configuration = $configuration;
     }
 
     /**
      * Apply transformations to the provided DOM document.
@@ -84,13 +84,13 @@
      *                                  during transformation.
      * @return void
      */
     public function transform(Document $document, ErrorCollection $errors)
     {
         $host = $this->calculateHost();
 
         $this->adaptForEsmSupport($document, $host);
         $this->adaptForSelfHosting($document, $host, $errors);
     }
 
     /**
      * Adapt for ES modules support.
@@ -98,24 +98,24 @@
      * @param Document $document Document to collect preload nodes for.
      * @param string   $host     Host URL to use.
      */
     private function adaptForEsmSupport(Document $document, $host)
     {
         $usesEsm = $this->configuration->get(RewriteAmpUrlsConfiguration::ESM_MODULES_ENABLED);
 
         $node = $document->head->firstChild;
         while ($node) {
             $nextSibling = $node->nextSibling;
             if (! $node instanceof Element) {
                 $node = $nextSibling;
                 continue;
             }
 
             $src  = $node->getAttribute(Attribute::SRC);
             $href = $node->getAttribute(Attribute::HREF);
             if ($node->tagName === Tag::SCRIPT && $this->usesAmpCacheUrl($src)) {
                 $newUrl = $this->replaceUrl($src, $host);
                 $node->setAttribute(Attribute::SRC, $newUrl);
                 if ($usesEsm) {
                     $this->addEsm($document, $node);
                 } else {
                     $this->addPreload($document, $newUrl, Tag::SCRIPT);
@@ -161,7 +161,13 @@
             return false;
         }
 
-        return strpos($url, Amp::CACHE_HOST) === 0;
+        foreach (Amp::CACHE_HOSTS as $cacheHost) {
+            if (strpos($url, $cacheHost . '/') === 0) {
+                return true;
+            }
+        }
+
+        return false;
     }
 
     /**
@@ -179,8 +185,13 @@
             return $url;
         }
 
-        return str_replace(Amp::CACHE_HOST, $host, $url);
-    }
+        foreach (Amp::CACHE_HOSTS as $cacheHost) {
+            if (strpos($url, $cacheHost . '/') === 0) {
+                return $host . substr($url, strlen($cacheHost));
+            }
+        }
+
+        return $url;
 
     /**
      * Replace <script> elements with their ES module counterparts.
@@ -188,7 +199,7 @@
      * @param Document $document   Document to add the ES module scripts to.
      * @param Element  $scriptNode Script element to replace.
      */
     private function addEsm(Document $document, Element $scriptNode)
     {
         $scriptUrl    = $scriptNode->getAttribute(Attribute::SRC);
         $esmScriptUrl = preg_replace('/\.js$/', '.mjs', $scriptUrl);
@@ -221,7 +232,7 @@
      * @param string   $href     Href to use for the preload.
      * @param string   $type     Type to use for the preload.
      */
     private function addPreload(Document $document, $href, $type)
     {
         if (! $this->shouldPreload($href, $document)) {
             return;
@@ -238,7 +249,7 @@
      * @param string          $host     Host URL to use.
      * @param ErrorCollection $errors   Error collection to add potential errors to.
      */
     private function adaptForSelfHosting(Document $document, $host, $errors)
     {
         // runtime-host and amp-geo-api meta tags should appear before the first script.
         if (
@@ -279,7 +290,7 @@
      * @param Document $document Document on which to check.
      * @return bool Whether the provided URL should be preloaded.
      */
     private function shouldPreload($url, Document $document)
     {
         if ($document->documentElement->hasAttribute(Amp::NO_BOILERPLATE_ATTRIBUTE)) {
             return false;
@@ -295,7 +306,7 @@
      *
      * @return string Host to use.
      */
     private function calculateHost()
     {
         $lts = $this->configuration->get(RewriteAmpUrlsConfiguration::LTS);
         $rtv = $this->configuration->get(RewriteAmpUrlsConfiguration::RTV);
@@ -328,7 +339,7 @@
      * @param string   $name     Name of the meta element.
      * @param string   $content  Value of the meta element.
      */
     private function addMeta(Document $document, $name, $content)
     {
         $meta = $document->createElement(Tag::META);
         $meta->setAttribute(Attribute::NAME, $name);
@@ -337,3 +348,3 @@
         $document->head->insertBefore($meta, $firstScript);
     }
 }

tests/AmpTest.php

@@ -26,10 +26,12 @@ public function dataIsRuntimeScript()
     {
         $dom          = new Document();
         $ampSrc       = 'https://cdn.ampproject.org/v0.js';
+        $ampjsSrc     = 'https://ampjs.org/v0.js';
         $ampForAdsSrc = 'https://cdn.ampproject.org/amp4ads-v0.js';
 
         return [
             'amp-runtime'          => [$this->createAmpCDNScript($dom, $ampSrc), true],
+            'ampjs-runtime'        => [$this->createAmpCDNScript($dom, $ampjsSrc), true],
             'amp-for-ads-runtime'  => [$this->createAmpCDNScript($dom, $ampForAdsSrc), true],
             'amp-extension-script' => [$this->createExtensionScript($dom, 'amp-runtime'), false],
             'not-a-script'         => [$dom->createElement(Tag::STYLE), false],