Merge pull request #33 from arkadiych/2.0

Upgrade PHP 5.5.9 to PHP 5.6; Switching PHP versions is applicable after "vagrant reload"

Author: paliarush

CHANGELOG.md

@@ -13,6 +13,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
  - Removed requirement for public github token due to Composer limitations (issue is fixed on Composer side)
  - Changed requirement for minimum box version from 1.0 to 1.1
+ - Upgraded PHP 5.5.9 to PHP 5.6
 
 ### Fixed
 
@@ -25,6 +26,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
  - Added host wrapper script for bin/magento command on guest
  - Added ability to modify guest config files (PHP, Apache etc) directly from host IDE
  - Added ability to choose if PhpStorm configs should be removed during project reinitialization
+ - Added ability to switch PHP version without destroying the project ("vagrant reload" is required)
 
 ## [v2.0.0] - 2016-02-05
 

README.md

@@ -167,6 +167,11 @@ bash m-switch-to-ee
 ```
 :information_source: On Windows hosts (or when NFS mode is disabled in [config.yaml](etc/config.yaml.dist) explicitly) you will be asked to wait until code is uploaded to guest machine by PhpStorm (PhpStorm must be lunched). To continue the process press any key.
 
+### Switch between PHP 5.6 and 7
+
+Set "use_php7: 1" for PHP7 and "use_php7: 0" for PHP5.6 in [config.yaml](etc/config.yaml.dist).
+PHP version will be applied after "vagrant reload".
+
 ### Update Composer dependencies
 
 Go to 'vagrant-magento' created earlier and run in command line:

etc/config.yaml.dist

@@ -9,7 +9,7 @@ guest:
   ip_address: "192.168.10.2"
   forwarded_ssh_port: 3000
 environment:
-  # If set to 0, PHP 5 will be installed
+  # If set to 0, PHP 5 will be installed. [Changeable: vagrant reload]
   use_php7: 1
   composer_prefer_source: 0
 magento:

scripts/provision/configure_environment.sh

@@ -29,33 +29,6 @@ a2ensite magento2.conf
 # Disable default virtual host
 sudo a2dissite 000-default
 
-# Setup PHP
-if [ ${use_php7} -eq 1 ]; then
-    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
-    sed -i "s|display_errors = Off|display_errors = On|g" /etc/php/7.0/cli/php.ini
-    sed -i "s|display_startup_errors = Off|display_startup_errors = On|g" /etc/php/7.0/cli/php.ini
-    sed -i "s|error_reporting = E_ALL & ~E_DEPRECATED & ~E_STRICT|error_reporting = E_ALL|g" /etc/php/7.0/cli/php.ini
-else
-    # Uninstall PHP 7 pre-installed in the box
-    apt-get remove -y php*
-
-    # Install PHP 5
-    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
-fi
-service apache2 restart
-
 # Configure composer
 composer_auth_json="${vagrant_dir}/etc/composer/auth.json"
 if [ -f ${composer_auth_json} ]; then

scripts/provision/configure_environment_recurring.sh

@@ -1,8 +1,35 @@
 #!/usr/bin/env bash
 
+function process_php_config () {
+    php_ini_paths=$1
+
+    for php_ini_path in "${php_ini_paths[@]}"
+    do
+        if [ -f ${php_ini_path} ]; then
+            echo "date.timezone = America/Chicago" >> ${php_ini_path}
+            sed -i "s|;include_path = \".:/usr/share/php\"|include_path = \".:/usr/share/php:${guest_magento_dir}/vendor/phpunit/phpunit\"|g" ${php_ini_path}
+            sed -i "s|display_errors = Off|display_errors = On|g" ${php_ini_path}
+            sed -i "s|display_startup_errors = Off|display_startup_errors = On|g" ${php_ini_path}
+            sed -i "s|error_reporting = E_ALL & ~E_DEPRECATED & ~E_STRICT|error_reporting = E_ALL|g" ${php_ini_path}
+        fi
+    done
+}
+
+function init_php56 () {
+        sudo add-apt-repository ppa:ondrej/php
+        sudo apt-get update
+        sudo apt-get install -y php5.6 php-xdebug php5.6-xml php5.6-mcrypt php5.6-curl php5.6-cli php5.6-mysql php5.6-gd php5.6-intl php5.6-bcmath php5.6-mbstring php5.6-soap php5.6-zip libapache2-mod-php5.6
+        echo '
+        xdebug.max_nesting_level=200
+        xdebug.remote_enable=1
+        xdebug.remote_connect_back=1' >> /etc/php/5.6/mods-available/xdebug.ini
+}
+
 # Enable trace printing and exit on the first error
 set +x
 
+use_php7=$4
+
 vagrant_dir="/vagrant"
 
 # Remove configs from host in case of force stop of virtual machine before linking restored ones
@@ -25,4 +52,25 @@ fi
 # Upgrade existing environment
 if [ -f ${vagrant_dir}/.idea/deployment.xml ]; then
     sed -i.back "s|magento2ce/var/generation|magento2ce/var|g" "${vagrant_dir}/.idea/deployment.xml"
-fi
+fi
+
+# Setup PHP
+php_ini_paths=( /etc/php/7.0/cli/php.ini /etc/php/5.6/cli/php.ini )
+process_php_config ${php_ini_paths}
+
+if [ ${use_php7} -eq 1 ]; then
+    update-alternatives --set php /usr/bin/php7.0
+    if [ -d "/etc/php/5.6" ]; then
+        a2dismod php5.6
+    fi
+    a2enmod php7.0
+else
+    if [ ! -d "/etc/php/5.6" ]; then
+        init_php56
+    fi
+    update-alternatives --set php /usr/bin/php5.6 && a2dismod php7.0 && a2enmod php5.6
+    rm -f /etc/php/5.6/apache2/php.ini
+    ln -s /etc/php/5.6/cli/php.ini /etc/php/5.6/apache2/php.ini
+fi
+service apache2 restart
+#end Setup PHP