Merge branch '3.3.x'

Author: marc1706

.gitignore

@@ -48,7 +48,9 @@
 /tests/tmp/*
 /tests/vendor
 /vagrant/phpbb-install-config.yml
-.vagrant
+/vagrant/.vagrant
+/vagrant/composer.lock
+/vagrant/vendor
 node_modules
 /build/package_signature
 

phpBB/composer.json

@@ -61,7 +61,6 @@
 		"twig/twig": "^3.14"
 	},
 	"require-dev": {
-		"laravel/homestead": "~15.0",
 		"misantron/dbunit": "~5.0",
 		"phing/phing": "~2.4",
 		"phpunit/phpunit": "^10.0",

phpBB/composer.lock

@@ -2,15 +2,17 @@
 
 phpBB includes support for Vagrant. This allows developers and contributors to run phpBB without the need to set up their own local web server with traditional WAMP/MAMP stacks. It also provides a consistent environment between developers for writing and debugging code changes more productively.
 
-phpBB uses the [Laravel/Homestead](https://laravel.com/docs/5.1/homestead) Vagrant box. It runs a Linux server with Ubuntu 14.04, PHP 5.6, Nginx, SQLite3, MySQL, and a whole lot more (complete specs below).
+phpBB uses the [Laravel/Homestead](https://laravel.com/docs/5.1/homestead) Vagrant box. It runs a Linux server with Ubuntu, PHP 7.2, Apache, SQLite3, MySQL, and a whole lot more (complete specs below).
 
 ## Get Started
 
 * Download and Install [Vagrant](https://www.vagrantup.com/downloads.html)
 * Download and Install [VirtualBox](https://www.virtualbox.org/wiki/Downloads)
-* Run `vagrant up` from the root of your cloned fork of the phpBB Git repository
+* Run `vagrant up` from the `vagrant` directory of your cloned fork of the phpBB Git repository
 
 ```sh
+$ cd vagrant
+$ ../composer.phar install
 $ vagrant up
 ```
 
@@ -91,11 +93,11 @@ $ mysql -uhomestead -psecret phpbb < /home/vagrant/phpbb/phpBB/store/phpbb.sql
 
 ### Included Software
 
-* Ubuntu 14.04
+* Ubuntu
 * Git
-* PHP 5.6
+* PHP 7.2
 * HHVM
-* Nginx
+* Apache
 * MySQL
 * Sqlite3
 * Postgres

phpBB/docs/vagrant.md

@@ -2,11 +2,11 @@ require 'json'
 require 'yaml'
 
 VAGRANTFILE_API_VERSION ||= "2"
-confDir = $confDir ||= File.expand_path("phpBB/vendor/laravel/homestead", File.dirname(__FILE__))
+confDir = $confDir ||= File.expand_path("vendor/svpernova09/homestead", File.dirname(__FILE__))
 
-homesteadYamlPath = "vagrant/bootstrap.yaml"
-afterScriptPath = "vagrant/after.sh"
-aliasesPath = "vagrant/aliases"
+homesteadYamlPath = "bootstrap.yaml"
+afterScriptPath = "after.sh"
+aliasesPath = "aliases"
 
 require File.expand_path(confDir + '/scripts/homestead.rb')
 

Vagrantfile vagrant/VagrantfileVagrantfile renamed to vagrant/Vagrantfile

@@ -12,7 +12,7 @@ keys:
     - ~/.ssh/id_rsa
 
 folders:
-    - map: "."
+    - map: ".."
       to: "/home/vagrant/phpbb"
 sites:
     - map: phpbb.app

vagrant/bootstrap.yaml

@@ -0,0 +1,5 @@
+{
+    "require": {
+        "svpernova09/homestead": "dev-main"
+    }
+}