From af7f8d6cc319e9b99b5c2f6a22554a1ea61238f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Pedro=20Algarvio?= Date: Fri, 5 May 2017 12:51:57 +0100 Subject: [PATCH 1/2] Change composer package type to project (#13198) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Composer doesn't seem to support packages of type application. Package type library (the default) or project seem to be the most appropriate. Signed-off-by: Luís Pedro Algarvio --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 362f08f802..d85b3c8a20 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "phpmyadmin/phpmyadmin", - "type": "application", + "type": "project", "description": "MySQL web administration tool", "keywords": ["phpmyadmin","mysql","web"], "homepage": "https://www.phpmyadmin.net/", From 9ea8970c8f74cd87821c9e2599a5ffe47ce08c14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Pedro=20Algarvio?= Date: Fri, 5 May 2017 12:53:28 +0100 Subject: [PATCH 2/2] Reorder a few keys in the composer.json file (#13199) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reorder a few keys to make the composer.json file feel a bit more organized: - repositories key goes above all the dependencies - pair homepage with support key and move them to position after name, description and keywords - pair authors with license key and move them to position just before technical stuff Signed-off-by: Luís Pedro Algarvio --- composer.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/composer.json b/composer.json index d85b3c8a20..02f037a849 100644 --- a/composer.json +++ b/composer.json @@ -4,6 +4,13 @@ "description": "MySQL web administration tool", "keywords": ["phpmyadmin","mysql","web"], "homepage": "https://www.phpmyadmin.net/", + "support": { + "forum": "https://www.phpmyadmin.net/support/", + "issues": "https://github.com/phpmyadmin/phpmyadmin/issues", + "wiki": "https://wiki.phpmyadmin.net/", + "docs": "https://docs.phpmyadmin.net/", + "source": "https://github.com/phpmyadmin/phpmyadmin" + }, "license": "GPL-2.0+", "authors": [ { @@ -12,19 +19,18 @@ "homepage": "https://www.phpmyadmin.net/team/" } ], - "support": { - "forum": "https://www.phpmyadmin.net/support/", - "issues": "https://github.com/phpmyadmin/phpmyadmin/issues", - "wiki": "https://wiki.phpmyadmin.net/", - "docs": "https://docs.phpmyadmin.net/", - "source": "https://github.com/phpmyadmin/phpmyadmin" - }, "non-feature-branches": ["RELEASE_.*"], "autoload": { "psr-4": { "PMA\\": "./" } }, + "repositories": [ + { + "type": "composer", + "url": "https://www.phpmyadmin.net" + } + ], "require": { "php": ">=5.5.0", "ext-mbstring": "*", @@ -56,11 +62,5 @@ "phpunit/phpunit-selenium": "~1.2", "squizlabs/php_codesniffer": "2.*", "phpmyadmin/coding-standard": ">=0.1.0" - }, - "repositories": [ - { - "type": "composer", - "url": "https://www.phpmyadmin.net" - } - ] + } }