From 597297b169e2ae14684ad1f40c8e083be22b241d Mon Sep 17 00:00:00 2001 From: Mate Bartus Date: Sun, 18 Oct 2015 22:47:04 +0200 Subject: [ticket/14044] Deduplicate the installers PHPBB3-14044 --- phpBB/install/phpbbcli.php | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 phpBB/install/phpbbcli.php (limited to 'phpBB/install/phpbbcli.php') diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php new file mode 100644 index 0000000000..ecdb66ade3 --- /dev/null +++ b/phpBB/install/phpbbcli.php @@ -0,0 +1,44 @@ +#!/usr/bin/env php + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +if (php_sapi_name() !== 'cli') +{ + echo 'This program must be run from the command line.' . PHP_EOL; + exit(1); +} + +define('IN_PHPBB', true); +define('IN_INSTALL', true); +define('PHPBB_ENVIRONMENT', 'production'); +$phpbb_root_path = __DIR__ . '/../'; +$phpEx = substr(strrchr(__FILE__, '.'), 1); + +// +// Let's do the common.php logic +// +$startup_new_path = $phpbb_root_path . 'install/update/update/new/install/startup.' . $phpEx; +$startup_path = (file_exists($startup_new_path)) ? $startup_new_path : $phpbb_root_path . 'install/startup.' . $phpEx; +require($startup_path); + +/** @var \phpbb\filesystem\filesystem $phpbb_filesystem */ +$phpbb_filesystem = $phpbb_installer_container->get('filesystem'); + +/** @var \phpbb\language\language $language */ +$language = $phpbb_installer_container->get('language'); +$language->add_lang(array('common', 'acp/common', 'acp/board', 'install', 'posting', 'cli')); + +$application = new \phpbb\console\application('phpBB Installer', PHPBB_VERSION, $language); +$application->setDispatcher($phpbb_installer_container->get('dispatcher')); +$application->register_container_commands($phpbb_installer_container->get('console.installer.command_collection')); +$application->run($input); -- cgit v1.2.1 From 079b3d074d905c1982ec22840caae808c3b588f3 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 10 Nov 2015 15:01:18 +0100 Subject: [ticket/14281] Fix installer CLI after recent changes PHPBB3-14281 --- phpBB/install/phpbbcli.php | 4 ++++ 1 file changed, 4 insertions(+) mode change 100644 => 100755 phpBB/install/phpbbcli.php (limited to 'phpBB/install/phpbbcli.php') diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php old mode 100644 new mode 100755 index ecdb66ade3..e36922f1a5 --- a/phpBB/install/phpbbcli.php +++ b/phpBB/install/phpbbcli.php @@ -12,6 +12,8 @@ * */ +use Symfony\Component\Console\Input\ArgvInput; + if (php_sapi_name() !== 'cli') { echo 'This program must be run from the command line.' . PHP_EOL; @@ -31,6 +33,8 @@ $startup_new_path = $phpbb_root_path . 'install/update/update/new/install/startu $startup_path = (file_exists($startup_new_path)) ? $startup_new_path : $phpbb_root_path . 'install/startup.' . $phpEx; require($startup_path); +$input = new ArgvInput(); + /** @var \phpbb\filesystem\filesystem $phpbb_filesystem */ $phpbb_filesystem = $phpbb_installer_container->get('filesystem'); -- cgit v1.2.1 From 2d3e340f1910d93a6d7aa672f26f8dbeb4f74a6d Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 8 Dec 2015 22:14:25 +0100 Subject: [ticket/14349] Suppress output due to duplicate definition in installer PHPBB3-14349 --- phpBB/install/phpbbcli.php | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/install/phpbbcli.php') diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php index e36922f1a5..649d0c4283 100755 --- a/phpBB/install/phpbbcli.php +++ b/phpBB/install/phpbbcli.php @@ -23,6 +23,7 @@ if (php_sapi_name() !== 'cli') define('IN_PHPBB', true); define('IN_INSTALL', true); define('PHPBB_ENVIRONMENT', 'production'); +define('PHPBB_VERSION', '3.2.0-a2-dev'); $phpbb_root_path = __DIR__ . '/../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); -- cgit v1.2.1 From f80ec7e7864d686a4ac392a4c9d100960ddb83c7 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Wed, 3 Feb 2016 21:41:22 +0100 Subject: [prep-release-3.2.0-b1] Update version to 3.2.0-b1 --- phpBB/install/phpbbcli.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/install/phpbbcli.php') diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php index 649d0c4283..aa7256577f 100755 --- a/phpBB/install/phpbbcli.php +++ b/phpBB/install/phpbbcli.php @@ -23,7 +23,7 @@ if (php_sapi_name() !== 'cli') define('IN_PHPBB', true); define('IN_INSTALL', true); define('PHPBB_ENVIRONMENT', 'production'); -define('PHPBB_VERSION', '3.2.0-a2-dev'); +define('PHPBB_VERSION', '3.2.0-b1'); $phpbb_root_path = __DIR__ . '/../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); -- cgit v1.2.1 From dab282e664012a7292f310d52c99c952fc85a7ca Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Fri, 5 Feb 2016 17:12:39 +0100 Subject: [release-3.2.0-b1] Update version to 3.2.0-b2-dev --- phpBB/install/phpbbcli.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/install/phpbbcli.php') diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php index aa7256577f..70a8a9c7ea 100755 --- a/phpBB/install/phpbbcli.php +++ b/phpBB/install/phpbbcli.php @@ -23,7 +23,7 @@ if (php_sapi_name() !== 'cli') define('IN_PHPBB', true); define('IN_INSTALL', true); define('PHPBB_ENVIRONMENT', 'production'); -define('PHPBB_VERSION', '3.2.0-b1'); +define('PHPBB_VERSION', '3.2.0-b2-dev'); $phpbb_root_path = __DIR__ . '/../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); -- cgit v1.2.1 From 294f926bfccc6be8a7098923b4c55ebab66e83e3 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Wed, 24 Feb 2016 22:24:08 +0100 Subject: [ticket/14495] Updates the version to 3.3.0-a1-dev PHPBB3-14495 --- phpBB/install/phpbbcli.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/install/phpbbcli.php') diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php index 70a8a9c7ea..a7e700c7cd 100755 --- a/phpBB/install/phpbbcli.php +++ b/phpBB/install/phpbbcli.php @@ -23,7 +23,7 @@ if (php_sapi_name() !== 'cli') define('IN_PHPBB', true); define('IN_INSTALL', true); define('PHPBB_ENVIRONMENT', 'production'); -define('PHPBB_VERSION', '3.2.0-b2-dev'); +define('PHPBB_VERSION', '3.3.0-a1-dev'); $phpbb_root_path = __DIR__ . '/../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); -- cgit v1.2.1 From f65207b9353dac35c23abd7772b41f8b594b7aea Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 28 Feb 2016 12:28:21 +0100 Subject: [ticket/14503] Enable superglobals in cli This is for example needed for outputting help on commands. PHPBB3-14503 --- phpBB/install/phpbbcli.php | 3 +++ 1 file changed, 3 insertions(+) (limited to 'phpBB/install/phpbbcli.php') diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php index 70a8a9c7ea..6b0ac39f84 100755 --- a/phpBB/install/phpbbcli.php +++ b/phpBB/install/phpbbcli.php @@ -36,6 +36,9 @@ require($startup_path); $input = new ArgvInput(); +// Enable superglobals for cli support +$phpbb_installer_container->get('request')->enable_super_globals(); + /** @var \phpbb\filesystem\filesystem $phpbb_filesystem */ $phpbb_filesystem = $phpbb_installer_container->get('filesystem'); -- cgit v1.2.1 From 83b56f7855bcd43dd73499c90c5f9fedf127da0e Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 2 Apr 2016 10:06:59 +0200 Subject: [ticket/14495] Specify correct version numbers in 3.2.x DO NOT apply these changes into master when merging it. This means that you'll have to checkout the latest files from upstream after merging this into master (possibly while resolving likely merge conflicts). PHPBB3-14495 --- phpBB/install/phpbbcli.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/install/phpbbcli.php') diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php index 4b86f64e2a..87eab84b5a 100755 --- a/phpBB/install/phpbbcli.php +++ b/phpBB/install/phpbbcli.php @@ -23,7 +23,7 @@ if (php_sapi_name() !== 'cli') define('IN_PHPBB', true); define('IN_INSTALL', true); define('PHPBB_ENVIRONMENT', 'production'); -define('PHPBB_VERSION', '3.3.0-a1-dev'); +define('PHPBB_VERSION', '3.2.0-b3-dev'); $phpbb_root_path = __DIR__ . '/../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); -- cgit v1.2.1 From 2eb8a97f4739c12d3b0b3026bd1a013f2c54a076 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Fri, 29 Apr 2016 20:21:25 +0200 Subject: [prep-release-3.2.0-RC1] Update version to 3.2.0-RC1 --- phpBB/install/phpbbcli.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/install/phpbbcli.php') diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php index 87eab84b5a..3803fe7034 100755 --- a/phpBB/install/phpbbcli.php +++ b/phpBB/install/phpbbcli.php @@ -23,7 +23,7 @@ if (php_sapi_name() !== 'cli') define('IN_PHPBB', true); define('IN_INSTALL', true); define('PHPBB_ENVIRONMENT', 'production'); -define('PHPBB_VERSION', '3.2.0-b3-dev'); +define('PHPBB_VERSION', '3.2.0-RC1'); $phpbb_root_path = __DIR__ . '/../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); -- cgit v1.2.1 From 185bda094b9e85505526463747a30bc5bb529666 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 6 Dec 2016 15:32:48 +0100 Subject: [prep-release-3.2.0-RC2] Update version numbers to 3.2.0-RC2 --- phpBB/install/phpbbcli.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/install/phpbbcli.php') diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php index 3803fe7034..7de40e08cf 100755 --- a/phpBB/install/phpbbcli.php +++ b/phpBB/install/phpbbcli.php @@ -23,7 +23,7 @@ if (php_sapi_name() !== 'cli') define('IN_PHPBB', true); define('IN_INSTALL', true); define('PHPBB_ENVIRONMENT', 'production'); -define('PHPBB_VERSION', '3.2.0-RC1'); +define('PHPBB_VERSION', '3.2.0-RC2'); $phpbb_root_path = __DIR__ . '/../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); -- cgit v1.2.1 From cff3dbf00e4a83d59398a278e78e1052abf4e08a Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 10 Dec 2016 00:32:41 +0100 Subject: [3.2.x] Update version numbers to 3.2.0-RC3-dev --- phpBB/install/phpbbcli.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/install/phpbbcli.php') diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php index 7de40e08cf..f5dfa83712 100755 --- a/phpBB/install/phpbbcli.php +++ b/phpBB/install/phpbbcli.php @@ -23,7 +23,7 @@ if (php_sapi_name() !== 'cli') define('IN_PHPBB', true); define('IN_INSTALL', true); define('PHPBB_ENVIRONMENT', 'production'); -define('PHPBB_VERSION', '3.2.0-RC2'); +define('PHPBB_VERSION', '3.2.0-RC3-dev'); $phpbb_root_path = __DIR__ . '/../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); -- cgit v1.2.1 From da8ec61ab2dba1c8bb770932a6983cddbbb1251c Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 7 Jan 2017 11:48:15 +0100 Subject: [prep-release-3.2.0] Update version numbers and add 3.2.0 migration --- phpBB/install/phpbbcli.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/install/phpbbcli.php') diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php index f5dfa83712..c67766e8a1 100755 --- a/phpBB/install/phpbbcli.php +++ b/phpBB/install/phpbbcli.php @@ -23,7 +23,7 @@ if (php_sapi_name() !== 'cli') define('IN_PHPBB', true); define('IN_INSTALL', true); define('PHPBB_ENVIRONMENT', 'production'); -define('PHPBB_VERSION', '3.2.0-RC3-dev'); +define('PHPBB_VERSION', '3.2.0'); $phpbb_root_path = __DIR__ . '/../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); -- cgit v1.2.1 From d423b2ec0d94dba7ca303f7e91ba44dfbd60fe0f Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 25 Jun 2017 21:55:00 +0200 Subject: [prep-release-3.2.1] Update version numbers for 3.2.1-RC1 --- phpBB/install/phpbbcli.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/install/phpbbcli.php') diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php index c67766e8a1..afc70f3302 100755 --- a/phpBB/install/phpbbcli.php +++ b/phpBB/install/phpbbcli.php @@ -23,7 +23,7 @@ if (php_sapi_name() !== 'cli') define('IN_PHPBB', true); define('IN_INSTALL', true); define('PHPBB_ENVIRONMENT', 'production'); -define('PHPBB_VERSION', '3.2.0'); +define('PHPBB_VERSION', '3.2.1-RC1'); $phpbb_root_path = __DIR__ . '/../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); -- cgit v1.2.1