Merge in develop, resolve conflicts

The conflicts were deleted files:
src/Dom/Document.php
tests/php/test-class-amp-dom-document.php

This simply moves the changes in those
files to the relevant new files.

.eslintignore

@@ -4,3 +4,4 @@
 **/assets/js/*.js
 !assets/js/amp-service-worker-runtime-precaching.js
 build/*
+lib/*

.gitignore

@@ -14,3 +14,5 @@ built
 /amphtml
 .env
 .idea/
+/lib/*/vendor/
+/lib/*/composer.lock

.stylelintignore

@@ -3,3 +3,5 @@
 /build
 /tests
 /vendor
+/lib/optimizer
+/lib/common

.travis.yml

@@ -151,3 +151,21 @@ jobs:
         - bash <(curl -s https://codecov.io/bash) -cF php -f /tmp/wordpress/src/wp-content/plugins/amp/build/logs/clover.xml
         - npm run test:js -- --collectCoverage
         - bash <(curl -s https://codecov.io/bash) -cF javascript -f build/logs/lcov.info
+
+    - name: Libraries that are meant to be externalized (5.6)
+      php: "5.6"
+      install:
+        - composer --working-dir=lib/common install
+        - composer --working-dir=lib/optimizer install
+      script:
+        - composer --working-dir=lib/common test
+        - composer --working-dir=lib/optimizer test
+
+    - name: Libraries that are meant to be externalized (7.3)
+      php: "7.3"
+      install:
+        - composer --working-dir=lib/common install
+        - composer --working-dir=lib/optimizer install
+      script:
+        - composer --working-dir=lib/common test
+        - composer --working-dir=lib/optimizer test

Gruntfile.js

@@ -28,6 +28,7 @@ module.exports = function( grunt ) {
 	const productionVendorExcludedFilePatterns = [
 		'composer.*',
 		'patches',
+		'lib',
 		'vendor/*/*/.editorconfig',
 		'vendor/*/*/.git',
 		'vendor/*/*/.gitignore',
@@ -40,7 +41,10 @@ module.exports = function( grunt ) {
 		'vendor/*/*/*.yml',
 		'vendor/*/*/.*.yml',
 		'vendor/*/*/tests',
+		'vendor/ampproject/optimizer/bin',
 		'vendor/bin',
+		'vendor/ampproject/common/vendor',
+		'vendor/ampproject/optimizer/vendor',
 	];
 
 	grunt.initConfig( {
@@ -70,7 +74,14 @@ module.exports = function( grunt ) {
 				command: 'php bin/verify-version-consistency.php',
 			},
 			composer_install: {
-				command: 'if [ ! -e build ]; then echo "Run grunt build first."; exit 1; fi; cd build; composer install --no-dev -o && composer remove cweagans/composer-patches --update-no-dev -o && rm -r ' + productionVendorExcludedFilePatterns.join( ' ' ),
+				command: [
+					'if [ ! -e build ]; then echo "Run grunt build first."; exit 1; fi',
+					'cd build',
+					'composer install --no-dev -o',
+					'for symlinksource in $(find vendor/ampproject -type l); do symlinktarget=$(readlink "$symlinksource") && rm "$symlinksource" && cp -r "vendor/ampproject/$symlinktarget" "$symlinksource"; done',
+					'composer remove cweagans/composer-patches --update-no-dev -o',
+					'rm -r ' + productionVendorExcludedFilePatterns.join( ' ' )
+				].join( ' && ' ),
 			},
 			create_build_zip: {
 				command: 'if [ ! -e build ]; then echo "Run grunt build first."; exit 1; fi; if [ -e amp.zip ]; then rm amp.zip; fi; cd build; zip -r ../amp.zip .; cd ..; echo; echo "ZIP of build: $(pwd)/amp.zip"',
@@ -150,6 +161,7 @@ module.exports = function( grunt ) {
 			} );
 
 			paths.push( 'composer.*' ); // Copy in order to be able to do run composer_install.
+			paths.push( 'lib/**' );
 			paths.push( 'assets/js/*.js' ); // @todo Also include *.map files?
 			paths.push( 'assets/js/*.asset.php' );
 			paths.push( 'assets/css/*.css' );

amp.php

@@ -45,8 +45,10 @@
 	'curl'   => array(
 		'functions' => array(
 			'curl_close',
+			'curl_errno',
 			'curl_error',
 			'curl_exec',
+			'curl_getinfo',
 			'curl_init',
 			'curl_setopt',
 		),

composer.json

@@ -12,6 +12,8 @@
     "ext-iconv": "*",
     "ext-libxml": "*",
     "ext-spl": "*",
+    "ampproject/common": "^1",
+    "ampproject/optimizer": "^1",
     "cweagans/composer-patches": "1.6.7",
     "fasterimage/fasterimage": "1.5.0",
     "sabberworm/php-css-parser": "dev-master#134f4e6"
@@ -49,19 +51,35 @@
   },
   "autoload": {
     "psr-4": {
-      "Amp\\AmpWP\\": "src/"
+      "AmpProject\\AmpWP\\": "src/"
     }
   },
   "autoload-dev": {
     "psr-4": {
-      "Amp\\AmpWP\\Tests\\": "tests/php/src/"
+      "AmpProject\\AmpWP\\Tests\\": "tests/php/src/"
     }
   },
   "repositories": [
+    {
+      "type": "path",
+      "url": "lib/common",
+      "options": {
+        "symlink": true
+      }
+    },
+    {
+      "type": "path",
+      "url": "lib/optimizer",
+      "options": {
+        "symlink": true
+      }
+    },
     {
       "type": "vcs",
       "url": "https://github.com/sabberworm/PHP-CSS-Parser.git",
       "no-api": true
     }
-  ]
+  ],
+  "minimum-stability": "dev",
+  "prefer-stable": true
 }