diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 3b4a42bed3..0935611a29 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -4,7 +4,7 @@ - + phpBB • Changelog @@ -21,7 +21,7 @@
-

phpBB 3.3.x Changelog

+

phpBB Changelog

Skip

@@ -36,7 +36,7 @@

- This is a non-exhaustive (but still near complete) changelog for phpBB 3.3.x including release candidate versions. + This is a non-exhaustive (but still near complete) changelog for phpBB including release candidate versions. Our thanks to all those people who've contributed bug reports and code fixes.

diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html index 15ce5a032d..6d5b976aa4 100644 --- a/phpBB/docs/INSTALL.html +++ b/phpBB/docs/INSTALL.html @@ -4,7 +4,7 @@ - + phpBB • Install @@ -21,8 +21,8 @@
-

phpBB 3.3.x Install

-

phpBB 3.3.x Installation, updating and conversion information

+

phpBB Install

+

phpBB Installation, updating and conversion information

Skip

@@ -109,7 +109,7 @@
  • Change the permissions on config.php to be writable by all (666 or -rw-rw-rw- within your FTP Client)
  • Change the permissions on the following directories to be writable by all (777 or -rwxrwxrwx within your FTP Client):
    store/, cache/, files/ and images/avatars/upload/.
    • -
  • Point your web browser to the location where you uploaded the phpBB files with the addition of install/app.php or simply install/, e.g. http://www.example.com/phpBB3/install/app.php, http://www.example.com/forum/install/.
    • +
  • Point your web browser to the location where you uploaded the phpBB files with the addition of install/app.php or simply install/, e.g. http://www.example.com/phpBB/install/app.php, http://www.example.com/forum/install/.
  • Click the INSTALL tab, follow the steps and fill out all the requested information.
  • Change the permissions on config.php to be writable only by yourself (644 or -rw-r--r-- within your FTP Client)
  • phpBB should now be available, please MAKE SURE you read at least Section 6 below for important, security related post-installation instructions, and also take note of Section 7 regarding anti-spam measures.
    • @@ -191,7 +191,7 @@

    phpBB comes supplied with British English as its standard language. However, a number of separate packs for different languages are available. If you are not a native English speaker you may wish to install one or more of these packages before continuing. The installation process below will allow you to select a default language from those available (you can, of course, change this default at a later stage). For more details on language packs, where to obtain them and how to install them please see the README.

    -

    Once all the files have been uploaded to your site, you should point your browser at this location with the addition of /install/. For example, if your domain name is www.example.com and you placed the phpBB files in the directory /phpBB3 off your web root you would enter http://www.example.com/phpBB3/install/ or (alternatively) http://www.example.com/phpBB3/install/app.php into your browser. When you have done this, you should see the phpBB Introduction screen appear.

    +

    Once all the files have been uploaded to your site, you should point your browser at this location with the addition of /install/. For example, if your domain name is www.example.com and you placed the phpBB files in the directory /phpBB off your web root you would enter http://www.example.com/phpBB/install/ or (alternatively) http://www.example.com/phpBB/install/app.php into your browser. When you have done this, you should see the phpBB Introduction screen appear.

    Introduction:

    @@ -313,7 +313,7 @@
  • Go to the downloads page and download the latest update package listed there, matching your current version.
  • Upload the uncompressed archive contents to your phpBB installation - only the install/ and vendor/ folders are required. Upload these folders in their entirety, retaining the file structure.
  • After the install folder is present, phpBB will go offline automatically.
    • -
  • Point your browser to the install directory, for example http://www.example.com/phpBB3/install/
    • +
  • Point your browser to the install directory, for example http://www.example.com/phpBB/install/
  • Choose the "Update" Tab and follow the instructions
    • @@ -407,7 +407,7 @@

    After verifying the settings in the ACP, you can delete the install directory to enable the board. The board will stay disabled until you do so.

    -

    Once you are pleased with your new installation, you may want to give it the name of your old installation, changing the directory name. With phpBB3 this is possible without any problems, but you may still want to check your cookie settings within the administration panel; in case your cookie path needs to be adjusted prior to renaming.

    +

    Once you are pleased with your new installation, you may want to give it the name of your old installation, changing the directory name. With phpBB this is possible without any problems, but you may still want to check your cookie settings within the administration panel; in case your cookie path needs to be adjusted prior to renaming.

    5.iv. Common conversion problems

    @@ -417,7 +417,7 @@

    Password conversion Due to the utf-8 based handling of passwords in phpBB 3.x, it is not always possible to transfer all passwords. For passwords "lost in translation" the easiest workaround is to use the I forgot my password link on the login page.

    -

    Path to your former board The convertor expects the relative path to your old board's files. So, for instance, if the old board is located at http://www.yourdomain.com/forum and the phpBB 3.x installation is located at http://www.yourdomain.com/phpBB3, then the correct value would be ../forum. Note that the webserver user must be able to access the source installation's files.

    +

    Path to your former board The convertor expects the relative path to your old board's files. So, for instance, if the old board is located at http://www.yourdomain.com/forum and the phpBB installation is located at http://www.yourdomain.com/phpBB, then the correct value would be ../forum. Note that the webserver user must be able to access the source installation's files.

    Missing images If your default board language's language pack does not include all images, then some images might be missing in your installation. Always use a complete language pack as default language.

    diff --git a/phpBB/docs/README.html b/phpBB/docs/README.html index c3f02acf45..e8cc96342c 100644 --- a/phpBB/docs/README.html +++ b/phpBB/docs/README.html @@ -4,7 +4,7 @@ - + phpBB • Readme @@ -21,7 +21,7 @@
    -

    phpBB 3.3.x Readme

    +

    phpBB Readme

    Skip

    diff --git a/phpBB/phpbb/composer.json b/phpBB/phpbb/composer.json index ab2b9601fa..ef3dc4e629 100644 --- a/phpBB/phpbb/composer.json +++ b/phpBB/phpbb/composer.json @@ -23,11 +23,11 @@ "classmap": [""] }, "require": { - "php": ">=5.4" + "php": "^8.1" }, "extra": { "branch-alias": { - "dev-master": "3.3.x-dev" + "dev-master": "4.0.x-dev" } } } 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 8913b6a923..3a0aeb60d9 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 = "install_config->get('dbms'); $db_driver = $this->db_helper->get_available_dbms($dbms);