From b5ea3948e19b62a031dffb020f3b91a967962679 Mon Sep 17 00:00:00 2001 From: Luigi Mannoni Date: Thu, 24 Nov 2022 10:24:19 +0000 Subject: [PATCH 1/4] Patches and replaces original lullabot amp library --- composer.json | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 84d2ee40..1b018121 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,8 @@ { - "name": "lullabot/amp", + "name": "deimosindustries/lullabot-amp", + "replace": { + "lullabot/amp":"2.*" + }, "description": "A set of useful classes and utilities to convert html to AMP html (See https://www.ampproject.org/)", "authors": [ { @@ -12,19 +15,19 @@ "homepage": "https://github.com/Lullabot/amp-library", "require": { "php": ">=5.6", - "querypath/querypath": "^3.0.4", "sebastian/diff": "^1.2 || ^2 || ^3 || ^4", "marc1706/fast-image-size": "1.*", "sabberworm/php-css-parser": "^8.0.0", "guzzlehttp/guzzle": "~6.1", - "masterminds/html5": "^2.5" + "masterminds/html5": "^2.5", + "arthurkushman/query-path": "^3.1" }, "autoload": { "classmap": ["src/Spec/validator-generated.php"], "psr-4": {"Lullabot\\AMP\\": "src"} }, "require-dev": { - "phpunit/phpunit": "^5.6.3 || ^6", + "phpunit/phpunit": "^9.5", "symfony/console": "^2.7.0" }, "scripts": { From f9ea4955b6097ea24c4ea10d6f48f83034fbbe61 Mon Sep 17 00:00:00 2001 From: Luigi Mannoni Date: Thu, 24 Nov 2022 10:26:19 +0000 Subject: [PATCH 2/4] Change url --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 1b018121..f5cdb943 100644 --- a/composer.json +++ b/composer.json @@ -12,9 +12,9 @@ ], "license": "Apache-2.0", "keywords": ["Drupal", "AMP", "mobile"], - "homepage": "https://github.com/Lullabot/amp-library", + "homepage": "https://github.com/deimosindustries/amp-library", "require": { - "php": ">=5.6", + "php": ">=7.1", "sebastian/diff": "^1.2 || ^2 || ^3 || ^4", "marc1706/fast-image-size": "1.*", "sabberworm/php-css-parser": "^8.0.0", From d3fc75873664a58a34c28ed5bac746d0bdd578ab Mon Sep 17 00:00:00 2001 From: Luigi Mannoni Date: Thu, 24 Nov 2022 10:39:06 +0000 Subject: [PATCH 3/4] Edit composer to prepare PR for main repo --- composer.json | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index f5cdb943..c40a0aaa 100644 --- a/composer.json +++ b/composer.json @@ -1,8 +1,5 @@ { - "name": "deimosindustries/lullabot-amp", - "replace": { - "lullabot/amp":"2.*" - }, + "name": "lullabot/amp", "description": "A set of useful classes and utilities to convert html to AMP html (See https://www.ampproject.org/)", "authors": [ { @@ -12,9 +9,9 @@ ], "license": "Apache-2.0", "keywords": ["Drupal", "AMP", "mobile"], - "homepage": "https://github.com/deimosindustries/amp-library", + "homepage": "https://github.com/Lullabot/amp-library", "require": { - "php": ">=7.1", + "php": ">=5.6", "sebastian/diff": "^1.2 || ^2 || ^3 || ^4", "marc1706/fast-image-size": "1.*", "sabberworm/php-css-parser": "^8.0.0", From 6ee0ef77146ae8a40dd2888c36f0adfc2f3852bb Mon Sep 17 00:00:00 2001 From: Luigi Mannoni Date: Thu, 8 Dec 2022 10:26:41 +0000 Subject: [PATCH 4/4] Replace old abandoned querypath with new one with 8.1 support --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index c40a0aaa..64d3bcf4 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "sabberworm/php-css-parser": "^8.0.0", "guzzlehttp/guzzle": "~6.1", "masterminds/html5": "^2.5", - "arthurkushman/query-path": "^3.1" + "gravitypdf/querypath": "^3.2" }, "autoload": { "classmap": ["src/Spec/validator-generated.php"],