Eliminate removable references to ~master~ branch

westonruter · westonruter · commit 4994fb9005aa · 2020-06-19T12:47:15.000-07:00
diff --git a/.github/workflows/build-test-measure.yml b/.github/workflows/build-test-measure.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - develop
-      - master
       # Include all release branches.
       - '*.*'
   pull_request:
diff --git a/.travis.yml b/.travis.yml
@@ -25,7 +25,6 @@ cache:
 
 branches:
   only:
-    - master
     - develop
     - /^\d+\.\d+$/
 
diff --git a/includes/class-amp-service-worker.php b/includes/class-amp-service-worker.php
@@ -153,7 +153,7 @@ public static function add_image_caching( $service_workers ) {
 	 *
 	 * @link https://developers.google.com/web/tools/workbox/guides/common-recipes#google_fonts
 	 * @link https://github.com/ampproject/amp-by-example/blob/4593af61609898043302a101826ddafe7206bfd9/boilerplate-generator/templates/files/serviceworkerJs.js#L76-L103
-	 * @link https://github.com/xwp/pwa-wp/blob/master/integrations/class-wp-service-worker-fonts-integration.php
+	 * @link https://github.com/GoogleChromeLabs/pwa-wp/blob/d0eb52a2f348259123f39941093813f1351c0e21/integrations/class-wp-service-worker-fonts-integration.php
 	 *
 	 * @param WP_Service_Worker_Scripts $service_workers Service workers.
 	 */
diff --git a/includes/sanitizers/class-amp-style-sanitizer.php b/includes/sanitizers/class-amp-style-sanitizer.php
@@ -485,7 +485,7 @@ private function get_used_class_names() {
 			 */
 			'amp-viewer',
 
-			// Classes added based on input mode. See <https://github.com/ampproject/amphtml/blob/master/spec/amp-css-classes.md#input-mode-classes>.
+			// Classes added based on input mode. See <https://github.com/ampproject/amphtml/blob/bd29b0eb1b28d900d4abed2c1883c6980f18db8e/spec/amp-css-classes.md#input-mode-classes>.
 			'amp-mode-touch',
 			'amp-mode-mouse',
 			'amp-mode-keyboard-active',
@@ -614,7 +614,7 @@ private function has_used_class_name( $class_names ) {
 							return false;
 						}
 						continue 2;
-					// Class names for amp-video-docking, see <https://github.com/ampproject/amphtml/blob/master/extensions/amp-video-docking/amp-video-docking.md#styling>.
+					// Class names for amp-video-docking, see <https://amp.dev/documentation/components/amp-video-docking/#styling>.
 					case 'amp-docked-':
 						if ( ! $this->has_used_attributes( [ 'dock' ] ) ) {
 							return false;
diff --git a/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php b/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php
@@ -17,7 +17,7 @@
  *
  * Allowed tags array is generated from this protocol buffer:
  *
- *     https://github.com/ampproject/amphtml/blob/master/validator/validator-main.protoascii
+ *     https://github.com/ampproject/amphtml/blob/bd29b0eb1b28d900d4abed2c1883c6980f18db8e/validator/validator-main.protoascii
  *     by the python script in amp-wp/bin/amp_wp_build.py. See the comment at the top
  *     of that file for instructions to generate class-amp-allowed-tags-generated.php.
  *
diff --git a/lib/common/phpstan.neon.dist b/lib/common/phpstan.neon.dist
@@ -1,5 +1,5 @@
 includes:
-	# @see https://github.com/phpstan/phpstan-src/blob/master/conf/bleedingEdge.neon
+	# @see https://github.com/phpstan/phpstan-src/blob/b9f62d63f2deaa0a5e97f51073e41a422c48aa01/conf/bleedingEdge.neon
 	- phar://phpstan.phar/conf/bleedingEdge.neon
 parameters:
 	level: 4
diff --git a/lib/common/src/Amp.php b/lib/common/src/Amp.php
@@ -59,7 +59,7 @@ final class Amp
      *
      * This list should be kept in sync with the list of dynamic components at:
      *
-     * @see https://github.com/ampproject/amphtml/blob/master/spec/amp-cache-guidelines.md#guidelines-adding-a-new-cache-to-the-amp-ecosystem
+     * @see https://github.com/ampproject/amphtml/blob/292dc66b8c0bb078bbe3a1bca960e8f494f7fc8f/spec/amp-cache-guidelines.md#guidelines-adding-a-new-cache-to-the-amp-ecosystem
      *
      * @var array[]
      */
diff --git a/lib/optimizer/bin/sync-amp-toolbox-test-suite.php b/lib/optimizer/bin/sync-amp-toolbox-test-suite.php
@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 
-$version         = 'master';
+$version         = 'main';
 $sourceUrl       = "https://github.com/ampproject/amp-toolbox/archive/{$version}.zip";
 $targetFolder    = realpath(dirname(__DIR__) . '/tests') . '/spec';
 $tmpFilePath     = tempnam(sys_get_temp_dir(), 'amp-optimizer-');
diff --git a/lib/optimizer/phpstan.neon.dist b/lib/optimizer/phpstan.neon.dist
@@ -1,5 +1,5 @@
 includes:
-	# @see https://github.com/phpstan/phpstan-src/blob/master/conf/bleedingEdge.neon
+	# @see https://github.com/phpstan/phpstan-src/blob/b9f62d63f2deaa0a5e97f51073e41a422c48aa01/conf/bleedingEdge.neon
 	- phar://phpstan.phar/conf/bleedingEdge.neon
 parameters:
 	level: 4
diff --git a/lib/optimizer/src/Transformer/ServerSideRendering.php b/lib/optimizer/src/Transformer/ServerSideRendering.php
@@ -352,7 +352,7 @@ private function calculateWidth($inputLayout, CssLength $inputWidth, $tagName)
     {
         if ((empty($inputLayout) || $inputLayout === Layout::FIXED) && ! $inputWidth->isDefined()) {
             // These values come from AMP's runtime and can be found in
-            // https://github.com/ampproject/amphtml/blob/master/src/layout.js#L70
+            // https://github.com/ampproject/amphtml/blob/292dc66b8c0bb078bbe3a1bca960e8f494f7fc8f/src/layout.js#L70-L86
             switch ($tagName) {
                 case Extension::ANALYTICS:
                 case Extension::PIXEL:
@@ -385,7 +385,7 @@ private function calculateHeight($inputLayout, CssLength $inputHeight, $tagName)
     {
         if ((empty($inputLayout) || $inputLayout === Layout::FIXED || $inputLayout === Layout::FIXED_HEIGHT) && ! $inputHeight->isDefined()) {
             // These values come from AMP's runtime and can be found in
-            // https://github.com/ampproject/amphtml/blob/master/src/layout.js#L70
+            // https://github.com/ampproject/amphtml/blob/292dc66b8c0bb078bbe3a1bca960e8f494f7fc8f/src/layout.js#L70-L86
             switch ($tagName) {
                 case Extension::ANALYTICS:
                 case Extension::PIXEL:
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -1,5 +1,5 @@
 includes:
-	# @see https://github.com/phpstan/phpstan-src/blob/master/conf/bleedingEdge.neon
+	# @see https://github.com/phpstan/phpstan-src/blob/b9f62d63f2deaa0a5e97f51073e41a422c48aa01/conf/bleedingEdge.neon
 	- phar://phpstan.phar/conf/bleedingEdge.neon
 parameters:
 	level: 3
diff --git a/readme.md b/readme.md
@@ -24,7 +24,7 @@ Features and capabilities provided by the plugin include:
 - **Core Theme Support**: enabling AMP compatibility for all core themes, from Twenty Ten all the way through Twenty Twenty.
 - **Compatibility Tool**: when automatic conversion of markup to AMP is not possible, debug AMP validation errors with detailed information including the invalid markup and the specific components responsible on site (e.g theme, plugin, embed); validation errors are shown contextually with their respective blocks in the editor.
 - **CSS Tree Shaking**: automatically remove the majority of unused CSS to bring the total under AMP's 75KB limit; when the total after tree shaking is still over this limit, prioritization is used so that the all-important theme stylesheet important is retained, leaving less important ones to be excluded (e.g. print styles).
-- **Server-side Rendering**: integrated PHP-port of the [AMP Optimizer](https://github.com/ampproject/amp-toolbox/tree/master/packages/optimizer) providing automated [server-side rendering](https://amp.dev/documentation/guides-and-tutorials/optimize-and-measure/server-side-rendering/) of AMP pages, drastically improving the [Last Contentful Paint](https://web.dev/lcp/) (LCP) metric.
+- **Server-side Rendering**: integrated PHP-port of the [AMP Optimizer](https://github.com/ampproject/amp-toolbox/tree/main/packages/optimizer) providing automated [server-side rendering](https://amp.dev/documentation/guides-and-tutorials/optimize-and-measure/server-side-rendering/) of AMP pages, drastically improving the [Last Contentful Paint](https://web.dev/lcp/) (LCP) metric.
 
 Please note that the [Stories](https://amp.dev/about/stories) experience has been removed from the AMP plugin in favor of the feature being released as a standalone plugin. It will be available soon!
 
diff --git a/readme.txt b/readme.txt
@@ -20,7 +20,7 @@ Features and capabilities provided by the plugin include:
 - **Core Theme Support**: enabling AMP compatibility for all core themes, from Twenty Ten all the way through Twenty Twenty.
 - **Compatibility Tool**: when automatic conversion of markup to AMP is not possible, debug AMP validation errors with detailed information including the invalid markup and the specific components responsible on site (e.g theme, plugin, embed); validation errors are shown contextually with their respective blocks in the editor.
 - **CSS Tree Shaking**: automatically remove the majority of unused CSS to bring the total under AMP's 75KB limit; when the total after tree shaking is still over this limit, prioritization is used so that the all-important theme stylesheet important is retained, leaving less important ones to be excluded (e.g. print styles).
-- **Server-side Rendering**: integrated PHP-port of the [AMP Optimizer](https://github.com/ampproject/amp-toolbox/tree/master/packages/optimizer) providing automated [server-side rendering](https://amp.dev/documentation/guides-and-tutorials/optimize-and-measure/server-side-rendering/) of AMP pages, drastically improving the [Last Contentful Paint](https://web.dev/lcp/) (LCP) metric.
+- **Server-side Rendering**: integrated PHP-port of the [AMP Optimizer](https://github.com/ampproject/amp-toolbox/tree/main/packages/optimizer) providing automated [server-side rendering](https://amp.dev/documentation/guides-and-tutorials/optimize-and-measure/server-side-rendering/) of AMP pages, drastically improving the [Last Contentful Paint](https://web.dev/lcp/) (LCP) metric.
 
 Please note that the [Stories](https://amp.dev/about/stories) experience has been removed from the AMP plugin in favor of the feature being released as a standalone plugin. It will be available soon!
 
diff --git a/tests/php/test-tag-and-attribute-sanitizer.php b/tests/php/test-tag-and-attribute-sanitizer.php
@@ -251,7 +251,7 @@ public function get_body_data() {
 			],
 
 			'amp-iframe_incorrect_protocol'                => [
-				'<amp-iframe width="600" height="200" sandbox="allow-scripts allow-same-origin" layout="responsive" frameborder="0" src="masterprotocol://www.example.com"></amp-iframe>',
+				'<amp-iframe width="600" height="200" sandbox="allow-scripts allow-same-origin" layout="responsive" frameborder="0" src="badprotocol://www.example.com"></amp-iframe>',
 				'',
 				[],
 				[

Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ public static function add_image_caching( $service_workers ) {`
`153`	`153`	`*`
`154`	`154`	`* @link https://developers.google.com/web/tools/workbox/guides/common-recipes#google_fonts`
`155`	`155`	`* @link https://github.com/ampproject/amp-by-example/blob/4593af61609898043302a101826ddafe7206bfd9/boilerplate-generator/templates/files/serviceworkerJs.js#L76-L103`
`156`		`- * @link https://github.com/xwp/pwa-wp/blob/master/integrations/class-wp-service-worker-fonts-integration.php`
	`156`	`+ * @link https://github.com/GoogleChromeLabs/pwa-wp/blob/d0eb52a2f348259123f39941093813f1351c0e21/integrations/class-wp-service-worker-fonts-integration.php`
`157`	`157`	`*`
`158`	`158`	`* @param WP_Service_Worker_Scripts $service_workers Service workers.`
`159`	`159`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`*`
`18`	`18`	`* Allowed tags array is generated from this protocol buffer:`
`19`	`19`	`*`
`20`		`- * https://github.com/ampproject/amphtml/blob/master/validator/validator-main.protoascii`
	`20`	`+ * https://github.com/ampproject/amphtml/blob/bd29b0eb1b28d900d4abed2c1883c6980f18db8e/validator/validator-main.protoascii`
`21`	`21`	`* by the python script in amp-wp/bin/amp_wp_build.py. See the comment at the top`
`22`	`22`	`* of that file for instructions to generate class-amp-allowed-tags-generated.php.`
`23`	`23`	`*`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ final class Amp`
`59`	`59`	`*`
`60`	`60`	`* This list should be kept in sync with the list of dynamic components at:`
`61`	`61`	`*`
`62`		`- * @see https://github.com/ampproject/amphtml/blob/master/spec/amp-cache-guidelines.md#guidelines-adding-a-new-cache-to-the-amp-ecosystem`
	`62`	`+ * @see https://github.com/ampproject/amphtml/blob/292dc66b8c0bb078bbe3a1bca960e8f494f7fc8f/spec/amp-cache-guidelines.md#guidelines-adding-a-new-cache-to-the-amp-ecosystem`
`63`	`63`	`*`
`64`	`64`	`* @var array[]`
`65`	`65`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -251,7 +251,7 @@ public function get_body_data() {`
`251`	`251`	`],`
`252`	`252`
`253`	`253`	`'amp-iframe_incorrect_protocol' => [`
`254`		`- '<amp-iframe width="600" height="200" sandbox="allow-scripts allow-same-origin" layout="responsive" frameborder="0" src="masterprotocol://www.example.com"></amp-iframe>',`
	`254`	`+ '<amp-iframe width="600" height="200" sandbox="allow-scripts allow-same-origin" layout="responsive" frameborder="0" src="badprotocol://www.example.com"></amp-iframe>',`
`255`	`255`	`'',`
`256`	`256`	`[],`
`257`	`257`	`[`