Merge pull request #4135 from ampproject/add/enqueued-dependency-sourcing

Add source information for script/style dependencies and inline scripts/styles

Author: westonruter

.travis.yml

@@ -118,21 +118,13 @@ jobs:
       php: "7.1"
       env: WP_VERSION=latest DEV_LIB_ONLY=phpunit,phpsyntax                      INSTALL_PWA_PLUGIN=1
 
-    - name: PHP unit tests (7.0, WordPress latest)
+    - name: PHP unit tests (7.0, WordPress 5.1)
       php: "7.0"
-      env: WP_VERSION=latest DEV_LIB_ONLY=phpunit,phpsyntax                      INSTALL_PWA_PLUGIN=1
+      env: WP_VERSION=5.1    DEV_LIB_ONLY=phpunit,phpsyntax                      INSTALL_PWA_PLUGIN=1
 
-    - name: PHP unit tests (5.6, WordPress latest)
+    - name: PHP unit tests (5.6, WordPress 5.0)
       php: "5.6"
-      env: WP_VERSION=latest DEV_LIB_ONLY=phpunit,phpsyntax                      INSTALL_PWA_PLUGIN=1
-
-    - name: PHP unit tests (5.4, WordPress 5.1)
-      php: "5.4"
-      env: WP_VERSION=5.1    DEV_LIB_ONLY=phpunit
-
-    - name: PHP unit tests (5.5, WordPress 5.0)
-      php: "5.5"
-      env: WP_VERSION=5.0    DEV_LIB_ONLY=phpunit,phpsyntax
+      env: WP_VERSION=5.0    DEV_LIB_ONLY=phpunit,phpsyntax                      INSTALL_PWA_PLUGIN=1
 
     - name: PHP unit tests w/ external-http (5.6, WordPress 4.9)
       php: "5.6"

amp.php

@@ -28,7 +28,7 @@
 
 $_amp_load_errors = new WP_Error();
 
-if ( version_compare( phpversion(), '5.4', '<' ) ) {
+if ( version_compare( phpversion(), '5.6', '<' ) ) {
 	$_amp_load_errors->add(
 		'insufficient_php_version',
 		sprintf(
@@ -307,6 +307,9 @@ function amp_deactivate() {
 	flush_rewrite_rules( false );
 }
 
+// The plugins_loaded action is the earliest we can run this since that is when pluggable.php has been required and wp_hash() is available.
+add_action( 'plugins_loaded', [ 'AMP_Validation_Manager', 'init_validate_request' ], ~PHP_INT_MAX );
+
 /*
  * Register AMP scripts regardless of whether AMP is enabled or it is the AMP endpoint
  * for the sake of being able to use AMP components on non-AMP documents ("dirty AMP").

assets/css/src/amp-validation-error-taxonomy.css

@@ -445,7 +445,7 @@ body.taxonomy-amp_validation_error .wp-list-table .new th.check-column input {
 #amp_stylesheets .column-minified,
 #amp_stylesheets .column-final_size,
 #amp_stylesheets .column-percentage {
-	width: 10%;
+	width: 8%;
 	text-align: right;
 }
 

composer.json

@@ -5,7 +5,7 @@
   "homepage": "https://github.com/ampproject/amp-wp",
   "license": "GPL-2.0-or-later",
   "require": {
-    "php": "^5.4 || ^7.0",
+    "php": "^5.6 || ^7.0",
     "ext-curl": "*",
     "ext-date": "*",
     "ext-dom": "*",
@@ -34,7 +34,7 @@
   },
   "config": {
     "platform": {
-      "php": "5.4"
+      "php": "5.6"
     },
     "sort-packages": true
   },