From 46c381d4c920944ac6af2795f5160c40af585021 Mon Sep 17 00:00:00 2001 From: Gregor Morrill Date: Sun, 25 Sep 2022 13:07:19 -0700 Subject: [PATCH 1/2] Update composer.json Needed `allow-plugins` for build breaking during `composer install` --- composer.json | 95 ++++++++++++++++++++++++++------------------------- 1 file changed, 49 insertions(+), 46 deletions(-) diff --git a/composer.json b/composer.json index e7c890c..32cd278 100644 --- a/composer.json +++ b/composer.json @@ -1,48 +1,51 @@ { - "name": "mf2/mf2", - "type": "library", - "description": "A pure, generic microformats2 parser — makes HTML as easy to consume as a JSON API", - "keywords": ["microformats", "microformats 2", "parser", "semantic", "html"], - "authors" : [ - { - "name": "Barnaby Walters", - "homepage": "http://waterpigs.co.uk" - } - ], - "bin": ["bin/fetch-mf2", "bin/parse-mf2"], - "require": { - "php": ">=5.6.0" - }, - "config": { - "platform": { - } - }, - "require-dev": { - "mf2/tests": "dev-master#e9e2b905821ba0a5b59dab1a8eaf40634ce9cd49", - "squizlabs/php_codesniffer": "^3.6.2", - "dealerdirect/phpcodesniffer-composer-installer": "^0.7", - "phpcompatibility/php-compatibility": "^9.3", - "yoast/phpunit-polyfills": "^1.0" - }, - "scripts": { - "cs-check": "phpcs", - "tests": "XDEBUG_MODE=coverage ./vendor/bin/phpunit tests --coverage-text --whitelist Mf2", - "test-mf1": "./vendor/bin/phpunit --group microformats/tests/mf1", - "check-and-test": [ - "@cs-check", - "@tests" - ], - "check-and-test-all": [ - "@check-and-test", - "@test-mf1" - ] - }, - "autoload": { - "files": ["Mf2/Parser.php"] - }, - "license": "CC0-1.0", - "suggest": { - "barnabywalters/mf-cleaner": "To more easily handle the canonical data php-mf2 gives you", - "masterminds/html5": "Alternative HTML parser for PHP, for better HTML5 support." - } + "name": "mf2/mf2", + "type": "library", + "description": "A pure, generic microformats2 parser — makes HTML as easy to consume as a JSON API", + "keywords": ["microformats", "microformats 2", "parser", "semantic", "html"], + "authors" : [ + { + "name": "Barnaby Walters", + "homepage": "http://waterpigs.co.uk" + } + ], + "bin": ["bin/fetch-mf2", "bin/parse-mf2"], + "require": { + "php": ">=5.6.0" + }, + "config": { + "platform": { + }, + "allow-plugins": { + "dealerdirect/phpcodesniffer-composer-installer": true + } + }, + "require-dev": { + "mf2/tests": "dev-master#e9e2b905821ba0a5b59dab1a8eaf40634ce9cd49", + "squizlabs/php_codesniffer": "^3.6.2", + "dealerdirect/phpcodesniffer-composer-installer": "^0.7", + "phpcompatibility/php-compatibility": "^9.3", + "yoast/phpunit-polyfills": "^1.0" + }, + "scripts": { + "cs-check": "phpcs", + "tests": "XDEBUG_MODE=coverage ./vendor/bin/phpunit tests --coverage-text --whitelist Mf2", + "test-mf1": "./vendor/bin/phpunit --group microformats/tests/mf1", + "check-and-test": [ + "@cs-check", + "@tests" + ], + "check-and-test-all": [ + "@check-and-test", + "@test-mf1" + ] + }, + "autoload": { + "files": ["Mf2/Parser.php"] + }, + "license": "CC0-1.0", + "suggest": { + "barnabywalters/mf-cleaner": "To more easily handle the canonical data php-mf2 gives you", + "masterminds/html5": "Alternative HTML parser for PHP, for better HTML5 support." + } } From 7f07021a743e6210ef242b920bd487ccd9522bea Mon Sep 17 00:00:00 2001 From: Gregor Morrill Date: Sun, 25 Sep 2022 13:25:29 -0700 Subject: [PATCH 2/2] Update .editorconfig and composer.json Default .editorconfig was forcing composer.json with spaces to save as tabs. This should preserve the whitespace in the PR. --- .editorconfig | 2 +- composer.json | 98 +++++++++++++++++++++++++-------------------------- 2 files changed, 50 insertions(+), 50 deletions(-) diff --git a/.editorconfig b/.editorconfig index 01dde6c..6096eca 100644 --- a/.editorconfig +++ b/.editorconfig @@ -6,6 +6,6 @@ trim_trailing_whitespace = true insert_final_newline = true charset = utf-8 -[*.yml] +[*.{json,yml}] indent_style = space indent_size = 2 diff --git a/composer.json b/composer.json index 32cd278..bdd43d7 100644 --- a/composer.json +++ b/composer.json @@ -1,51 +1,51 @@ { - "name": "mf2/mf2", - "type": "library", - "description": "A pure, generic microformats2 parser — makes HTML as easy to consume as a JSON API", - "keywords": ["microformats", "microformats 2", "parser", "semantic", "html"], - "authors" : [ - { - "name": "Barnaby Walters", - "homepage": "http://waterpigs.co.uk" - } - ], - "bin": ["bin/fetch-mf2", "bin/parse-mf2"], - "require": { - "php": ">=5.6.0" - }, - "config": { - "platform": { - }, - "allow-plugins": { - "dealerdirect/phpcodesniffer-composer-installer": true - } - }, - "require-dev": { - "mf2/tests": "dev-master#e9e2b905821ba0a5b59dab1a8eaf40634ce9cd49", - "squizlabs/php_codesniffer": "^3.6.2", - "dealerdirect/phpcodesniffer-composer-installer": "^0.7", - "phpcompatibility/php-compatibility": "^9.3", - "yoast/phpunit-polyfills": "^1.0" - }, - "scripts": { - "cs-check": "phpcs", - "tests": "XDEBUG_MODE=coverage ./vendor/bin/phpunit tests --coverage-text --whitelist Mf2", - "test-mf1": "./vendor/bin/phpunit --group microformats/tests/mf1", - "check-and-test": [ - "@cs-check", - "@tests" - ], - "check-and-test-all": [ - "@check-and-test", - "@test-mf1" - ] - }, - "autoload": { - "files": ["Mf2/Parser.php"] - }, - "license": "CC0-1.0", - "suggest": { - "barnabywalters/mf-cleaner": "To more easily handle the canonical data php-mf2 gives you", - "masterminds/html5": "Alternative HTML parser for PHP, for better HTML5 support." - } + "name": "mf2/mf2", + "type": "library", + "description": "A pure, generic microformats2 parser — makes HTML as easy to consume as a JSON API", + "keywords": ["microformats", "microformats 2", "parser", "semantic", "html"], + "authors" : [ + { + "name": "Barnaby Walters", + "homepage": "http://waterpigs.co.uk" + } + ], + "bin": ["bin/fetch-mf2", "bin/parse-mf2"], + "require": { + "php": ">=5.6.0" + }, + "config": { + "platform": { + }, + "allow-plugins": { + "dealerdirect/phpcodesniffer-composer-installer": true + } + }, + "require-dev": { + "mf2/tests": "dev-master#e9e2b905821ba0a5b59dab1a8eaf40634ce9cd49", + "squizlabs/php_codesniffer": "^3.6.2", + "dealerdirect/phpcodesniffer-composer-installer": "^0.7", + "phpcompatibility/php-compatibility": "^9.3", + "yoast/phpunit-polyfills": "^1.0" + }, + "scripts": { + "cs-check": "phpcs", + "tests": "XDEBUG_MODE=coverage ./vendor/bin/phpunit tests --coverage-text --whitelist Mf2", + "test-mf1": "./vendor/bin/phpunit --group microformats/tests/mf1", + "check-and-test": [ + "@cs-check", + "@tests" + ], + "check-and-test-all": [ + "@check-and-test", + "@test-mf1" + ] + }, + "autoload": { + "files": ["Mf2/Parser.php"] + }, + "license": "CC0-1.0", + "suggest": { + "barnabywalters/mf-cleaner": "To more easily handle the canonical data php-mf2 gives you", + "masterminds/html5": "Alternative HTML parser for PHP, for better HTML5 support." + } }