From 94d66ce584244321b868b563fe008a28e839cb57 Mon Sep 17 00:00:00 2001
From: Steven Richardson <srichardson@sessiondigital.com>
Date: Thu, 28 Apr 2016 03:55:48 +0100
Subject: [PATCH] Add PHP7 configuration option, update readme and installation
 instructions

---
 README.md                        | 30 +++++++++++++++++++++++++-----
 src/Magestead/Helper/Options.php | 11 ++++++++---
 2 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index ac972c5..939ff84 100644
--- a/README.md
+++ b/README.md
@@ -53,7 +53,7 @@ mcrypt.modes_dir => no value => no value
 
 Vagrant Plugin - [vagrant-hostsupdater](https://github.com/cogitatio/vagrant-hostsupdater) - *For updating your hosts file automatically with your project URL*
 
-### Installing (2.0-beta only)
+### Installing (2.0 Beta only)
 
 During the beta release the installation is a manual process.
 
@@ -63,7 +63,7 @@ Choose a location to install the CLI app on your machine, your home directory wo
 $ cd ~
 $ git clone git@github.com:richdynamix/magestead.git magestead
 $ cd magestead
-$ git checkout -b origin/2.0.0 origin/epic/2.0.0
+$ git checkout -b 2.0.beta2 origin/release/2.0.beta2
 ```
 
 Install all the required dependencies with Composer
@@ -80,6 +80,13 @@ alias magestead="~/magestead/magestead"
 
 **Note:** *Please choose the correct location for your shell i.e.* `.bash_profile`, `config.fish`, `.zshrc`
 
+### Upgrade to 2.0 beta2
+
+Change into your magestead installation directory and checkout out the new branch
+
+$ cd ~/magestead
+$ git checkout -b 2.0.beta2 origin/release/2.0.beta2
+
 ## Usage
 
 Create a new project folder
@@ -97,7 +104,19 @@ $ magestead setup
 
 Follow the on screen instructions to install the application and server you require.
 
-Go grab a coffee, it will tak a few minutes to run.
+Go grab a coffee, it cane take several minutes to run, depending on your settings.
+
+## Caveats & Known Issues
+
+While Magestead 2.0 is in Beta, please be aware that there may be unreported bugs. Please create a new issue for these and explain the version you are on.
+
+#### PHP-FPM & PHP7
+
+There is a known issue that prevents the restart of PHP-FPM when using PHP7. This is the case for preconfigured boxes as well as custom boxes. Until the bug has been resolved globally the only way to restart PHP-FPM is to manually kill the process then restart.
+
+#### PHPSpec & Behat
+
+For a Magento 2 setup, there is a known permissions issue that stops PHPSpec & Behat test suites to run from both the host machine and on the guest machine. I am working to resolve this issue and should be fixed in the next release.
 
 ## Built With
 
@@ -129,6 +148,7 @@ TODO - Add licence notes
 
 ## Acknowledgments
 
-Heavily inspired from the following technologies
+Heavily inspired from the following -
 
-* Laravel Homestead
\ No newline at end of file
+* Laravel Homestead
+* ScotchBox 2.0
\ No newline at end of file
diff --git a/src/Magestead/Helper/Options.php b/src/Magestead/Helper/Options.php
index 8f531c6..da06343 100644
--- a/src/Magestead/Helper/Options.php
+++ b/src/Magestead/Helper/Options.php
@@ -13,14 +13,17 @@
 class Options
 {
     const BOX_PREFIX = 'richdynamix/magestead-';
+//    const BOX_PREFIX = '';
     protected $_app;
     protected $_server;
     protected $_phpVer = '56';
     protected $_os = 'centos65';
+//    protected $_os = 'ubuntu14';
     protected $_box;
     protected $_m2Username;
     protected $_m2Password;
     protected $_ipAddress;
+    protected $_memorylimit;
     protected $_cpus;
     protected $_locale;
     protected $_currency;
@@ -237,8 +240,7 @@ protected function getApplicationSettings($helper, InputInterface $input, Output
      */
     protected function getMagento2Settings($helper, InputInterface $input, OutputInterface $output)
     {
-        // todo add php 7 enabled box
-        // $this->usePhp7($helper, $input, $output);
+         $this->usePhp7($helper, $input, $output);
 
         if ($this->_app === 'magento 2') {
             return $this->verifyAuth($helper, $input, $output);
@@ -315,13 +317,16 @@ protected function usePhp7($helper, InputInterface $input, OutputInterface $outp
         if ($this->_app !== 'magento' && $this->_server !== 'apache') {
             $phpVerQuestion = new ChoiceQuestion(
                 "Which version of PHP should be installed?",
-                ['56', '7'],
+                ['56', '70'],
                 0
             );
             $this->_phpVer = $helper->ask($input, $output, $phpVerQuestion);
         }
     }
 
+    /**
+     * Set box name from concat user options
+     */
     protected function setVagrantBox()
     {
         $this->_box = self::BOX_PREFIX . $this->getOs() . "-$this->_server-php$this->_phpVer";