From 3b3da3938da48996c220c0da90287e808a93d82d Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Thu, 7 Aug 2014 15:16:58 +0200 Subject: [PATCH 1/8] [ticket/12920] Add composer.json for phpbb/phpbb-core library PHPBB3-12920 --- phpBB/phpbb/composer.json | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 phpBB/phpbb/composer.json diff --git a/phpBB/phpbb/composer.json b/phpBB/phpbb/composer.json new file mode 100644 index 0000000000..1d6e6bca5b --- /dev/null +++ b/phpBB/phpbb/composer.json @@ -0,0 +1,24 @@ +{ + "name": "phpbb/phpbb-core", + "description": "Collection of core phpBB libraries", + "type": "library", + "keywords": ["phpbb", "forum"], + "homepage": "https://www.phpbb.com", + "license": "GPL-2.0", + "authors": [ + { + "name": "phpBB Limited", + "email": "operations@phpbb.com", + "homepage": "https://www.phpbb.com/go/authors" + } + ], + "support": { + "issues": "https://tracker.phpbb.com", + "forum": "https://www.phpbb.com/community/", + "wiki": "https://wiki.phpbb.com", + "irc": "irc://irc.freenode.org/phpbb" + }, + "autoload": { + "classmap": [""] + } +} From 200c6f2d32bbed4751c284d83799c4e2b787f7f3 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Thu, 7 Aug 2014 15:25:47 +0200 Subject: [PATCH 2/8] [ticket/12920] Add require for minimum php version PHPBB3-12920 --- phpBB/phpbb/composer.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/phpBB/phpbb/composer.json b/phpBB/phpbb/composer.json index 1d6e6bca5b..606a2784bc 100644 --- a/phpBB/phpbb/composer.json +++ b/phpBB/phpbb/composer.json @@ -21,4 +21,7 @@ "autoload": { "classmap": [""] } + "require": { + "php": ">=5.3.3" + } } From c863136a69091e8a9cf6806ed50be18d7a5572f7 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Thu, 7 Aug 2014 15:26:02 +0200 Subject: [PATCH 3/8] [ticket/12920] Turn phpBB composer.json into publishable full version PHPBB3-12920 --- phpBB/composer.json | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/phpBB/composer.json b/phpBB/composer.json index 9b473a3bb7..7900531cfb 100644 --- a/phpBB/composer.json +++ b/phpBB/composer.json @@ -1,9 +1,28 @@ { - "_readme": [ - "You MUST update the clean-vendor-dir target in build/build.xml", - "accordingly when adding or upgrading dependencies." + "name": "phpbb/phpbb", + "description": "phpBB Forum Software application", + "type": "project", + "keywords": ["phpbb", "forum"], + "homepage": "https://www.phpbb.com", + "license": "GPL-2.0", + "authors": [ + { + "name": "phpBB Limited", + "email": "operations@phpbb.com", + "homepage": "https://www.phpbb.com/go/authors" + } ], + "support": { + "issues": "https://tracker.phpbb.com", + "forum": "https://www.phpbb.com/community/", + "wiki": "https://wiki.phpbb.com", + "irc": "irc://irc.freenode.org/phpbb" + }, + "replace": { + "phpbb/phpbb-core": "@self.version" + } "require": { + "php": ">=5.3.3", "lusitanian/oauth": "0.2.*", "symfony/config": "2.3.*", "symfony/console": "2.3.*", From e0b7a3e9ffcda9d9e8009c9b8de0299db8e69307 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Thu, 7 Aug 2014 15:37:13 +0200 Subject: [PATCH 4/8] [ticket/12920] Output warning message about vendor cleaning target PHPBB3-12920 --- phpBB/composer.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/phpBB/composer.json b/phpBB/composer.json index 7900531cfb..4716f0770f 100644 --- a/phpBB/composer.json +++ b/phpBB/composer.json @@ -18,9 +18,12 @@ "wiki": "https://wiki.phpbb.com", "irc": "irc://irc.freenode.org/phpbb" }, + "scripts": { + "post-update-cmd": "echo 'You MUST manually modify the clean-vendor-dir target in build/build.xml when adding or upgrading dependencies." + }, "replace": { "phpbb/phpbb-core": "@self.version" - } + }, "require": { "php": ">=5.3.3", "lusitanian/oauth": "0.2.*", From 9e282b8d4dab308aec958a23f504493bbf2cd292 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Thu, 7 Aug 2014 15:38:04 +0200 Subject: [PATCH 5/8] [ticket/12920] Remove incorrect @ from self.version reference in composer.json PHPBB3-12920 --- phpBB/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/composer.json b/phpBB/composer.json index 4716f0770f..68d55b4d06 100644 --- a/phpBB/composer.json +++ b/phpBB/composer.json @@ -22,7 +22,7 @@ "post-update-cmd": "echo 'You MUST manually modify the clean-vendor-dir target in build/build.xml when adding or upgrading dependencies." }, "replace": { - "phpbb/phpbb-core": "@self.version" + "phpbb/phpbb-core": "self.version" }, "require": { "php": ">=5.3.3", From 9f3e6781170feda2f03250094bca6c4a540d75e9 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Thu, 7 Aug 2014 15:40:57 +0200 Subject: [PATCH 6/8] [ticket/12920] Fix sh syntax error in post-update-cmd script PHPBB3-12920 --- phpBB/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/composer.json b/phpBB/composer.json index 68d55b4d06..0ab30b0837 100644 --- a/phpBB/composer.json +++ b/phpBB/composer.json @@ -19,7 +19,7 @@ "irc": "irc://irc.freenode.org/phpbb" }, "scripts": { - "post-update-cmd": "echo 'You MUST manually modify the clean-vendor-dir target in build/build.xml when adding or upgrading dependencies." + "post-update-cmd": "echo 'You MUST manually modify the clean-vendor-dir target in build/build.xml when adding or upgrading dependencies.'" }, "replace": { "phpbb/phpbb-core": "self.version" From b9fb4e305056a4109e07c42a44d5a9c464c815d5 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Thu, 7 Aug 2014 15:43:44 +0200 Subject: [PATCH 7/8] [ticket/12920] Update composer.lock file after update nothing PHPBB3-12920 --- phpBB/composer.lock | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/phpBB/composer.lock b/phpBB/composer.lock index 751cd0695f..3860a98b31 100644 --- a/phpBB/composer.lock +++ b/phpBB/composer.lock @@ -3,7 +3,7 @@ "This file locks the dependencies of your project to a known state", "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" ], - "hash": "dcd46c1373cfc4dacd2e1f8a79da0b91", + "hash": "6bc742a2b9feb426db9987d27085f915", "packages": [ { "name": "lusitanian/oauth", @@ -254,15 +254,13 @@ "MIT" ], "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com", - "homepage": "http://fabien.potencier.org", - "role": "Lead Developer" - }, { "name": "Symfony Community", "homepage": "http://symfony.com/contributors" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" } ], "description": "Symfony Debug Component", @@ -2430,17 +2428,11 @@ "time": "2014-05-17 21:49:26" } ], - "aliases": [ - - ], + "aliases": [], "minimum-stability": "stable", - "stability-flags": [ - - ], - "platform": [ - - ], - "platform-dev": [ - - ] + "stability-flags": [], + "platform": { + "php": ">=5.3.3" + }, + "platform-dev": [] } From be04b6c136d6b5073cff48fc717718c983597157 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Thu, 7 Aug 2014 15:44:36 +0200 Subject: [PATCH 8/8] [ticket/12920] Add missing comma PHPBB3-12920 --- phpBB/phpbb/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/phpbb/composer.json b/phpBB/phpbb/composer.json index 606a2784bc..513d7e4559 100644 --- a/phpBB/phpbb/composer.json +++ b/phpBB/phpbb/composer.json @@ -20,7 +20,7 @@ }, "autoload": { "classmap": [""] - } + }, "require": { "php": ">=5.3.3" }