Merge branch 'develop' of github.com:ampproject/amp-wp into 1813-php73-for-travis

* 'develop' of github.com:ampproject/amp-wp:
  Correct license in composer.json as GPL-2.0-or-later
  Consolidate translator comments for forgotten URLs string
  Drop unnecessary sanitize_hex_color() polyfill and rename amp-post-template-actions.php to amp-post-template-functions.php.
  Fix composer.json indentation.
  Ensure all dependencies are PHP 5.4 compatible.
  Ensure FasterImage allows to set its user agent.
  Eliminate PHP 5.3-compatibility workarounds for closures
  Eliminate PHP 5.3-specific testsuite
  Ensure that Travis will npm install and composer install for each build
  Restore linebreaks in readme.md
  Exclude patches from build
  Improve phpdoc; catch Exception from fetch_images; add todo
  Remove unnecessary support for  argument when fetching image dimensions and deprecate it on the public method.
  Fix FunctionCallSignature for new WP code style
  Fix MultipleStatementAlignment in autoloader manifest
  Pull in FasterImage library via Composer and apply manual changes via patch file.
  Remove now unnecessary FastImage library.
  Update minimum required PHP version to 5.4.

Author: westonruter

.dev-lib

@@ -1,4 +1,3 @@
-PATH_EXCLUDES_PATTERN=third_party/
 DEFAULT_BASE_BRANCH=develop
 ASSETS_DIR=wp-assets
 PROJECT_SLUG=amp

.travis.yml

@@ -12,8 +12,9 @@ notifications:
 
 cache:
   directories:
-    - node_modules
-    - vendor
+    - $HOME/.composer/cache
+    - $HOME/.npm
+    - $HOME/.nvm/.cache
     - $HOME/phpunit-bin
     - $HOME/deployment-targets
 
@@ -35,8 +36,6 @@ jobs:
     - stage: test
       php: "7.3"
       env: WP_VERSION=5.0
-    - php: "5.3"
-      env: WP_VERSION=latest DEV_LIB_SKIP=composer,phpcs
     - php: "5.4"
       env: WP_VERSION=4.9    DEV_LIB_SKIP=composer,phpcs
     - php: "5.5"

Gruntfile.js

@@ -92,7 +92,7 @@ module.exports = function( grunt ) {
 			versionAppend = new Date().toISOString().replace( /\.\d+/, '' ).replace( /-|:/g, '' ) + '-' + commitHash;
 
 			paths = lsOutput.trim().split( /\n/ ).filter( function( file ) {
-				return ! /^(blocks|\.|bin|([^/]+)+\.(md|json|xml)|Gruntfile\.js|tests|wp-assets|dev-lib|readme\.md|composer\..*|webpack.*)/.test( file );
+				return ! /^(blocks|\.|bin|([^/]+)+\.(md|json|xml)|Gruntfile\.js|tests|wp-assets|dev-lib|readme\.md|composer\..*|patches|webpack.*)/.test( file );
 			} );
 			paths.push( 'vendor/autoload.php' );
 			paths.push( 'assets/js/*-compiled.js' );

amp.php

@@ -21,11 +21,11 @@
 function _amp_print_php_version_admin_notice() {
 	?>
 	<div class="notice notice-error">
-		<p><?php esc_html_e( 'The AMP plugin requires PHP 5.3+. Please contact your host to update your PHP version.', 'amp' ); ?></p>
+		<p><?php esc_html_e( 'The AMP plugin requires PHP 5.4+. Please contact your host to update your PHP version.', 'amp' ); ?></p>
 	</div>
 	<?php
 }
-if ( version_compare( phpversion(), '5.3.6', '<' ) ) {
+if ( version_compare( phpversion(), '5.4', '<' ) ) {
 	add_action( 'admin_notices', '_amp_print_php_version_admin_notice' );
 	return;
 }
@@ -448,7 +448,6 @@ function amp_add_frontend_actions() {
  * @deprecated This function is not used when 'amp' theme support is added.
  */
 function amp_add_post_template_actions() {
-	require_once AMP__DIR__ . '/includes/amp-post-template-actions.php';
 	require_once AMP__DIR__ . '/includes/amp-post-template-functions.php';
 	amp_post_template_init_hooks();
 }

composer.json

@@ -1,22 +1,36 @@
 {
-    "name": "ampproject/amp-wp",
-    "description": "WordPress plugin for adding AMP support.",
-    "homepage": "https://github.com/ampproject/amp-wp",
-    "type": "wordpress-plugin",
-    "license": "GPL-2.0",
-    "repositories": [
-        {
-            "type": "vcs",
-            "url": "https://github.com/xwp/PHP-CSS-Parser"
-        }
-    ],
-    "require": {
-        "php": "^5.3.6 || ^7.0",
-        "sabberworm/php-css-parser": "8.1.1"
-    },
-    "require-dev": {
-        "wp-coding-standards/wpcs": "1.2.1",
-        "dealerdirect/phpcodesniffer-composer-installer": "0.4.4",
-        "phpcompatibility/php-compatibility": "9.1.1"
+  "name": "ampproject/amp-wp",
+  "description": "WordPress plugin for adding AMP support.",
+  "homepage": "https://github.com/ampproject/amp-wp",
+  "type": "wordpress-plugin",
+  "license": "GPL-2.0-or-later",
+  "repositories": [
+    {
+      "type": "vcs",
+      "url": "https://github.com/xwp/PHP-CSS-Parser"
     }
+  ],
+  "require": {
+    "php": "^5.4 || ^7.0",
+    "sabberworm/php-css-parser": "8.1.1",
+    "fasterimage/fasterimage": "1.2.0",
+    "cweagans/composer-patches": "~1.0"
+  },
+  "require-dev": {
+    "wp-coding-standards/wpcs": "1.2.1",
+    "dealerdirect/phpcodesniffer-composer-installer": "0.4.4",
+    "phpcompatibility/php-compatibility": "9.1.1"
+  },
+  "config": {
+    "platform": {
+      "php": "5.4"
+    }
+  },
+  "extra": {
+    "patches": {
+      "fasterimage/fasterimage": {
+        "FasterImage: Add support for SVG images and enable TLS verification": "patches/fasterimage-fixes.diff"
+      }
+    }
+  }
 }