From 228e0f58a84049231f9cff881433b1b331f806ed Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Sun, 11 Sep 2016 13:41:33 +0200
Subject: [ticket/14769] Fix CLI installer configuration compatibility with SF
3
PHPBB3-14769
---
phpBB/phpbb/install/installer_configuration.php | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
(limited to 'phpBB/phpbb/install')
diff --git a/phpBB/phpbb/install/installer_configuration.php b/phpBB/phpbb/install/installer_configuration.php
index 805140338c..dfafc40b4b 100644
--- a/phpBB/phpbb/install/installer_configuration.php
+++ b/phpBB/phpbb/install/installer_configuration.php
@@ -48,9 +48,9 @@ class installer_configuration implements ConfigurationInterface
->cannotBeEmpty()
->end()
->scalarNode('description')
- ->defaultValue('My amazing new phpBB board')
- ->cannotBeEmpty()
- ->end()
+ ->defaultValue('My amazing new phpBB board')
+ ->cannotBeEmpty()
+ ->end()
->end()
->end()
->arrayNode('database')
@@ -128,12 +128,11 @@ class installer_configuration implements ConfigurationInterface
->integerNode('server_port')
->defaultValue(80)
->min(1)
- ->cannotBeEmpty()
->end()
->scalarNode('script_path')
->defaultValue('/')
->cannotBeEmpty()
- ->end()
+ ->end()
->end()
->end()
->arrayNode('extensions')
--
cgit v1.2.1
From a9a28859d4852be72ce782d079ee3183c4d54852 Mon Sep 17 00:00:00 2001
From: luzpaz <luzpaz@@users.noreply.github.com>
Date: Tue, 15 Aug 2017 15:00:12 -0400
Subject: [ticket/15424] Multiple typo fixes in docs & comments
Fixed typos in some docs, guidelines, some non-user-facing files.
PHPBB3-15424
---
phpBB/phpbb/install/helper/container_factory.php | 2 +-
phpBB/phpbb/install/helper/iohandler/iohandler_interface.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
(limited to 'phpBB/phpbb/install')
diff --git a/phpBB/phpbb/install/helper/container_factory.php b/phpBB/phpbb/install/helper/container_factory.php
index 9e372fecde..655760270a 100644
--- a/phpBB/phpbb/install/helper/container_factory.php
+++ b/phpBB/phpbb/install/helper/container_factory.php
@@ -181,7 +181,7 @@ class container_factory
$this->request->disable_super_globals();
}
- // Get compatibilty globals and constants
+ // Get compatibility globals and constants
$this->update_helper->include_file('includes/compatibility_globals.' . $this->php_ext);
register_compatibility_globals();
diff --git a/phpBB/phpbb/install/helper/iohandler/iohandler_interface.php b/phpBB/phpbb/install/helper/iohandler/iohandler_interface.php
index 440748901c..3df9a91936 100644
--- a/phpBB/phpbb/install/helper/iohandler/iohandler_interface.php
+++ b/phpBB/phpbb/install/helper/iohandler/iohandler_interface.php
@@ -31,7 +31,7 @@ interface iohandler_interface
* @param string $name Name of the input variable to obtain
* @param mixed $default A default value that is returned if the variable was not set.
* This function will always return a value of the same type as the default.
- * @param bool $multibyte If $default is a string this paramater has to be true if the variable may contain any UTF-8 characters
+ * @param bool $multibyte If $default is a string this parameter has to be true if the variable may contain any UTF-8 characters
* Default is false, causing all bytes outside the ASCII range (0-127) to be replaced with question marks
*
* @return mixed Value of the input variable
--
cgit v1.2.1
From 139eb17bb729763ab670fb239c77db02e29920f6 Mon Sep 17 00:00:00 2001
From: Jakub Senko <jakubsenko@gmail.com>
Date: Mon, 18 Jun 2018 20:35:01 +0200
Subject: [ticket/12624] Add debug.load_time parameter
PHPBB3-12624
---
.../phpbb/install/module/install_filesystem/task/create_config_file.php | 1 -
1 file changed, 1 deletion(-)
(limited to 'phpBB/phpbb/install')
diff --git a/phpBB/phpbb/install/module/install_filesystem/task/create_config_file.php b/phpBB/phpbb/install/module/install_filesystem/task/create_config_file.php
index 5bc425b929..47537ba549 100644
--- a/phpBB/phpbb/install/module/install_filesystem/task/create_config_file.php
+++ b/phpBB/phpbb/install/module/install_filesystem/task/create_config_file.php
@@ -191,7 +191,6 @@ class create_config_file extends \phpbb\install\task_base
}
$config_content .= "\n@define('PHPBB_INSTALLED', true);\n";
- $config_content .= "// @define('PHPBB_DISPLAY_LOAD_TIME', true);\n";
if ($environment)
{
--
cgit v1.2.1
From e76c673e2e6a379ae7c4beccabfaaf8a5eb18371 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 30 Dec 2018 12:31:26 +0100
Subject: [ticket/14948] Update requirements and travis build matrix
PHPBB3-14948
---
.../phpbb/install/module/requirements/task/check_server_environment.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'phpBB/phpbb/install')
diff --git a/phpBB/phpbb/install/module/requirements/task/check_server_environment.php b/phpBB/phpbb/install/module/requirements/task/check_server_environment.php
index 29f9777747..4607ce9ec2 100644
--- a/phpBB/phpbb/install/module/requirements/task/check_server_environment.php
+++ b/phpBB/phpbb/install/module/requirements/task/check_server_environment.php
@@ -98,7 +98,7 @@ class check_server_environment extends \phpbb\install\task_base
{
$php_version = PHP_VERSION;
- if (version_compare($php_version, '5.4') < 0)
+ if (version_compare($php_version, '7.1') < 0)
{
$this->response_helper->add_error_message('PHP_VERSION_REQD', 'PHP_VERSION_REQD_EXPLAIN');
--
cgit v1.2.1
From 89ae1c3221c40b6394aa5da6bfc87d2f19ae4c9a Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 11 May 2019 17:30:43 +0200
Subject: [ticket/16052] Update version numbers to 3.3
PHPBB3-16052
---
.../phpbb/install/module/install_filesystem/task/create_config_file.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'phpBB/phpbb/install')
diff --git a/phpBB/phpbb/install/module/install_filesystem/task/create_config_file.php b/phpBB/phpbb/install/module/install_filesystem/task/create_config_file.php
index 47537ba549..900d5b94bc 100644
--- a/phpBB/phpbb/install/module/install_filesystem/task/create_config_file.php
+++ b/phpBB/phpbb/install/module/install_filesystem/task/create_config_file.php
@@ -165,7 +165,7 @@ class create_config_file extends \phpbb\install\task_base
protected function get_config_data($debug = false, $debug_container = false, $environment = null)
{
$config_content = "<?php\n";
- $config_content .= "// phpBB 3.2.x auto-generated configuration file\n// Do not change anything in this file!\n";
+ $config_content .= "// phpBB 3.3.x auto-generated configuration file\n// Do not change anything in this file!\n";
$dbms = $this->install_config->get('dbms');
$db_driver = $this->db_helper->get_available_dbms($dbms);
--
cgit v1.2.1
From bd02c5bd085e957aa4341e7fc2df2199081ab069 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 6 Oct 2019 12:07:35 +0200
Subject: [ticket/16051] Remove mysql driver as it's no longer supported in PHP
>= 7.0
PHPBB3-16051
---
phpBB/phpbb/install/helper/database.php | 18 ------------------
.../module/install_database/task/create_schema.php | 9 +--------
.../module/install_database/task/set_up_database.php | 9 +--------
3 files changed, 2 insertions(+), 34 deletions(-)
(limited to 'phpBB/phpbb/install')
diff --git a/phpBB/phpbb/install/helper/database.php b/phpBB/phpbb/install/helper/database.php
index fa5a10c6fc..51fd18f874 100644
--- a/phpBB/phpbb/install/helper/database.php
+++ b/phpBB/phpbb/install/helper/database.php
@@ -45,15 +45,6 @@ class database
'AVAILABLE' => true,
'2.0.x' => true,
),
- 'mysql' => array(
- 'LABEL' => 'MySQL',
- 'SCHEMA' => 'mysql',
- 'MODULE' => 'mysql',
- 'DELIM' => ';',
- 'DRIVER' => 'phpbb\db\driver\mysql',
- 'AVAILABLE' => true,
- '2.0.x' => true,
- ),
'mssql_odbc'=> array(
'LABEL' => 'MS SQL Server [ ODBC ]',
'SCHEMA' => 'mssql',
@@ -256,7 +247,6 @@ class database
$dbms_info = $this->get_available_dbms($dbms);
switch ($dbms_info[$dbms]['SCHEMA'])
{
- case 'mysql':
case 'mysql_41':
$prefix_length = 36;
break;
@@ -382,14 +372,6 @@ class database
// Check if database version is supported
switch ($dbms)
{
- case 'mysqli':
- if (version_compare($db->sql_server_info(true), '4.1.3', '<'))
- {
- $errors[] = array(
- 'title' => 'INST_ERR_DB_NO_MYSQLI',
- );
- }
- break;
case 'sqlite3':
if (version_compare($db->sql_server_info(true), '3.6.15', '<'))
{
diff --git a/phpBB/phpbb/install/module/install_database/task/create_schema.php b/phpBB/phpbb/install/module/install_database/task/create_schema.php
index a5635d5dbe..983bb42122 100644
--- a/phpBB/phpbb/install/module/install_database/task/create_schema.php
+++ b/phpBB/phpbb/install/module/install_database/task/create_schema.php
@@ -129,14 +129,7 @@ class create_schema extends \phpbb\install\task_base
if ($dbms === 'mysql')
{
- if (version_compare($this->db->sql_server_info(true), '4.1.3', '>='))
- {
- $schema_name .= '_41';
- }
- else
- {
- $schema_name .= '_40';
- }
+ $schema_name .= '_41';
}
$db_schema_path = $this->phpbb_root_path . 'install/schemas/' . $schema_name . '_schema.sql';
diff --git a/phpBB/phpbb/install/module/install_database/task/set_up_database.php b/phpBB/phpbb/install/module/install_database/task/set_up_database.php
index 49c8ea23ad..4da5ece228 100644
--- a/phpBB/phpbb/install/module/install_database/task/set_up_database.php
+++ b/phpBB/phpbb/install/module/install_database/task/set_up_database.php
@@ -102,14 +102,7 @@ class set_up_database extends \phpbb\install\task_base
if ($dbms === 'mysql')
{
- if (version_compare($this->db->sql_server_info(true), '4.1.3', '>='))
- {
- $schema_name .= '_41';
- }
- else
- {
- $schema_name .= '_40';
- }
+ $schema_name .= '_41';
}
$this->schema_file_path = $this->phpbb_root_path . 'install/schemas/' . $schema_name . '_schema.sql';
--
cgit v1.2.1
From e78632767c3c9eb9fc8c2757d3e6e8b5f1d60ced Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 20 Oct 2019 21:35:45 +0200
Subject: [ticket/15437] Rename jquery.min.js to jquery-3.4.1.min.js
PHPBB3-15437
---
phpBB/phpbb/install/controller/helper.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'phpBB/phpbb/install')
diff --git a/phpBB/phpbb/install/controller/helper.php b/phpBB/phpbb/install/controller/helper.php
index ff7e691224..f61c7de41f 100644
--- a/phpBB/phpbb/install/controller/helper.php
+++ b/phpBB/phpbb/install/controller/helper.php
@@ -267,7 +267,7 @@ class helper
'L_SKIP' => $this->language->lang('SKIP'),
'PAGE_TITLE' => $this->language->lang($page_title),
'T_IMAGE_PATH' => $this->path_helper->get_web_root_path() . $path . 'images',
- 'T_JQUERY_LINK' => $this->path_helper->get_web_root_path() . $path . '../assets/javascript/jquery.min.js',
+ 'T_JQUERY_LINK' => $this->path_helper->get_web_root_path() . $path . '../assets/javascript/jquery-3.4.1.min.js',
'T_TEMPLATE_PATH' => $this->path_helper->get_web_root_path() . $path . 'style',
'T_ASSETS_PATH' => $this->path_helper->get_web_root_path() . $path . '../assets',
--
cgit v1.2.1
From 9872316cac4df4987fdabc9512ca6ebeb7e5e04f Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 18 Nov 2019 21:06:00 +0100
Subject: [ticket/16167] Remove uses of user_email_hash
PHPBB3-16167
---
phpBB/phpbb/install/module/install_database/task/add_config_settings.php | 1 -
1 file changed, 1 deletion(-)
(limited to 'phpBB/phpbb/install')
diff --git a/phpBB/phpbb/install/module/install_database/task/add_config_settings.php b/phpBB/phpbb/install/module/install_database/task/add_config_settings.php
index ba439609ff..91d7884aa4 100644
--- a/phpBB/phpbb/install/module/install_database/task/add_config_settings.php
+++ b/phpBB/phpbb/install/module/install_database/task/add_config_settings.php
@@ -245,7 +245,6 @@ class add_config_settings extends \phpbb\install\task_base
user_lang = '" . $this->db->sql_escape($this->install_config->get('user_language', 'en')) . "',
user_email='" . $this->db->sql_escape($this->install_config->get('board_email')) . "',
user_dateformat='" . $this->db->sql_escape($this->language->lang('default_dateformat')) . "',
- user_email_hash = " . $this->db->sql_escape(phpbb_email_hash($this->install_config->get('board_email'))) . ",
username_clean = '" . $this->db->sql_escape(utf8_clean_string($this->install_config->get('admin_name'))) . "'
WHERE username = 'Admin'",
--
cgit v1.2.1
From d181713832d96b272c81c93d3f3a88bf848bdaac Mon Sep 17 00:00:00 2001
From: 3D-I <480857+3D-I@users.noreply.github.com>
Date: Sun, 22 Dec 2019 01:12:46 +0100
Subject: [ticket/16261] Missing check whether the index exists in install -
PHP 7.4
PHPBB3-16261
---
phpBB/phpbb/install/module_base.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'phpBB/phpbb/install')
diff --git a/phpBB/phpbb/install/module_base.php b/phpBB/phpbb/install/module_base.php
index 93c10bd656..4464a89716 100644
--- a/phpBB/phpbb/install/module_base.php
+++ b/phpBB/phpbb/install/module_base.php
@@ -131,7 +131,7 @@ abstract class module_base implements module_interface
$name,
));
- $this->install_config->increment_current_task_progress($this->task_step_count[$name]);
+ $this->install_config->increment_current_task_progress($this->task_step_count[$name] ?? false);
}
else
{
--
cgit v1.2.1
From 7ef52f723cbf9714fd5e8a94f6a9b0c7b3085f1e Mon Sep 17 00:00:00 2001
From: 3D-I <480857+3D-I@users.noreply.github.com>
Date: Tue, 31 Dec 2019 22:07:38 +0100
Subject: [ticket/16283] Update requirements for 3.3.0
PHPBB3-16283
---
.../phpbb/install/module/requirements/task/check_server_environment.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'phpBB/phpbb/install')
diff --git a/phpBB/phpbb/install/module/requirements/task/check_server_environment.php b/phpBB/phpbb/install/module/requirements/task/check_server_environment.php
index 4607ce9ec2..93fffb911f 100644
--- a/phpBB/phpbb/install/module/requirements/task/check_server_environment.php
+++ b/phpBB/phpbb/install/module/requirements/task/check_server_environment.php
@@ -98,7 +98,7 @@ class check_server_environment extends \phpbb\install\task_base
{
$php_version = PHP_VERSION;
- if (version_compare($php_version, '7.1') < 0)
+ if (version_compare($php_version, '7.1.3') < 0)
{
$this->response_helper->add_error_message('PHP_VERSION_REQD', 'PHP_VERSION_REQD_EXPLAIN');
--
cgit v1.2.1
From c7dd7d42c68fc039467c55577f1a60ee1be3a744 Mon Sep 17 00:00:00 2001
From: 3D-I <480857+3D-I@users.noreply.github.com>
Date: Wed, 1 Jan 2020 19:23:31 +0100
Subject: [ticket/16283] Update requirements for 3.3.0
PHPBB3-16283
---
.../install/module/requirements/task/check_server_environment.php | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
(limited to 'phpBB/phpbb/install')
diff --git a/phpBB/phpbb/install/module/requirements/task/check_server_environment.php b/phpBB/phpbb/install/module/requirements/task/check_server_environment.php
index 93fffb911f..41aa82623b 100644
--- a/phpBB/phpbb/install/module/requirements/task/check_server_environment.php
+++ b/phpBB/phpbb/install/module/requirements/task/check_server_environment.php
@@ -96,9 +96,7 @@ class check_server_environment extends \phpbb\install\task_base
*/
protected function check_php_version()
{
- $php_version = PHP_VERSION;
-
- if (version_compare($php_version, '7.1.3') < 0)
+ if (version_compare(PHP_VERSION, '7.1.3', '<'))
{
$this->response_helper->add_error_message('PHP_VERSION_REQD', 'PHP_VERSION_REQD_EXPLAIN');
--
cgit v1.2.1