Fixes and documentation updates

- Fixed host scripts for EE linking/unlinking
- Updated URL of PHP downloadable for Windows
- Default branch changed to 2.0, added respective section to documentation

Author: Alexander Paliarush

README.md

@@ -9,6 +9,7 @@
    * [Requirements](#requirements)
    * [Installation steps](#installation-steps)
    * [Default credentials and settings](#default-credentials-and-settings)
+   * [Getting updates and fixes](#getting-updates-and-fixes)
    * [GitHub limitations](#github-limitations)
  * [Day-to-day development scenarios](#day-to-day-development-scenarios)
    * [Reinstall Magento](#reinstall-magento)
@@ -85,6 +86,7 @@ Software listed below should be available in [PATH](https://en.wikipedia.org/wik
  1. Use `vagrant-magento` directory as project root in PHP Storm (not `vagrant-magento/magento2ce`). This is important, because in this case PHP Storm will be configured automatically by [init_project.sh](init_project.sh). If NFS files sync is disabled in [config](etc/config.yaml.dist) and ![](docs/images/windows-icon.png) on Windows hosts [verify deployment configuration in PHP Storm](docs/phpstorm-configuration-windows-hosts.md)
 
 ### Default credentials and settings
+
 Some of default settings are available for override. These settings can be found in the file [etc/config.yaml.dist](etc/config.yaml.dist).
 To override settings just create a copy of the file under the name 'config.yaml' and put there your custom settings.
 When using [init_project.sh](init_project.sh), if not specified manually, random IP address is generated and is used as suffix for host name to prevent collisions, in case when 2 or more instances are running at the same time.
@@ -109,6 +111,12 @@ Upon a successful installation, you'll see the location and URL of the newly-ins
 - CE codebase: `vagrant_project_root/magento2ce`
 - EE codebase will be available if path to EE repository is specified in `etc/config.yaml`: `vagrant_project_root/magento2ce/magento2ee`
 
+### Getting updates and fixes
+
+Current vagrant project follows [semantic versioning](http://semver.org/spec/v2.0.0.html) so feel free to pull the latest features and fixes, they will not break your project.
+For example your current branch is `2.0`, then it will be safe to pull any changes from `origin/2.0`. However branch `3.0` will contain changes backward incompatible with `2.0`.
+Note, that semantic versioning is only used for `x.0` branches (not for `develop`).
+
 ### GitHub limitations
 
 Be aware that you may encounter GitHub limits on the number of downloads (used by Composer to download Magento dependencies).

docs/images/release_badge.png

@@ -36,5 +36,5 @@ if [[ ${host_os} == "Windows" || $(bash "${vagrant_dir}/scripts/get_config_value
 fi
 
 bash "${vagrant_dir}/m-clear-cache"
-bash "${vagrant_dir}/m-composer install"
+bash -c "${vagrant_dir}/m-composer install"
 bash "${vagrant_dir}/m-reinstall"

docs/images/release_badge.svg

@@ -37,5 +37,5 @@ if [[ ${host_os} == "Windows" || $(bash "${vagrant_dir}/scripts/get_config_value
 fi
 
 bash "${vagrant_dir}/m-clear-cache"
-bash "${vagrant_dir}/m-composer install"
+bash -c "${vagrant_dir}/m-composer install"
 bash "${vagrant_dir}/m-reinstall"

m-switch-to-ce

@@ -13,17 +13,18 @@ set -ex
 
 bash "${vagrant_dir}/scripts/host/check_requirements.sh"
 
+php_executable=$(bash "${vagrant_dir}/scripts/host/get_path_to_php.sh")
+
 # Setup composer if necessary
 if [ ! -f ${composer_phar} ]; then
     cd ${composer_dir}
-    curl -sS https://getcomposer.org/installer | php
+    curl -sS https://getcomposer.org/installer | ${php_executable}
 fi
 
 # Configure composer credentials
 cd ${current_dir}
 cp ${composer_auth_json} "${PWD}/auth.json"
 
-php_executable=$(bash "${vagrant_dir}/scripts/host/get_path_to_php.sh")
 host_os=$(bash "${vagrant_dir}/scripts/host/get_host_os.sh")
 if [[ $(bash "${vagrant_dir}/scripts/get_config_value.sh" "environment_composer_prefer_source") == 1 ]]; then
     # prefer-source is slow but guarantees that there will be no issues related to max path length on Windows

m-switch-to-ee

@@ -7,7 +7,7 @@ host_os=$(bash "${vagrant_dir}/scripts/host/get_host_os.sh")
 set -ex
 
 if [[ ${host_os} == "Windows" ]]; then
-    curl http://windows.php.net/downloads/releases/php-7.0.2-nts-Win32-VC14-x86.zip -o ${vagrant_dir}/lib/php.zip
+    curl http://windows.php.net/downloads/releases/archives/php-7.0.2-nts-Win32-VC14-x86.zip -o ${vagrant_dir}/lib/php.zip
     unzip -q ${vagrant_dir}/lib/php.zip -d ${vagrant_dir}/lib/php
     rm -f ${vagrant_dir}/lib/php.zip
     cp "${vagrant_dir}/lib/php/php.ini-development" "${vagrant_dir}/lib/php/php.ini"