- Added PHP 7.0 support by default

Author: Alexander Paliarush

Diff for: README.md

@@ -22,20 +22,22 @@ Custom solution is implemented for Windows hosts. See [explanation of the propos
 With current configuration Vagrant will:
 
  1. Run Ubuntu box
- 1. Install and configure all software necessary for Magento 2
+ 1. Install and configure all software necessary for Magento 2 (Apache 2.4, PHP 7.0 (or 5.5.9), MySQL 5.6, git, Composer, XDebug, Rabbit MQ)
  1. Install the Magento 2 application
+ 1. Configure PHP Storm project
 
 ## How to install
 
 If you never used Vagrant before, read [Vagrant Docs](https://docs.vagrantup.com/v2/)
 
 ### Requirements
-- [Vagrant](https://www.vagrantup.com/downloads.html) is installed and available globally in command line
+- [Vagrant 1.8+](https://www.vagrantup.com/downloads.html) is installed and available globally in command line
 - [Host manager plugin for Vagrant](https://github.com/smdahlen/vagrant-hostmanager)
 - [VirtualBox](https://www.virtualbox.org/wiki/Downloads)
 - [Composer](https://getcomposer.org/doc/00-intro.md) is installed and is available globally in command line
 - Make sure you have SSH keys generated and associated with your github account, see [manual](https://help.github.com/articles/generating-ssh-keys/).
 :information_source: You can use another way of getting codebase instead of cloning, it does not matter for successful installation.
+- \[Optional\] but highly recommended, [PHP Storm](https://www.jetbrains.com/phpstorm)
 
 ### Installation steps
 

Diff for: Vagrantfile

@@ -30,7 +30,9 @@ Vagrant.configure(VAGRANT_API_VERSION) do |config|
         vb.memory = get_variable_value('guest_ram') # Default is 2Gb, around 3Gb is necessary to run functional tests
     end
 
-    config.vm.synced_folder '.', '/vagrant'
+    config.vm.synced_folder '.', '/vagrant', disabled: true
+    config.vm.synced_folder './local.config', '/vagrant/local.config'
+    config.vm.synced_folder './scripts', '/vagrant/scripts'
     if OS.is_windows
         guest_magento_dir = '/var/www/magento2ce'
         config.vm.synced_folder host_magento_dir + '/var/generation', guest_magento_dir + '/var/generation'

Diff for: local.config/.gitignore

@@ -8,4 +8,5 @@
 !/magento2_virtual_host.conf.dist
 !/magento_host_name.txt.dist
 !/magento_ip_address.txt.dist
-!/guest_ram.txt.dist
+!/guest_ram.txt.dist
+!/use_php7.txt.dist

Diff for: scripts/host/configure_php_storm.sh

@@ -15,6 +15,8 @@ cp -R "${vagrant_dir}/scripts/host/php-storm-configs" "${vagrant_dir}/.idea"
 enabled_virtual_host_config="/etc/apache2/sites-available/magento2.conf"
 sed -i '' "s|<host_name>|${magento_host_name}|g" "${vagrant_dir}/.idea/webServers.xml"
 sed -i '' "s|<ssh_port>|${ssh_port}|g" "${vagrant_dir}/.idea/webServers.xml"
+sed -i '' "s|<host_name>|${magento_host_name}|g" "${vagrant_dir}/.idea/php.xml"
+sed -i '' "s|<ssh_port>|${ssh_port}|g" "${vagrant_dir}/.idea/php.xml"
 sed -i '' "s|<host_name>|${magento_host_name}|g" "${vagrant_dir}/.idea/deployment.xml"
 sed -i '' "s|<host_name>|${magento_host_name}|g" "${vagrant_dir}/.idea/.name"
 sed -i '' "s|<host_name>|${magento_host_name}|g" "${vagrant_dir}/.idea/modules.xml"

Diff for: scripts/host/php-storm-configs/php.xml

@@ -5,4 +5,21 @@
       <PhpUnitSettings load_method="CUSTOM_LOADER" custom_loader_path="$PROJECT_DIR$/magento2ce/vendor/phpunit/phpunit/phpunit" phpunit_phar_path="" />
     </phpunit_settings>
   </component>
+  <component name="MessDetector">
+    <phpmd_settings>
+      <MessDetectorConfiguration tool_path="$USER_HOME$/PhpstormProjects/magento2-vagrant/magento2ce/vendor/phpmd/phpmd/src/bin/phpmd" />
+    </phpmd_settings>
+  </component>
+  <component name="PhpCodeSniffer">
+    <phpcs_settings>
+      <PhpCSConfiguration standards="MySource;PEAR;PHPCS;PSR1;PSR2;Squiz;Zend" tool_path="$USER_HOME$/PhpstormProjects/magento2-vagrant/magento2ce/vendor/squizlabs/php_codesniffer/scripts/phpcs" />
+    </phpcs_settings>
+  </component>
+  <component name="PhpInterpreters">
+    <interpreters>
+      <interpreter home="sftp://vagrant@127.0.0.1:<ssh_port>/usr/bin/php" id="php-interpreter-<host_name>" name="Remote PHP (<host_name>)" debugger_id="php.debugger.XDebug">
+        <remote_data WEB_SERVER_CONFIG_ID="web-server-id-<host_name>" WEB_SERVER_CONFIG_NAME="<host_name>" HOST="127.0.0.1" PORT="<ssh_port>" ANONYMOUS="false" USERNAME="vagrant" PASSWORD="" PRIVATE_KEY_FILE="$PROJECT_DIR$/.vagrant/machines/magento2.vagrant/virtualbox/private_key" MY_KNOWN_HOSTS_FILE="" PASSPHRASE="" USE_KEY_PAIR="true" INTERPRETER_PATH="/usr/bin/php" HELPERS_PATH="/home/vagrant/.phpstorm_helpers" INITIALIZED="false" VALID="true" />
+      </interpreter>
+    </interpreters>
+  </component>
 </project>

Diff for: scripts/host/php-storm-configs/webServers.xml

@@ -2,7 +2,7 @@
 <project version="4">
   <component name="WebServers">
     <option name="servers">
-      <webServer id="8eec3df1-5f59-4fcc-a1dc-dd86806122d4" name="<host_name>" url="http://127.0.0.1">
+      <webServer id="web-server-id-<host_name>" name="<host_name>" url="http://127.0.0.1">
         <fileTransfer host="127.0.0.1" port="<ssh_port>" privateKey="$PROJECT_DIR$/.vagrant/machines/<host_name>/virtualbox/private_key" accessType="SFTP" username="vagrant" keyPair="true">
           <advancedOptions>
             <advancedOptions dataProtectionLevel="Private" />

Diff for: scripts/provision/install_environment.sh

@@ -7,8 +7,13 @@ is_windows_host=$1
 guest_magento_dir=$2
 magento_host_name=$3
 
+vagrant_dir="/vagrant"
+
 apt-get update
 
+# Install git
+apt-get install -y git
+
 # Setup Apache
 apt-get install -y apache2
 a2enmod rewrite
@@ -17,8 +22,8 @@ a2enmod rewrite
 sed -i 's|www-data|vagrant|g' /etc/apache2/envvars
 
 # Enable Magento virtual host
-custom_virtual_host_config="/vagrant/local.config/magento2_virtual_host.conf"
-default_virtual_host_config="/vagrant/local.config/magento2_virtual_host.conf.dist"
+custom_virtual_host_config="${vagrant_dir}/local.config/magento2_virtual_host.conf"
+default_virtual_host_config="${vagrant_dir}/local.config/magento2_virtual_host.conf.dist"
 if [ -f ${custom_virtual_host_config} ]; then
     virtual_host_config=${custom_virtual_host_config}
 else
@@ -34,19 +39,53 @@ a2ensite magento2.conf
 sudo a2dissite 000-default
 
 # Setup PHP
-apt-get install -y php5 php5-mhash php5-mcrypt php5-curl php5-cli php5-mysql php5-gd php5-intl php5-xsl php5-xdebug curl
-if [ ! -f /etc/php5/apache2/conf.d/20-mcrypt.ini ]; then
-    ln -s /etc/php5/mods-available/mcrypt.ini /etc/php5/apache2/conf.d/20-mcrypt.ini
-fi
-if [ ! -f /etc/php5/cli/conf.d/20-mcrypt.ini ]; then
-    ln -s /etc/php5/mods-available/mcrypt.ini /etc/php5/cli/conf.d/20-mcrypt.ini
-fi
-echo "date.timezone = America/Chicago" >> /etc/php5/cli/php.ini
+use_php7=$(sh "${vagrant_dir}/scripts/host/get_variable_value.sh" "use_php7")
+if [ ${use_php7} -eq 1 ]; then
+    # Workaround until php7.0 is available in official ubuntu repository
+    apt-get install -y language-pack-en-base
+    LC_ALL=en_US.UTF-8 add-apt-repository ppa:ondrej/php-7.0
+    apt-get update
+
+    apt-get install -y php7.0 php7.0-mcrypt php7.0-curl php7.0-cli php7.0-mysql php7.0-gd php7.0-intl php7.0-xsl
+
+    # Install XDebug
+    apt-get install -y php7.0-dev
+    cd /usr/lib
+    git clone git://github.com/xdebug/xdebug.git
+    cd xdebug
+    phpize
+    ./configure --enable-xdebug
+    make
+    make install
+
+    ## Configure XDebug to allow remote connections from the host
+    touch /etc/php/7.0/cli/conf.d/20-xdebug.ini
+    echo 'zend_extension=/usr/lib/xdebug/modules/xdebug.so
+    xdebug.max_nesting_level=200
+    xdebug.remote_enable=1
+    xdebug.remote_connect_back=1' >> /etc/php/7.0/cli/conf.d/20-xdebug.ini
+
+    echo "date.timezone = America/Chicago" >> /etc/php/7.0/cli/php.ini
+
+    sed -i "s|;include_path = \".:/usr/share/php\"|include_path = \".:/usr/share/php:${guest_magento_dir}/vendor/phpunit/phpunit\"|g" /etc/php/7.0/cli/php.ini
+
+    rm -rf /etc/php/7.0/apache2
+    ln -s /etc/php/7.0/cli /etc/php/7.0/apache2
+else
+    apt-get install -y php5 php5-mhash php5-mcrypt php5-curl php5-cli php5-mysql php5-gd php5-intl php5-xsl php5-xdebug curl
+    if [ ! -f /etc/php5/apache2/conf.d/20-mcrypt.ini ]; then
+        ln -s /etc/php5/mods-available/mcrypt.ini /etc/php5/apache2/conf.d/20-mcrypt.ini
+    fi
+    if [ ! -f /etc/php5/cli/conf.d/20-mcrypt.ini ]; then
+        ln -s /etc/php5/mods-available/mcrypt.ini /etc/php5/cli/conf.d/20-mcrypt.ini
+    fi
+    echo "date.timezone = America/Chicago" >> /etc/php5/cli/php.ini
 
-# Configure XDebug to allow remote connections from the host
-echo 'xdebug.max_nesting_level=200
-xdebug.remote_enable=1
-xdebug.remote_connect_back=1' >> /etc/php5/cli/conf.d/20-xdebug.ini
+    # Configure XDebug to allow remote connections from the host
+    echo 'xdebug.max_nesting_level=200
+    xdebug.remote_enable=1
+    xdebug.remote_connect_back=1' >> /etc/php5/cli/conf.d/20-xdebug.ini
+fi
 
 # Restart Apache
 service apache2 restart
@@ -62,9 +101,6 @@ sed -i '/\[client\]/a \
 user = root \
 password =' /etc/mysql/my.cnf
 
-# Install git
-apt-get install -y git
-
 # Setup Composer
 if [ ! -f /usr/local/bin/composer ]; then
     cd /tmp
@@ -73,7 +109,7 @@ if [ ! -f /usr/local/bin/composer ]; then
 fi
 
 # Configure composer
-composer_auth_json="/vagrant/local.config/composer/auth.json"
+composer_auth_json="${vagrant_dir}/local.config/composer/auth.json"
 if [ -f ${composer_auth_json} ]; then
     set +x
     echo "Installing composer OAuth tokens from ${composer_auth_json}..."
@@ -85,7 +121,7 @@ if [ -f ${composer_auth_json} ]; then
 fi
 
 # Declare path to scripts supplied with vagrant and Magento
-echo "export PATH=\$PATH:/vagrant/scripts/guest:${guest_magento_dir}/bin" >> /etc/profile
+echo "export PATH=\$PATH:${vagrant_dir}/scripts/guest:${guest_magento_dir}/bin" >> /etc/profile
 echo "export MAGENTO_ROOT=${guest_magento_dir}" >> /etc/profile
 
 # Set permissions to allow Magento codebase upload by Vagrant provision script