From d590c6b3710caa362ab2c998a094ab727e956953 Mon Sep 17 00:00:00 2001 From: Julien Melissas Date: Sat, 17 Jun 2017 17:27:07 +0200 Subject: [PATCH 1/5] Improved composer.json file Added more information, the "wordpress-plugin" package type, and other required things to make installing the plugin via composer easier. --- composer.json | 14 ++++++ composer.lock | 119 +++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 131 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 6634332cbd38bf..94393a98310ec5 100644 --- a/composer.json +++ b/composer.json @@ -1,8 +1,22 @@ { + "name": "wordpress/gutenberg", + "type": "wordpress-plugin", + "license": "GPL-2.0", + "description": "Prototyping since 1440. Development hub for the editor focus in core.", + "homepage": "https://wordpress.github.io/gutenberg/", + "keywords": [ + "gutenberg", "wordpress", "editor", "wp", "react", "javascript" + ], + "support": { + "issues": "https://github.com/WordPress/gutenberg/issues" + }, "require-dev": { "squizlabs/php_codesniffer": "2.9.x", "wp-coding-standards/wpcs": "^0.11.0" }, + "require": { + "composer/installers": "~1.0" + }, "scripts": { "post-install-cmd": [ "phpcs --config-set installed_paths ../../wp-coding-standards/wpcs/" diff --git a/composer.lock b/composer.lock index 1739cdc97a899a..1961f96071e40e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,123 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "1a5dd686e18346fa4dbc564b7b90f4a1", - "packages": [], + "content-hash": "cad2522839a5a2c4bcdd95ad723a0dff", + "packages": [ + { + "name": "composer/installers", + "version": "v1.3.0", + "source": { + "type": "git", + "url": "https://github.com/composer/installers.git", + "reference": "79ad876c7498c0bbfe7eed065b8651c93bfd6045" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/installers/zipball/79ad876c7498c0bbfe7eed065b8651c93bfd6045", + "reference": "79ad876c7498c0bbfe7eed065b8651c93bfd6045", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^1.0" + }, + "replace": { + "roundcube/plugin-installer": "*", + "shama/baton": "*" + }, + "require-dev": { + "composer/composer": "1.0.*@dev", + "phpunit/phpunit": "4.1.*" + }, + "type": "composer-plugin", + "extra": { + "class": "Composer\\Installers\\Plugin", + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\Installers\\": "src/Composer/Installers" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Kyle Robinson Young", + "email": "kyle@dontkry.com", + "homepage": "https://github.com/shama" + } + ], + "description": "A multi-framework Composer library installer", + "homepage": "https://composer.github.io/installers/", + "keywords": [ + "Craft", + "Dolibarr", + "Eliasis", + "Hurad", + "ImageCMS", + "Kanboard", + "MODX Evo", + "Mautic", + "Maya", + "OXID", + "Plentymarkets", + "Porto", + "RadPHP", + "SMF", + "Thelia", + "WolfCMS", + "agl", + "aimeos", + "annotatecms", + "attogram", + "bitrix", + "cakephp", + "chef", + "cockpit", + "codeigniter", + "concrete5", + "croogo", + "dokuwiki", + "drupal", + "elgg", + "expressionengine", + "fuelphp", + "grav", + "installer", + "itop", + "joomla", + "kohana", + "laravel", + "lavalite", + "lithium", + "magento", + "mako", + "mediawiki", + "modulework", + "moodle", + "phpbb", + "piwik", + "ppi", + "puppet", + "reindex", + "roundcube", + "shopware", + "silverstripe", + "sydes", + "symfony", + "typo3", + "wordpress", + "yawik", + "zend", + "zikula" + ], + "time": "2017-04-24T06:37:16+00:00" + } + ], "packages-dev": [ { "name": "squizlabs/php_codesniffer", From 72471347f38b2d40e768d687fa9431d1514b44ef Mon Sep 17 00:00:00 2001 From: Julien Melissas Date: Sun, 3 Dec 2017 16:00:58 -0600 Subject: [PATCH 2/5] Removing the PHPCS config set Post Install Command See https://github.com/WordPress/gutenberg/pull/1229#discussion_r148927462 --- composer.json | 5 +-- composer.lock | 91 ++++++++++++++++++++++++++++++++------------------- 2 files changed, 59 insertions(+), 37 deletions(-) diff --git a/composer.json b/composer.json index d29423af459444..6237bac287b9c5 100644 --- a/composer.json +++ b/composer.json @@ -20,9 +20,6 @@ "composer/installers": "~1.0" }, "scripts": { - "lint": "phpcs", - "post-install-cmd": [ - "phpcs --config-set installed_paths ../../wp-coding-standards/wpcs/" - ] + "lint": "phpcs" } } diff --git a/composer.lock b/composer.lock index d1b6a35b8d7747..5b7f127e059bb0 100644 --- a/composer.lock +++ b/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "cad2522839a5a2c4bcdd95ad723a0dff", + "content-hash": "d98e7d96aa3ad8c24dac1961b911e432", "packages": [ { "name": "composer/installers", - "version": "v1.3.0", + "version": "v1.4.0", "source": { "type": "git", "url": "https://github.com/composer/installers.git", - "reference": "79ad876c7498c0bbfe7eed065b8651c93bfd6045" + "reference": "9ce17fb70e9a38dd8acff0636a29f5cf4d575c1b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/installers/zipball/79ad876c7498c0bbfe7eed065b8651c93bfd6045", - "reference": "79ad876c7498c0bbfe7eed065b8651c93bfd6045", + "url": "https://api.github.com/repos/composer/installers/zipball/9ce17fb70e9a38dd8acff0636a29f5cf4d575c1b", + "reference": "9ce17fb70e9a38dd8acff0636a29f5cf4d575c1b", "shasum": "" }, "require": { @@ -63,6 +63,7 @@ "Hurad", "ImageCMS", "Kanboard", + "Lan Management System", "MODX Evo", "Mautic", "Maya", @@ -86,6 +87,7 @@ "croogo", "dokuwiki", "drupal", + "eZ Platform", "elgg", "expressionengine", "fuelphp", @@ -102,6 +104,7 @@ "mediawiki", "modulework", "moodle", + "osclass", "phpbb", "piwik", "ppi", @@ -118,7 +121,7 @@ "zend", "zikula" ], - "time": "2017-04-24T06:37:16+00:00" + "time": "2017-08-09T07:53:48+00:00" } ], "packages-dev": [ @@ -192,37 +195,64 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.1.0", + "version": "2.9.1", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "3c2d0a0fe39684ba0c1eb842a6a775d0b938d699" + "reference": "dcbed1074f8244661eecddfc2a675430d8d33f62" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/3c2d0a0fe39684ba0c1eb842a6a775d0b938d699", - "reference": "3c2d0a0fe39684ba0c1eb842a6a775d0b938d699", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/dcbed1074f8244661eecddfc2a675430d8d33f62", + "reference": "dcbed1074f8244661eecddfc2a675430d8d33f62", "shasum": "" }, "require": { "ext-simplexml": "*", "ext-tokenizer": "*", "ext-xmlwriter": "*", - "php": ">=5.4.0" + "php": ">=5.1.2" }, "require-dev": { - "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0" + "phpunit/phpunit": "~4.0" }, "bin": [ - "bin/phpcs", - "bin/phpcbf" + "scripts/phpcs", + "scripts/phpcbf" ], "type": "library", "extra": { "branch-alias": { - "dev-master": "3.x-dev" + "dev-master": "2.x-dev" } }, + "autoload": { + "classmap": [ + "CodeSniffer.php", + "CodeSniffer/CLI.php", + "CodeSniffer/Exception.php", + "CodeSniffer/File.php", + "CodeSniffer/Fixer.php", + "CodeSniffer/Report.php", + "CodeSniffer/Reporting.php", + "CodeSniffer/Sniff.php", + "CodeSniffer/Tokens.php", + "CodeSniffer/Reports/", + "CodeSniffer/Tokenizers/", + "CodeSniffer/DocGenerators/", + "CodeSniffer/Standards/AbstractPatternSniff.php", + "CodeSniffer/Standards/AbstractScopeSniff.php", + "CodeSniffer/Standards/AbstractVariableSniff.php", + "CodeSniffer/Standards/IncorrectPatternException.php", + "CodeSniffer/Standards/Generic/Sniffs/", + "CodeSniffer/Standards/MySource/Sniffs/", + "CodeSniffer/Standards/PEAR/Sniffs/", + "CodeSniffer/Standards/PSR1/Sniffs/", + "CodeSniffer/Standards/PSR2/Sniffs/", + "CodeSniffer/Standards/Squiz/Sniffs/", + "CodeSniffer/Standards/Zend/Sniffs/" + ] + }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" @@ -239,7 +269,7 @@ "phpcs", "standards" ], - "time": "2017-09-19T22:47:14+00:00" + "time": "2017-05-22T02:43:20+00:00" }, { "name": "wimg/php-compatibility", @@ -247,12 +277,12 @@ "source": { "type": "git", "url": "https://github.com/wimg/PHPCompatibility.git", - "reference": "e3a7ae6920033130f4cd76cf09384481224f206f" + "reference": "514be0f250b2f4d1a18dbbd12e4063810ba22eec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wimg/PHPCompatibility/zipball/e3a7ae6920033130f4cd76cf09384481224f206f", - "reference": "e3a7ae6920033130f4cd76cf09384481224f206f", + "url": "https://api.github.com/repos/wimg/PHPCompatibility/zipball/514be0f250b2f4d1a18dbbd12e4063810ba22eec", + "reference": "514be0f250b2f4d1a18dbbd12e4063810ba22eec", "shasum": "" }, "require": { @@ -291,30 +321,26 @@ "phpcs", "standards" ], - "time": "2017-08-07 19:44:46" + "time": "2017-12-02T01:33:23+00:00" }, { "name": "wp-coding-standards/wpcs", - "version": "dev-develop", + "version": "0.11.0", "source": { "type": "git", "url": "https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards.git", - "reference": "b19535707965e6f185f6fc678b044d8c7f0b1b50" + "reference": "407e4b85f547a5251185f89ceae6599917343388" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/WordPress-Coding-Standards/WordPress-Coding-Standards/zipball/b19535707965e6f185f6fc678b044d8c7f0b1b50", - "reference": "b19535707965e6f185f6fc678b044d8c7f0b1b50", + "url": "https://api.github.com/repos/WordPress-Coding-Standards/WordPress-Coding-Standards/zipball/407e4b85f547a5251185f89ceae6599917343388", + "reference": "407e4b85f547a5251185f89ceae6599917343388", "shasum": "" }, "require": { - "php": ">=5.3", - "squizlabs/php_codesniffer": "^2.9.0 || ^3.0.2" + "squizlabs/php_codesniffer": "^2.8.1" }, - "suggest": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.4.3" - }, - "type": "phpcodesniffer-standard", + "type": "library", "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" @@ -331,14 +357,13 @@ "standards", "wordpress" ], - "time": "2017-10-09T13:04:35+00:00" + "time": "2017-03-20T23:17:58+00:00" } ], "aliases": [], "minimum-stability": "stable", "stability-flags": { - "wimg/php-compatibility": 20, - "wp-coding-standards/wpcs": 20 + "wimg/php-compatibility": 20 }, "prefer-stable": false, "prefer-lowest": false, From 4e4055f41a1611959eb6dabfd527985c7ebcd8a6 Mon Sep 17 00:00:00 2001 From: Julien Melissas Date: Sun, 3 Dec 2017 16:01:38 -0600 Subject: [PATCH 3/5] Updating WPCS dependency See https://github.com/WordPress/gutenberg/pull/1229#discussion_r148927388 --- composer.json | 2 +- composer.lock | 20 ++++++++++++-------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index 6237bac287b9c5..2281092ed646d5 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "dealerdirect/phpcodesniffer-composer-installer": "^0.4", "squizlabs/php_codesniffer": "2.9.x", "wimg/php-compatibility": "dev-master", - "wp-coding-standards/wpcs": "^0.11.0" + "wp-coding-standards/wpcs": "^0.14.0" }, "require": { "composer/installers": "~1.0" diff --git a/composer.lock b/composer.lock index 5b7f127e059bb0..4008f1d49647f0 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "d98e7d96aa3ad8c24dac1961b911e432", + "content-hash": "821a327b738d3d60715ef0eaad02f1a7", "packages": [ { "name": "composer/installers", @@ -325,22 +325,26 @@ }, { "name": "wp-coding-standards/wpcs", - "version": "0.11.0", + "version": "0.14.0", "source": { "type": "git", "url": "https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards.git", - "reference": "407e4b85f547a5251185f89ceae6599917343388" + "reference": "8cadf48fa1c70b2381988e0a79e029e011a8f41c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/WordPress-Coding-Standards/WordPress-Coding-Standards/zipball/407e4b85f547a5251185f89ceae6599917343388", - "reference": "407e4b85f547a5251185f89ceae6599917343388", + "url": "https://api.github.com/repos/WordPress-Coding-Standards/WordPress-Coding-Standards/zipball/8cadf48fa1c70b2381988e0a79e029e011a8f41c", + "reference": "8cadf48fa1c70b2381988e0a79e029e011a8f41c", "shasum": "" }, "require": { - "squizlabs/php_codesniffer": "^2.8.1" + "php": ">=5.3", + "squizlabs/php_codesniffer": "^2.9.0 || ^3.0.2" }, - "type": "library", + "suggest": { + "dealerdirect/phpcodesniffer-composer-installer": "^0.4.3" + }, + "type": "phpcodesniffer-standard", "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" @@ -357,7 +361,7 @@ "standards", "wordpress" ], - "time": "2017-03-20T23:17:58+00:00" + "time": "2017-11-01T15:10:46+00:00" } ], "aliases": [], From 0beea63189caf49240ec029a2f57895845edde75 Mon Sep 17 00:00:00 2001 From: Julien Melissas Date: Mon, 4 Dec 2017 14:06:04 -0500 Subject: [PATCH 4/5] Updated dev dependencies, removed redundant "lint" script. --- composer.json | 9 +++----- composer.lock | 63 ++++++++++++++------------------------------------- 2 files changed, 20 insertions(+), 52 deletions(-) diff --git a/composer.json b/composer.json index 2281092ed646d5..dd99c99fb170c4 100644 --- a/composer.json +++ b/composer.json @@ -11,15 +11,12 @@ "issues": "https://github.com/WordPress/gutenberg/issues" }, "require-dev": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.4", - "squizlabs/php_codesniffer": "2.9.x", - "wimg/php-compatibility": "dev-master", + "dealerdirect/phpcodesniffer-composer-installer": "^0.4.3", + "squizlabs/php_codesniffer": "^3.1", + "wimg/php-compatibility": "^8", "wp-coding-standards/wpcs": "^0.14.0" }, "require": { "composer/installers": "~1.0" - }, - "scripts": { - "lint": "phpcs" } } diff --git a/composer.lock b/composer.lock index 4008f1d49647f0..0971f6bb68e7d1 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "821a327b738d3d60715ef0eaad02f1a7", + "content-hash": "6294e908cbc6a7c0e62e92f44e7a428c", "packages": [ { "name": "composer/installers", @@ -195,64 +195,37 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "2.9.1", + "version": "3.1.1", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "dcbed1074f8244661eecddfc2a675430d8d33f62" + "reference": "d667e245d5dcd4d7bf80f26f2c947d476b66213e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/dcbed1074f8244661eecddfc2a675430d8d33f62", - "reference": "dcbed1074f8244661eecddfc2a675430d8d33f62", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/d667e245d5dcd4d7bf80f26f2c947d476b66213e", + "reference": "d667e245d5dcd4d7bf80f26f2c947d476b66213e", "shasum": "" }, "require": { "ext-simplexml": "*", "ext-tokenizer": "*", "ext-xmlwriter": "*", - "php": ">=5.1.2" + "php": ">=5.4.0" }, "require-dev": { - "phpunit/phpunit": "~4.0" + "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0" }, "bin": [ - "scripts/phpcs", - "scripts/phpcbf" + "bin/phpcs", + "bin/phpcbf" ], "type": "library", "extra": { "branch-alias": { - "dev-master": "2.x-dev" + "dev-master": "3.x-dev" } }, - "autoload": { - "classmap": [ - "CodeSniffer.php", - "CodeSniffer/CLI.php", - "CodeSniffer/Exception.php", - "CodeSniffer/File.php", - "CodeSniffer/Fixer.php", - "CodeSniffer/Report.php", - "CodeSniffer/Reporting.php", - "CodeSniffer/Sniff.php", - "CodeSniffer/Tokens.php", - "CodeSniffer/Reports/", - "CodeSniffer/Tokenizers/", - "CodeSniffer/DocGenerators/", - "CodeSniffer/Standards/AbstractPatternSniff.php", - "CodeSniffer/Standards/AbstractScopeSniff.php", - "CodeSniffer/Standards/AbstractVariableSniff.php", - "CodeSniffer/Standards/IncorrectPatternException.php", - "CodeSniffer/Standards/Generic/Sniffs/", - "CodeSniffer/Standards/MySource/Sniffs/", - "CodeSniffer/Standards/PEAR/Sniffs/", - "CodeSniffer/Standards/PSR1/Sniffs/", - "CodeSniffer/Standards/PSR2/Sniffs/", - "CodeSniffer/Standards/Squiz/Sniffs/", - "CodeSniffer/Standards/Zend/Sniffs/" - ] - }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" @@ -269,20 +242,20 @@ "phpcs", "standards" ], - "time": "2017-05-22T02:43:20+00:00" + "time": "2017-10-16T22:40:25+00:00" }, { "name": "wimg/php-compatibility", - "version": "dev-master", + "version": "8.0.1", "source": { "type": "git", "url": "https://github.com/wimg/PHPCompatibility.git", - "reference": "514be0f250b2f4d1a18dbbd12e4063810ba22eec" + "reference": "4c4385fb891dff0501009670f988d4fe36785249" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wimg/PHPCompatibility/zipball/514be0f250b2f4d1a18dbbd12e4063810ba22eec", - "reference": "514be0f250b2f4d1a18dbbd12e4063810ba22eec", + "url": "https://api.github.com/repos/wimg/PHPCompatibility/zipball/4c4385fb891dff0501009670f988d4fe36785249", + "reference": "4c4385fb891dff0501009670f988d4fe36785249", "shasum": "" }, "require": { @@ -321,7 +294,7 @@ "phpcs", "standards" ], - "time": "2017-12-02T01:33:23+00:00" + "time": "2017-08-07T19:39:05+00:00" }, { "name": "wp-coding-standards/wpcs", @@ -366,9 +339,7 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": { - "wimg/php-compatibility": 20 - }, + "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, "platform": [], From 563aa6955ed1db6831e5ab66bb8490960a4c31d0 Mon Sep 17 00:00:00 2001 From: Stephen Edgar Date: Sat, 9 Dec 2017 15:24:30 +1100 Subject: [PATCH 5/5] Update license to GPL-2.0+ --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index dd99c99fb170c4..e7a9035844fec9 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "wordpress/gutenberg", "type": "wordpress-plugin", - "license": "GPL-2.0", + "license": "GPL-2.0+", "description": "Prototyping since 1440. Development hub for the editor focus in core.", "homepage": "https://wordpress.github.io/gutenberg/", "keywords": [