Merge pull request #57 from paliarush/Warning-Fixes

Warning fixes

Author: paliarush

Diff for: etc/config.yaml.dist

@@ -16,6 +16,7 @@ environment:
   # If set to 0, PHP 5 will be installed.
   use_php7: 1
   composer_prefer_source: 0
+  # [To apply changes: m-reinstall]
   use_varnish: 0
 magento:
   # [To apply changes: init-project -f]

Diff for: scripts/guest/m-reinstall

@@ -83,6 +83,9 @@ php ${install_cmd}
 # Comment out the line above and uncomment the one below to debug Magento Setup script
 # php -d xdebug.remote_host=192.168.10.1 -d xdebug.idekey=PHPSTORM -d xdebug.remote_connect_back=0 -d xdebug.remote_autostart=1 ${install_cmd}
 
+# Configure Varnish FPC, if enabled
+bash "${vagrant_dir}/scripts/guest/configure_varnish" -f
+
 # Enable Magento cron jobs
 echo "* * * * * php ${MAGENTO_ROOT}/bin/magento cron:run &
 * * * * * php ${MAGENTO_ROOT}/update/cron.php &

Diff for: scripts/provision/configure_environment_recurring.sh

@@ -66,9 +66,6 @@ else
     cp ${default_vcl_config}  /etc/varnish/default.vcl
 fi
 
-# Configure Varnish FPC, if enabled
-bash "${vagrant_dir}/scripts/guest/configure_varnish" -f
-
 # 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}
@@ -80,6 +77,9 @@ if [[ ${use_php7} -eq 1 ]]; then
     fi
     sed -i "s|xdebug.remote_connect_back=1|xdebug.remote_host=192.168.10.1|g" /etc/php/7.0/cli/conf.d/20-xdebug.ini
     a2enmod php7.0
+    # TODO: Fix for a bug, should be removed in 3.0
+    sed -i "/zend_extension=.*so/d" /etc/php/7.0/cli/conf.d/20-xdebug.ini
+    echo "zend_extension=xdebug.so" >> /etc/php/7.0/cli/conf.d/20-xdebug.ini
 else
     if [[ ! -d "/etc/php/5.6" ]]; then
         init_php56