richdynamix / magestead

src/Magestead/Service/VersionControl.php

Braces +6 added lines, -12 removed lines

@@ -15,8 +15,7 @@ 
      * @param $projectPath
      * @param OutputInterface $output
      */
-    public function __construct($repoUrl, $projectPath, OutputInterface $output)
-    {
+    public function __construct($repoUrl, $projectPath, OutputInterface $output) {
         $this->_repoUrl = $repoUrl;
         $this->_projectPath = $projectPath;
         $this->_output = $output;
@@ -27,8 +26,7 @@ 
     /**
      * @param OutputInterface $output
      */
-    protected function execute(OutputInterface $output)
-    {
+    protected function execute(OutputInterface $output) {
         $output->writeln('<info>Configuring GIT repo</info>');
         $this->init();
 
@@ -47,8 +45,7 @@ 
      *
      * @return $this
      */
-    public function init()
-    {
+    public function init() {
         $command = 'git init; git remote add origin ' . $this->_repoUrl;
         new ProcessCommand($command, $this->_projectPath, $this->_output);
 
@@ -60,8 +57,7 @@ 
      *
      * @return $this
      */
-    public function addFiles()
-    {
+    public function addFiles() {
         $command = 'git add -A';
         new ProcessCommand($command, $this->_projectPath, $this->_output);
 
@@ -73,8 +69,7 @@ 
      *
      * @return $this
      */
-    public function commitFiles()
-    {
+    public function commitFiles() {
         $command = "git commit -m 'Initial commit'";
         new ProcessCommand($command, $this->_projectPath, $this->_output);
 
@@ -86,8 +81,7 @@ 
      *
      * @return $this
      */
-    public function pushFiles()
-    {
+    public function pushFiles() {
         $command = "git push -u origin master";
         new ProcessCommand($command, $this->_projectPath, $this->_output);
 

Spacing +7 added lines, -7 removed lines

@@ -17,9 +17,9 @@ 
      */
     public function __construct($repoUrl, $projectPath, OutputInterface $output)
     {
-        $this->_repoUrl     = $repoUrl;
-        $this->_projectPath = $projectPath;
-        $this->_output      = $output;
+        $this->_repoUrl=$repoUrl;
+        $this->_projectPath=$projectPath;
+        $this->_output=$output;
 
         $this->execute($output);
     }
@@ -49,7 +49,7 @@ 
      */
     public function init()
     {
-        $command = 'git init; git remote add origin ' . $this->_repoUrl;
+        $command='git init; git remote add origin '.$this->_repoUrl;
         new ProcessCommand($command, $this->_projectPath, $this->_output);
 
         return $this;
@@ -62,7 +62,7 @@ 
      */
     public function addFiles()
     {
-        $command = 'git add -A';
+        $command='git add -A';
         new ProcessCommand($command, $this->_projectPath, $this->_output);
 
         return $this;
@@ -75,7 +75,7 @@ 
      */
     public function commitFiles()
     {
-        $command = "git commit -m 'Initial commit'";
+        $command="git commit -m 'Initial commit'";
         new ProcessCommand($command, $this->_projectPath, $this->_output);
 
         return $this;
@@ -88,7 +88,7 @@ 
      */
     public function pushFiles()
     {
-        $command = "git push -u origin master";
+        $command="git push -u origin master";
         new ProcessCommand($command, $this->_projectPath, $this->_output);
 
         return $this;

src/Magestead/Service/Notification.php

Braces +1 added lines, -2 removed lines

@@ -14,8 +14,7 @@
      *
      * @param $message
      */
-    public static function send($message)
-    {
+    public static function send($message) {
         $notifier = NotifierFactory::create();
         $basePath = dirname( __FILE__ ) . '/../../../';
         $notification =

Spacing +4 added lines, -4 removed lines

@@ -16,13 +16,13 @@
      */
     public static function send($message)
     {
-        $notifier     = NotifierFactory::create();
-        $basePath     = dirname( __FILE__ ) . '/../../../';
-        $notification =
+        $notifier=NotifierFactory::create();
+        $basePath=dirname(__FILE__).'/../../../';
+        $notification=
             (new Notify())
                 ->setTitle('Magestead')
                 ->setBody($message)
-                ->setIcon($basePath .'assets/magentologo.png')
+                ->setIcon($basePath.'assets/magentologo.png')
         ;
 
         $notifier->send($notification);

src/Magestead/Helper/HostsPluginChecker.php

Braces +2 added lines, -4 removed lines

@@ -12,8 +12,7 @@ 
      * @param array $options
      * @param OutputInterface $output
      */
-    public static function verify(array $options, OutputInterface $output)
-    {
+    public static function verify(array $options, OutputInterface $output) {
         $hostPlugin = `vagrant plugin list | grep vagrant-hostsupdater`;
         if (is_null($hostPlugin)) {
             self::editHostsInstructions($options, $output);
@@ -26,8 +25,7 @@ 
      * @param array $options
      * @param OutputInterface $output
      */
-    protected static function editHostsInstructions(array $options, OutputInterface $output)
-    {
+    protected static function editHostsInstructions(array $options, OutputInterface $output) {
         $output->writeln('<comment>NOTE: You will need to add the following to your hosts file!</comment>');
         $comment = $options['vagrantfile']['vm']['network']['private_network'] .
             ' ' . $options['magestead']['apps']['mba_12345']['base_url'];

Spacing +4 added lines, -4 removed lines

@@ -14,7 +14,7 @@ 
      */
     public static function verify(array $options, OutputInterface $output)
     {
-        $hostPlugin = `vagrant plugin list | grep vagrant-hostsupdater`;
+        $hostPlugin=`vagrant plugin list | grep vagrant-hostsupdater`;
         if (is_null($hostPlugin)) {
             self::editHostsInstructions($options, $output);
 
@@ -29,8 +29,8 @@ 
     protected static function editHostsInstructions(array $options, OutputInterface $output)
     {
         $output->writeln('<comment>NOTE: You will need to add the following to your hosts file!</comment>');
-        $comment = $options['vagrantfile']['vm']['network']['private_network'] .
-            ' ' . $options['magestead']['apps']['mba_12345']['base_url'];
-        $output->writeln('<info>' . $comment . '</info>');
+        $comment=$options['vagrantfile']['vm']['network']['private_network'].
+            ' '.$options['magestead']['apps']['mba_12345']['base_url'];
+        $output->writeln('<info>'.$comment.'</info>');
     }
 }
\ No newline at end of file

src/Magestead/Helper/Config.php

Braces +4 added lines, -8 removed lines

@@ -13,8 +13,7 @@ 
      * Config constructor.
      * @param OutputInterface $output
      */
-    public function __construct(OutputInterface $output)
-    {
+    public function __construct(OutputInterface $output) {
         $this->_projectPath = getcwd();
         $this->_config = $this->getConfigFile($output);
     }
@@ -23,8 +22,7 @@ 
      * @param $name
      * @return mixed
      */
-    function __get($name)
-    {
+    function __get($name) {
         return $this->_config['magestead']['apps']['mba_12345'][$name];
     }
 
@@ -32,8 +30,7 @@ 
      * @param OutputInterface $output
      * @return bool|mixed
      */
-    protected function getConfigFile(OutputInterface $output)
-    {
+    protected function getConfigFile(OutputInterface $output) {
         $config = new Parser();
         try {
             return $config->parse($this->readConfigFile());
@@ -48,8 +45,7 @@ 
      * @return string
      * @throws MissingConfigFileException
      */
-    protected function readConfigFile()
-    {
+    protected function readConfigFile() {
         if (!file_exists($this->_projectPath . '/magestead.yaml')) {
             throw new MissingConfigFileException('No config file was found, are you in the project root?');
         }

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -58,6 +58,6 @@
                 break;
         }
 
-        return false;
+        return FALSE;
     }
 }

Spacing +5 added lines, -5 removed lines

@@ -15,8 +15,8 @@ 
      */
     public function __construct(OutputInterface $output)
     {
-        $this->_projectPath = getcwd();
-        $this->_config      = $this->getConfigFile($output);
+        $this->_projectPath=getcwd();
+        $this->_config=$this->getConfigFile($output);
     }
 
     /**
@@ -34,7 +34,7 @@ 
      */
     protected function getConfigFile(OutputInterface $output)
     {
-        $config = new Parser();
+        $config=new Parser();
         try {
             return $config->parse($this->readConfigFile());
         } catch (ParseException $e) {
@@ -50,10 +50,10 @@ 
      */
     protected function readConfigFile()
     {
-        if (!file_exists($this->_projectPath . '/magestead.yaml')) {
+        if (!file_exists($this->_projectPath.'/magestead.yaml')) {
             throw new MissingConfigFileException('No config file was found, are you in the project root?');
         }
 
-        return file_get_contents($this->_projectPath . '/magestead.yaml');
+        return file_get_contents($this->_projectPath.'/magestead.yaml');
     }
 }

src/Magestead/Helper/Options.php

Indentation +14 added lines, -14 removed lines

@@ -53,20 +53,20 @@
     public function getAllOptions()
     {
         return [
-          'app' => $this->_app,
-          'server' => $this->_server,
-          'phpver' => $this->_phpVer,
-          'os' => $this->_os,
-          'box' => $this->_box,
-          'm2user' => $this->_m2Username,
-          'm2pass' => $this->_m2Password,
-          'repo_url' => $this->_repoUrl,
-          'ip_address' => $this->_ipAddress,
-          'cpus' => $this->_cpus,
-          'memory_limit' => $this->_memorylimit,
-          'locale' => $this->_locale,
-          'default_currency' => $this->_currency,
-          'base_url' => $this->_baseUrl,
+            'app' => $this->_app,
+            'server' => $this->_server,
+            'phpver' => $this->_phpVer,
+            'os' => $this->_os,
+            'box' => $this->_box,
+            'm2user' => $this->_m2Username,
+            'm2pass' => $this->_m2Password,
+            'repo_url' => $this->_repoUrl,
+            'ip_address' => $this->_ipAddress,
+            'cpus' => $this->_cpus,
+            'memory_limit' => $this->_memorylimit,
+            'locale' => $this->_locale,
+            'default_currency' => $this->_currency,
+            'base_url' => $this->_baseUrl,
         ];
     }
 

Braces +13 added lines, -26 removed lines

@@ -34,8 +34,7 @@ 
      * @param InputInterface $input
      * @param OutputInterface $output
      */
-    public function __construct($helper, InputInterface $input, OutputInterface $output)
-    {
+    public function __construct($helper, InputInterface $input, OutputInterface $output) {
         $this->setVagrantSettings($helper, $input, $output);
 
         $this->setServerConfig($helper, $input, $output);
@@ -50,8 +49,7 @@ 
     /**
      * @return array
      */
-    public function getAllOptions()
-    {
+    public function getAllOptions() {
         return [
           'app' => $this->_app,
           'server' => $this->_server,
@@ -75,8 +73,7 @@ 
      * @param InputInterface $input
      * @param OutputInterface $output
      */
-    protected function setVagrantSettings($helper, InputInterface $input, OutputInterface $output)
-    {
+    protected function setVagrantSettings($helper, InputInterface $input, OutputInterface $output) {
         $output->writeln('<comment>Lets configure your project\'s VM</comment>');
 
         $ipQuestion = new Question("Configure the IP for your VM (192.168.47.47): ", '192.168.47.47');
@@ -94,8 +91,7 @@ 
      * @param InputInterface $input
      * @param OutputInterface $output
      */
-    protected function setApplicationSettings($helper, InputInterface $input, OutputInterface $output)
-    {
+    protected function setApplicationSettings($helper, InputInterface $input, OutputInterface $output) {
         $output->writeln('<comment>Lets configure your project\'s application</comment>');
         if ($this->_phpVer !== '70') {
             $appQuestion = new ChoiceQuestion(
@@ -122,8 +118,7 @@ 
      * @param OutputInterface $output
      * @return bool
      */
-    protected function setMagento2Settings($helper, InputInterface $input, OutputInterface $output)
-    {
+    protected function setMagento2Settings($helper, InputInterface $input, OutputInterface $output) {
         if ($this->_app === 'magento2') {
             return $this->verifyAuth($helper, $input, $output);
         }
@@ -136,8 +131,7 @@ 
      * @param InputInterface $input
      * @param OutputInterface $output
      */
-    protected function setVersionControlSettings($helper, InputInterface $input, OutputInterface $output)
-    {
+    protected function setVersionControlSettings($helper, InputInterface $input, OutputInterface $output) {
         $versionControl = new ConfirmationQuestion("Would you like to add your project to GIT? (no/yes) ", false);
         $versioning = $helper->ask($input, $output, $versionControl);
         if ($versioning) {
@@ -151,8 +145,7 @@ 
      * @param InputInterface $input
      * @param OutputInterface $output
      */
-    protected function askForAuth($helper, InputInterface $input, OutputInterface $output)
-    {
+    protected function askForAuth($helper, InputInterface $input, OutputInterface $output) {
         $username = new Question("Please enter your Magento username (public key): ", '');
         $this->_m2Username = $helper->ask($input, $output, $username);
 
@@ -166,8 +159,7 @@ 
      * @param OutputInterface $output
      * @return bool
      */
-    protected function verifyAuth($helper, InputInterface $input, OutputInterface $output)
-    {
+    protected function verifyAuth($helper, InputInterface $input, OutputInterface $output) {
         $authFile = $_SERVER['HOME'] . "/.composer/auth.json";
 
         $authObj = [];
@@ -194,8 +186,7 @@ 
      * @param InputInterface $input
      * @param OutputInterface $output
      */
-    protected function setPhp($helper, InputInterface $input, OutputInterface $output)
-    {
+    protected function setPhp($helper, InputInterface $input, OutputInterface $output) {
         $output->writeln('<info>Keep in mind PHP7 is only available for Magento 2</info>');
         $phpVerQuestion = new ChoiceQuestion(
             "Which version of PHP should be installed?",
@@ -209,8 +200,7 @@ 
     /**
      * Set box name from concat user options
      */
-    protected function setVagrantBox()
-    {
+    protected function setVagrantBox() {
         $this->_box = self::BOX_PREFIX . $this->_os . "-$this->_server-php$this->_phpVer";
     }
 
@@ -219,8 +209,7 @@ 
      * @param InputInterface $input
      * @param OutputInterface $output
      */
-    protected function setServerConfig($helper, InputInterface $input, OutputInterface $output)
-    {
+    protected function setServerConfig($helper, InputInterface $input, OutputInterface $output) {
         $output->writeln('<comment>Lets configure your server</comment>');
         $this->setOperatingSystem($helper, $input, $output);
         $this->setWebServer($helper, $input, $output);
@@ -232,8 +221,7 @@ 
      * @param InputInterface $input
      * @param OutputInterface $output
      */
-    protected function setWebServer($helper, InputInterface $input, OutputInterface $output)
-    {
+    protected function setWebServer($helper, InputInterface $input, OutputInterface $output) {
         $serverQuestion = new ChoiceQuestion(
             "Which webserver would you like?",
             ['NGINX', 'Apache'],
@@ -247,8 +235,7 @@ 
      * @param InputInterface $input
      * @param OutputInterface $output
      */
-    protected function setOperatingSystem($helper, InputInterface $input, OutputInterface $output)
-    {
+    protected function setOperatingSystem($helper, InputInterface $input, OutputInterface $output) {
         $osQuestion = new ChoiceQuestion(
             "Which OS would you like to install?",
             ['CentOS 6.5', 'Ubuntu 14'],

Upper-Lower-Casing +3 added lines, -3 removed lines

@@ -128,7 +128,7 @@ 
             return $this->verifyAuth($helper, $input, $output);
         }
 
-        return true;
+        return TRUE;
     }
 
     /**
@@ -138,7 +138,7 @@ 
      */
     protected function setVersionControlSettings($helper, InputInterface $input, OutputInterface $output)
     {
-        $versionControl = new ConfirmationQuestion("Would you like to add your project to GIT? (no/yes) ", false);
+        $versionControl = new ConfirmationQuestion("Would you like to add your project to GIT? (no/yes) ", FALSE);
         $versioning = $helper->ask($input, $output, $versionControl);
         if ($versioning) {
             $repoQuestion = new Question("Enter your full GitHub/BitBucket repo URL: ", '');
@@ -176,7 +176,7 @@ 
             $authObj = (array)json_decode($authJson);
 
             if (isset($authObj['http-basic']) && isset($authObj['http-basic']->{'repo.magento.com'})) {
-                return true;
+                return TRUE;
             }
         }
 

Spacing +41 added lines, -41 removed lines

@@ -12,11 +12,11 @@ 
  */
 class Options
 {
-    const BOX_PREFIX = 'richdynamix/magestead-';
+    const BOX_PREFIX='richdynamix/magestead-';
 
-    protected $_app = 'magento2';
-    protected $_phpVer = '56';
-    protected $_os = 'centos65';
+    protected $_app='magento2';
+    protected $_phpVer='56';
+    protected $_os='centos65';
     protected $_server;
     protected $_box;
     protected $_m2Username;
@@ -27,7 +27,7 @@ 
     protected $_locale;
     protected $_currency;
     protected $_baseUrl;
-    protected $_repoUrl = '';
+    protected $_repoUrl='';
 
     /**
      * Options constructor.
@@ -80,14 +80,14 @@ 
     {
         $output->writeln('<comment>Lets configure your project\'s VM</comment>');
 
-        $ipQuestion       = new Question("Configure the IP for your VM (192.168.47.47): ", '192.168.47.47');
-        $this->_ipAddress = strtolower($helper->ask($input, $output, $ipQuestion));
+        $ipQuestion=new Question("Configure the IP for your VM (192.168.47.47): ", '192.168.47.47');
+        $this->_ipAddress=strtolower($helper->ask($input, $output, $ipQuestion));
 
-        $cpuQuestion = new Question("How many CPU's would you like to use? (1): ", '1');
-        $this->_cpus = strtolower($helper->ask($input, $output, $cpuQuestion));
+        $cpuQuestion=new Question("How many CPU's would you like to use? (1): ", '1');
+        $this->_cpus=strtolower($helper->ask($input, $output, $cpuQuestion));
 
-        $memoryQuestion     = new Question("Define the VM memory limit (2048): ", '2048');
-        $this->_memorylimit = strtolower($helper->ask($input, $output, $memoryQuestion));
+        $memoryQuestion=new Question("Define the VM memory limit (2048): ", '2048');
+        $this->_memorylimit=strtolower($helper->ask($input, $output, $memoryQuestion));
     }
 
     /**
@@ -99,23 +99,23 @@ 
     {
         $output->writeln('<comment>Lets configure your project\'s application</comment>');
         if ($this->_phpVer !== '70') {
-            $appQuestion = new ChoiceQuestion(
+            $appQuestion=new ChoiceQuestion(
                 "Which application do you want to install?",
                 ['Magento', 'Magento 2'],
                 0
             );
 
-            $this->_app = strtolower($helper->ask($input, $output, $appQuestion));
+            $this->_app=strtolower($helper->ask($input, $output, $appQuestion));
         }
 
-        $baseUrlQuestion = new Question("Enter your application's base_url (magestead.dev): ", 'magestead.dev');
-        $this->_baseUrl  = strtolower($helper->ask($input, $output, $baseUrlQuestion));
+        $baseUrlQuestion=new Question("Enter your application's base_url (magestead.dev): ", 'magestead.dev');
+        $this->_baseUrl=strtolower($helper->ask($input, $output, $baseUrlQuestion));
 
-        $currenyQuestion = new Question("Enter your application's default currency (GBP): ", 'GBP');
-        $this->_currency = $helper->ask($input, $output, $currenyQuestion);
+        $currenyQuestion=new Question("Enter your application's default currency (GBP): ", 'GBP');
+        $this->_currency=$helper->ask($input, $output, $currenyQuestion);
 
-        $localeQuestion = new Question("Enter your application's default locale (en_GB): ", 'en_GB');
-        $this->_locale  = $helper->ask($input, $output, $localeQuestion);
+        $localeQuestion=new Question("Enter your application's default locale (en_GB): ", 'en_GB');
+        $this->_locale=$helper->ask($input, $output, $localeQuestion);
     }
 
     /**
@@ -140,11 +140,11 @@ 
      */
     protected function setVersionControlSettings($helper, InputInterface $input, OutputInterface $output)
     {
-        $versionControl = new ConfirmationQuestion("Would you like to add your project to GIT? (no/yes) ", false);
-        $versioning     = $helper->ask($input, $output, $versionControl);
+        $versionControl=new ConfirmationQuestion("Would you like to add your project to GIT? (no/yes) ", false);
+        $versioning=$helper->ask($input, $output, $versionControl);
         if ($versioning) {
-            $repoQuestion   = new Question("Enter your full GitHub/BitBucket repo URL: ", '');
-            $this->_repoUrl = strtolower($helper->ask($input, $output, $repoQuestion));
+            $repoQuestion=new Question("Enter your full GitHub/BitBucket repo URL: ", '');
+            $this->_repoUrl=strtolower($helper->ask($input, $output, $repoQuestion));
         }
     }
 
@@ -155,11 +155,11 @@ 
      */
     protected function askForAuth($helper, InputInterface $input, OutputInterface $output)
     {
-        $username          = new Question("Please enter your Magento username (public key): ", '');
-        $this->_m2Username = $helper->ask($input, $output, $username);
+        $username=new Question("Please enter your Magento username (public key): ", '');
+        $this->_m2Username=$helper->ask($input, $output, $username);
 
-        $password          = new Question("Please enter your Magento password (private key): ", '');
-        $this->_m2Password = $helper->ask($input, $output, $password);
+        $password=new Question("Please enter your Magento password (private key): ", '');
+        $this->_m2Password=$helper->ask($input, $output, $password);
     }
 
     /**
@@ -170,12 +170,12 @@ 
      */
     protected function verifyAuth($helper, InputInterface $input, OutputInterface $output)
     {
-        $authFile = $_SERVER['HOME'] . "/.composer/auth.json";
+        $authFile=$_SERVER['HOME']."/.composer/auth.json";
 
-        $authObj = [];
+        $authObj=[];
         if (file_exists($authFile)) {
-            $authJson = file_get_contents($authFile);
-            $authObj  = (array)json_decode($authJson);
+            $authJson=file_get_contents($authFile);
+            $authObj=(array) json_decode($authJson);
 
             if (isset($authObj['http-basic']) && isset($authObj['http-basic']->{'repo.magento.com'})) {
                 return true;
@@ -184,10 +184,10 @@ 
 
         $this->askForAuth($helper, $input, $output);
 
-        $authObj['http-basic']['repo.magento.com']['username'] = $this->_m2Username;
-        $authObj['http-basic']['repo.magento.com']['password'] = $this->_m2Password;
+        $authObj['http-basic']['repo.magento.com']['username']=$this->_m2Username;
+        $authObj['http-basic']['repo.magento.com']['password']=$this->_m2Password;
 
-        $authJson = json_encode($authObj);
+        $authJson=json_encode($authObj);
         return file_put_contents($authFile, $authJson);
     }
 
@@ -199,13 +199,13 @@ 
     protected function setPhp($helper, InputInterface $input, OutputInterface $output)
     {
         $output->writeln('<info>Keep in mind PHP7 is only available for Magento 2</info>');
-        $phpVerQuestion = new ChoiceQuestion(
+        $phpVerQuestion=new ChoiceQuestion(
             "Which version of PHP should be installed?",
             ['56', '70'],
             0
         );
 
-        $this->_phpVer = $helper->ask($input, $output, $phpVerQuestion);
+        $this->_phpVer=$helper->ask($input, $output, $phpVerQuestion);
     }
 
     /**
@@ -213,7 +213,7 @@ 
      */
     protected function setVagrantBox()
     {
-        $this->_box = self::BOX_PREFIX . $this->_os . "-$this->_server-php$this->_phpVer";
+        $this->_box=self::BOX_PREFIX.$this->_os."-$this->_server-php$this->_phpVer";
     }
 
     /**
@@ -236,13 +236,13 @@ 
      */
     protected function setWebServer($helper, InputInterface $input, OutputInterface $output)
     {
-        $serverQuestion = new ChoiceQuestion(
+        $serverQuestion=new ChoiceQuestion(
             "Which webserver would you like?",
             ['NGINX', 'Apache'],
             0
         );
 
-        $this->_server = strtolower($helper->ask($input, $output, $serverQuestion));
+        $this->_server=strtolower($helper->ask($input, $output, $serverQuestion));
     }
 
     /**
@@ -252,12 +252,12 @@ 
      */
     protected function setOperatingSystem($helper, InputInterface $input, OutputInterface $output)
     {
-        $osQuestion = new ChoiceQuestion(
+        $osQuestion=new ChoiceQuestion(
             "Which OS would you like to install?",
             ['CentOS 6.5', 'Ubuntu 14'],
             0
         );
 
-        $this->_os = str_replace(' ', '', str_replace('.', '', strtolower($helper->ask($input, $output, $osQuestion))));
+        $this->_os=str_replace(' ', '', str_replace('.', '', strtolower($helper->ask($input, $output, $osQuestion))));
     }
 }
\ No newline at end of file

src/Magestead/Installers/Magento2Project.php

Braces +13 added lines, -26 removed lines

@@ -20,8 +20,7 @@ 
      * @param $projectPath
      * @param OutputInterface $output
      */
-    public function __construct(array $options, array $config, $projectPath, OutputInterface $output)
-    {
+    public function __construct(array $options, array $config, $projectPath, OutputInterface $output) {
         $this->composerInstall($projectPath, $output);
         $this->installMagento($config, $projectPath, $output);
         $this->finaliseSetup($options, $projectPath, $output);
@@ -34,8 +33,7 @@ 
      * @param $projectPath
      * @param OutputInterface $output
      */
-    protected function composerInstall($projectPath, OutputInterface $output)
-    {
+    protected function composerInstall($projectPath, OutputInterface $output) {
         $output->writeln('<info>Installing Magento 2 with Composer</info>');
         $command = 'composer create-project --repository-url=https://repo.magento.com/ magento/project-community-edition public';
         new ProcessCommand($command, $projectPath, $output);
@@ -49,8 +47,7 @@ 
      * @param $projectPath
      * @param OutputInterface $output
      */
-    protected function addPhpSpecPackage($projectPath, OutputInterface $output)
-    {
+    protected function addPhpSpecPackage($projectPath, OutputInterface $output) {
         $output->writeln('<comment>Installing PHPSpec</comment>');
         $command = 'cd '.$projectPath.'/public; composer require phpspec/phpspec --dev;';
         new ProcessCommand($command, $projectPath, $output);
@@ -62,8 +59,7 @@ 
      * @param $projectPath
      * @param OutputInterface $output
      */
-    protected function addBehatPackage($projectPath, OutputInterface $output)
-    {
+    protected function addBehatPackage($projectPath, OutputInterface $output) {
         $output->writeln('<comment>Installing Behat</comment>');
         $command = 'cd '.$projectPath.'/public; composer require behat/behat --dev;';
         new ProcessCommand($command, $projectPath, $output);
@@ -76,8 +72,7 @@ 
      * @param $projectPath
      * @param OutputInterface $output
      */
-    protected function installMagento(array $options, $projectPath, OutputInterface $output)
-    {
+    protected function installMagento(array $options, $projectPath, OutputInterface $output) {
         $this->setPermissions($projectPath, $output);
 
         $output->writeln('<info>Installing Magento 2 Software</info>');
@@ -110,8 +105,7 @@ 
      * @param $projectPath
      * @param OutputInterface $output
      */
-    protected function setPermissions($projectPath, OutputInterface $output)
-    {
+    protected function setPermissions($projectPath, OutputInterface $output) {
         $output->writeln('<info>Setting Permissions</info>');
         $command = 'vagrant ssh -c \'cd /var/www/public; sudo find . -type d -exec chmod 700 {} \;\'';
         new ProcessCommand($command, $projectPath, $output);
@@ -130,8 +124,7 @@ 
      * @param $projectPath
      * @param OutputInterface $output
      */
-    protected function configureRedis($projectPath, OutputInterface $output)
-    {
+    protected function configureRedis($projectPath, OutputInterface $output) {
         $output->writeln('<comment>Configuring Redis Cache</comment>');
         $file = "$projectPath/public/app/etc/env.php";
         $env = include $file;
@@ -183,8 +176,7 @@ 
      * @param $projectPath
      * @param OutputInterface $output
      */
-    protected function finaliseSetup(array $options, $projectPath, OutputInterface $output)
-    {
+    protected function finaliseSetup(array $options, $projectPath, OutputInterface $output) {
         $command = 'vagrant ssh -c \'cd /var/www/public; bin/magento indexer:reindex; \'';
         $output->writeln('<comment>Reindexing Tables</comment>');
         new ProcessCommand($command, $projectPath, $output);
@@ -201,8 +193,7 @@ 
      * @param array $options
      * @param OutputInterface $output
      */
-    protected function showCredentials(array $options, OutputInterface $output)
-    {
+    protected function showCredentials(array $options, OutputInterface $output) {
         $output->writeln('<info>SUCCESS: Magestead has finished installing Magento 2!</info>');
         $table = new Table($output);
         $table
@@ -221,8 +212,7 @@ 
      * @param OutputInterface $output
      * @return VersionControl
      */
-    protected function processVcs(array $options, $projectPath, OutputInterface $output)
-    {
+    protected function processVcs(array $options, $projectPath, OutputInterface $output) {
         if (!empty($options['repo_url'])) {
             copy($projectPath . "/puphpet/magestead/magento2/stubs/gitignore.tmp", $projectPath . "/.gitignore");
             return new VersionControl($options['repo_url'], $projectPath, $output);
@@ -232,8 +222,7 @@ 
     /**
      * @param $projectPath
      */
-    protected function setComposerBinDir($projectPath)
-    {
+    protected function setComposerBinDir($projectPath) {
         $file = "$projectPath/public/composer.json";
         $composer = json_decode(file_get_contents($file), true);
         $composer['config']['bin-dir'] = 'bin';
@@ -244,8 +233,7 @@ 
      * @param $projectPath
      * @param OutputInterface $output
      */
-    protected function setPhpSpecPermissions($projectPath, OutputInterface $output)
-    {
+    protected function setPhpSpecPermissions($projectPath, OutputInterface $output) {
         $command = 'vagrant ssh -c \'cd /var/www/public; sudo chmod 755 bin/phpspec; bin/phpspec run\'';
         new ProcessCommand($command, $projectPath, $output);
     }
@@ -254,8 +242,7 @@ 
      * @param $projectPath
      * @param OutputInterface $output
      */
-    protected function setBehatPermissions($projectPath, OutputInterface $output)
-    {
+    protected function setBehatPermissions($projectPath, OutputInterface $output) {
         $command = 'vagrant ssh -c \'cd /var/www/public; sudo chmod 755 bin/behat; bin/behat --init\'';
         new ProcessCommand($command, $projectPath, $output);
     }

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -175,7 +175,7 @@ 
             ],
         ];
 
-        file_put_contents($file, "<?php \n \n return ".var_export($env,true).";");
+        file_put_contents($file, "<?php \n \n return ".var_export($env,TRUE).";");
     }
 
     /**
@@ -235,7 +235,7 @@ 
     protected function setComposerBinDir($projectPath)
     {
         $file = "$projectPath/public/composer.json";
-        $composer = json_decode(file_get_contents($file), true);
+        $composer = json_decode(file_get_contents($file), TRUE);
         $composer['config']['bin-dir'] = 'bin';
         file_put_contents($file, json_encode($composer));
     }

Spacing +24 added lines, -24 removed lines

@@ -37,7 +37,7 @@ 
     protected function composerInstall($projectPath, OutputInterface $output)
     {
         $output->writeln('<info>Installing Magento 2 with Composer</info>');
-        $command = 'composer create-project --repository-url=https://repo.magento.com/ magento/project-community-edition public';
+        $command='composer create-project --repository-url=https://repo.magento.com/ magento/project-community-edition public';
         new ProcessCommand($command, $projectPath, $output);
 
         $this->setComposerBinDir($projectPath);
@@ -52,7 +52,7 @@ 
     protected function addPhpSpecPackage($projectPath, OutputInterface $output)
     {
         $output->writeln('<comment>Installing PHPSpec</comment>');
-        $command = 'cd '.$projectPath.'/public; composer require phpspec/phpspec --dev;';
+        $command='cd '.$projectPath.'/public; composer require phpspec/phpspec --dev;';
         new ProcessCommand($command, $projectPath, $output);
 
         $this->setPhpSpecPermissions($projectPath, $output);
@@ -65,7 +65,7 @@ 
     protected function addBehatPackage($projectPath, OutputInterface $output)
     {
         $output->writeln('<comment>Installing Behat</comment>');
-        $command = 'cd '.$projectPath.'/public; composer require behat/behat --dev;';
+        $command='cd '.$projectPath.'/public; composer require behat/behat --dev;';
         new ProcessCommand($command, $projectPath, $output);
 
         $this->setBehatPermissions($projectPath, $output);
@@ -81,12 +81,12 @@ 
         $this->setPermissions($projectPath, $output);
 
         $output->writeln('<info>Installing Magento 2 Software</info>');
-        $locale           = $options['magestead']['apps']['mba_12345']['locale'];
-        $db_name          = $options['magestead']['apps']['mba_12345']['db_name'];
-        $base_url         = $options['magestead']['apps']['mba_12345']['base_url'];
-        $default_currency = $options['magestead']['apps']['mba_12345']['default_currency'];
+        $locale=$options['magestead']['apps']['mba_12345']['locale'];
+        $db_name=$options['magestead']['apps']['mba_12345']['db_name'];
+        $base_url=$options['magestead']['apps']['mba_12345']['base_url'];
+        $default_currency=$options['magestead']['apps']['mba_12345']['default_currency'];
 
-        $install = 'vagrant ssh -c \'cd /var/www/public; bin/magento setup:install --base-url=http://'.$base_url.'/ \
+        $install='vagrant ssh -c \'cd /var/www/public; bin/magento setup:install --base-url=http://'.$base_url.'/ \
 --db-host=localhost \
 --db-name='.$db_name.' \
 --db-user=magestead \
@@ -113,15 +113,15 @@ 
     protected function setPermissions($projectPath, OutputInterface $output)
     {
         $output->writeln('<info>Setting Permissions</info>');
-        $command = 'vagrant ssh -c \'cd /var/www/public; sudo find . -type d -exec chmod 700 {} \;\'';
+        $command='vagrant ssh -c \'cd /var/www/public; sudo find . -type d -exec chmod 700 {} \;\'';
         new ProcessCommand($command, $projectPath, $output);
         $output->writeln('<comment>Folder Permissions Set</comment>');
 
-        $command = 'vagrant ssh -c \'cd /var/www/public; sudo find . -type f -exec chmod 600 {} \;\'';
+        $command='vagrant ssh -c \'cd /var/www/public; sudo find . -type f -exec chmod 600 {} \;\'';
         new ProcessCommand($command, $projectPath, $output);
         $output->writeln('<comment>File Permissions Set</comment>');
 
-        $command = 'vagrant ssh -c \'cd /var/www/public; sudo chmod +x bin/magento\'';
+        $command='vagrant ssh -c \'cd /var/www/public; sudo chmod +x bin/magento\'';
         new ProcessCommand($command, $projectPath, $output);
         $output->writeln('<comment>bin/magento Permissions Set</comment>');
     }
@@ -133,10 +133,10 @@ 
     protected function configureRedis($projectPath, OutputInterface $output)
     {
         $output->writeln('<comment>Configuring Redis Cache</comment>');
-        $file = "$projectPath/public/app/etc/env.php";
-        $env  = include $file;
+        $file="$projectPath/public/app/etc/env.php";
+        $env=include $file;
 
-        $env['cache'] = [
+        $env['cache']=[
             'frontend' => [
                 'default' => [
                     'backend' => 'Cm_Cache_Backend_Redis',
@@ -175,7 +175,7 @@ 
             ],
         ];
 
-        file_put_contents($file, "<?php \n \n return ".var_export($env,true).";");
+        file_put_contents($file, "<?php \n \n return ".var_export($env, true).";");
     }
 
     /**
@@ -185,11 +185,11 @@ 
      */
     protected function finaliseSetup(array $options, $projectPath, OutputInterface $output)
     {
-        $command = 'vagrant ssh -c \'cd /var/www/public; bin/magento indexer:reindex; \'';
+        $command='vagrant ssh -c \'cd /var/www/public; bin/magento indexer:reindex; \'';
         $output->writeln('<comment>Reindexing Tables</comment>');
         new ProcessCommand($command, $projectPath, $output);
 
-        $command = 'vagrant ssh -c \'cd /var/www/public; bin/magento cache:flush;\'';
+        $command='vagrant ssh -c \'cd /var/www/public; bin/magento cache:flush;\'';
         $output->writeln('<comment>Flushing All Cache</comment>');
         new ProcessCommand($command, $projectPath, $output);
 
@@ -204,7 +204,7 @@ 
     protected function showCredentials(array $options, OutputInterface $output)
     {
         $output->writeln('<info>SUCCESS: Magestead has finished installing Magento 2!</info>');
-        $table = new Table($output);
+        $table=new Table($output);
         $table
             ->setHeaders(['Username', 'Password', 'Base URL', 'Admin URI'])
             ->setRows([
@@ -224,7 +224,7 @@ 
     protected function processVcs(array $options, $projectPath, OutputInterface $output)
     {
         if (!empty($options['repo_url'])) {
-            copy($projectPath . "/puphpet/magestead/magento2/stubs/gitignore.tmp", $projectPath . "/.gitignore");
+            copy($projectPath."/puphpet/magestead/magento2/stubs/gitignore.tmp", $projectPath."/.gitignore");
             return new VersionControl($options['repo_url'], $projectPath, $output);
         }
     }
@@ -234,10 +234,10 @@ 
      */
     protected function setComposerBinDir($projectPath)
     {
-        $file     = "$projectPath/public/composer.json";
-        $composer = json_decode(file_get_contents($file), true);
+        $file="$projectPath/public/composer.json";
+        $composer=json_decode(file_get_contents($file), true);
 
-        $composer['config']['bin-dir'] = 'bin';
+        $composer['config']['bin-dir']='bin';
         file_put_contents($file, json_encode($composer));
     }
 
@@ -247,7 +247,7 @@ 
      */
     protected function setPhpSpecPermissions($projectPath, OutputInterface $output)
     {
-        $command = 'vagrant ssh -c \'cd /var/www/public; sudo chmod 755 bin/phpspec; bin/phpspec run\'';
+        $command='vagrant ssh -c \'cd /var/www/public; sudo chmod 755 bin/phpspec; bin/phpspec run\'';
         new ProcessCommand($command, $projectPath, $output);
     }
 
@@ -257,7 +257,7 @@ 
      */
     protected function setBehatPermissions($projectPath, OutputInterface $output)
     {
-        $command = 'vagrant ssh -c \'cd /var/www/public; sudo chmod 755 bin/behat; bin/behat --init\'';
+        $command='vagrant ssh -c \'cd /var/www/public; sudo chmod 755 bin/behat; bin/behat --init\'';
         new ProcessCommand($command, $projectPath, $output);
     }
 }
\ No newline at end of file

src/Magestead/Installers/Project.php

Braces +1 added lines, -2 removed lines

@@ -13,8 +13,7 @@
      * @param $output
      * @return Magento2Project|MagentoProject
      */
-    public static function create(array $options, array $config, $projectPath, $output)
-    {
+    public static function create(array $options, array $config, $projectPath, $output) {
         switch ($options['app']) {
             case "magento":
                 return new MagentoProject($options, $config, $projectPath, $output);

src/Magestead/Installers/MagentoProject.php

Braces +14 added lines, -28 removed lines

@@ -24,8 +24,7 @@ 
      * @param $projectPath
      * @param OutputInterface $output
      */
-    public function __construct(array $options, array $config, $projectPath, OutputInterface $output)
-    {
+    public function __construct(array $options, array $config, $projectPath, OutputInterface $output) {
         $output->writeln('<info>Installing Magento with Composer</info>');
         $this->composerInstall($projectPath, $output);
 
@@ -46,8 +45,7 @@ 
      * @param $projectPath
      * @param $output
      */
-    protected function installMagento(array $options, $projectPath, OutputInterface $output)
-    {
+    protected function installMagento(array $options, $projectPath, OutputInterface $output) {
         $locale = $options['magestead']['apps']['mba_12345']['locale'];
         $db_name = $options['magestead']['apps']['mba_12345']['db_name'];
         $base_url = $options['magestead']['apps']['mba_12345']['base_url'];
@@ -86,8 +84,7 @@ 
      * @param $projectPath
      * @param OutputInterface $output
      */
-    protected function setPermissions($projectPath, OutputInterface $output)
-    {
+    protected function setPermissions($projectPath, OutputInterface $output) {
 //        $command = 'vagrant ssh -c \'cd /var/www/public; sudo find . -type f -exec chmod 400 {} \;\'';
 //        $output->writeln('<comment>Setting Files Permissions</comment>');
 //        new ProcessCommand($command, $projectPath, $output);
@@ -125,8 +122,7 @@ 
      * @param $projectPath
      * @param OutputInterface $output
      */
-    protected function installMagerun($projectPath, OutputInterface $output)
-    {
+    protected function installMagerun($projectPath, OutputInterface $output) {
         $command = 'vagrant ssh -c \'cd /var/www/bin; sudo wget https://files.magerun.net/n98-magerun.phar;\'';
         $output->writeln('<info>Downloading Magerun</info>');
         new ProcessCommand($command, $projectPath, $output);
@@ -141,8 +137,7 @@ 
      * @param $projectPath
      * @param OutputInterface $output
      */
-    protected function finaliseSetup(array $options, $projectPath, OutputInterface $output)
-    {
+    protected function finaliseSetup(array $options, $projectPath, OutputInterface $output) {
         $command = 'vagrant ssh -c \'cd /var/www/public; ../bin/n98-magerun.phar index:reindex:all;\'';
         $output->writeln('<comment>Reindexing Tables</comment>');
         new ProcessCommand($command, $projectPath, $output);
@@ -166,8 +161,7 @@ 
      * @param array $options
      * @param OutputInterface $output
      */
-    protected function showCredentials(array $options, OutputInterface $output)
-    {
+    protected function showCredentials(array $options, OutputInterface $output) {
         $output->writeln('<info>SUCCESS: Magestead has finished installing Magento!</info>');
         $table = new Table($output);
         $table
@@ -186,8 +180,7 @@ 
      * @param OutputInterface $output
      * @return VersionControl
      */
-    protected function processVcs(array $options, $projectPath, OutputInterface $output)
-    {
+    protected function processVcs(array $options, $projectPath, OutputInterface $output) {
         if (!empty($options['repo_url'])) {
             copy($projectPath . "/puphpet/magestead/magento/stubs/gitignore.tmp", $projectPath . "/.gitignore");
             return new VersionControl($options['repo_url'], $projectPath, $output);
@@ -198,8 +191,7 @@ 
      * @param $projectPath
      * @param OutputInterface $output
      */
-    protected function composerInstall($projectPath, OutputInterface $output)
-    {
+    protected function composerInstall($projectPath, OutputInterface $output) {
         copy($projectPath . "/puphpet/magestead/magento/stubs/composer.tmp", $projectPath . "/composer.json");
         new ProcessCommand('composer install', $projectPath, $output);
     }
@@ -207,8 +199,7 @@ 
     /**
      * @param $projectPath
      */
-    protected function configureRedis($projectPath)
-    {
+    protected function configureRedis($projectPath) {
         $this->updateConfigXml($projectPath);
         $this->activateModule($projectPath);
     }
@@ -216,8 +207,7 @@ 
     /**
      * @param $projectPath
      */
-    protected function updateConfigXml($projectPath)
-    {
+    protected function updateConfigXml($projectPath) {
         $localFile = '/public/app/etc/local.xml';
         $localXml = file_get_contents($projectPath . $localFile);
 
@@ -247,8 +237,7 @@ 
     /**
      * @param $projectPath
      */
-    protected function activateModule($projectPath)
-    {
+    protected function activateModule($projectPath) {
         $moduleFile = '/public/app/etc/modules/Cm_RedisSession.xml';
         $moduleXml = file_get_contents($projectPath . $moduleFile);
         $config = new \SimpleXMLElement($moduleXml);
@@ -262,8 +251,7 @@ 
      * @param OutputInterface $output
      * @return ProcessCommand
      */
-    protected function configureTestSuites(array $options, $projectPath, OutputInterface $output)
-    {
+    protected function configureTestSuites(array $options, $projectPath, OutputInterface $output) {
         $output->writeln('<info>Configuring PHPSpec & Behat Suites</info>');
         $progress = new ProgressBar($output, 2);
 
@@ -285,8 +273,7 @@ 
      * @param OutputInterface $output
      * @return bool|mixed
      */
-    protected function getBehatConfig(array $options, $projectPath, OutputInterface $output)
-    {
+    protected function getBehatConfig(array $options, $projectPath, OutputInterface $output) {
         $yaml = new Parser();
         try {
             $behat = $yaml->parse(file_get_contents($projectPath . "/puphpet/magestead/magento/stubs/behat.yml"));
@@ -305,8 +292,7 @@ 
      * @param $behat
      * @param $progress
      */
-    protected function saveBehatConfig($projectPath, OutputInterface $output, $behat, $progress)
-    {
+    protected function saveBehatConfig($projectPath, OutputInterface $output, $behat, $progress) {
         $dumper = new Dumper();
         $yaml = $dumper->dump($behat, 6);
         try {

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -58,6 +58,6 @@
                 break;
         }
 
-        return false;
+        return FALSE;
     }
 }

Spacing +63 added lines, -63 removed lines

@@ -48,27 +48,27 @@ 
      */
     protected function installMagento(array $options, $projectPath, OutputInterface $output)
     {
-        $locale           = $options['magestead']['apps']['mba_12345']['locale'];
-        $db_name          = $options['magestead']['apps']['mba_12345']['db_name'];
-        $base_url         = $options['magestead']['apps']['mba_12345']['base_url'];
-        $default_currency = $options['magestead']['apps']['mba_12345']['default_currency'];
+        $locale=$options['magestead']['apps']['mba_12345']['locale'];
+        $db_name=$options['magestead']['apps']['mba_12345']['db_name'];
+        $base_url=$options['magestead']['apps']['mba_12345']['base_url'];
+        $default_currency=$options['magestead']['apps']['mba_12345']['default_currency'];
 
-        $install = 'vagrant ssh -c \'cd /var/www/public; php -f install.php -- \
+        $install='vagrant ssh -c \'cd /var/www/public; php -f install.php -- \
 --license_agreement_accepted "yes" \
---locale "' . $locale . '" \
+--locale "' . $locale.'" \
 --timezone "Europe/London" \
---default_currency "' . $default_currency . '" \
+--default_currency "' . $default_currency.'" \
 --db_host "localhost" \
---db_name "' . $db_name . '" \
+--db_name "' . $db_name.'" \
 --db_user "magestead" \
 --db_pass "vagrant" \
 --session_save "db" \
---url "http://' . $base_url . '/" \
+--url "http://' . $base_url.'/" \
 --use_rewrites "yes" \
 --skip_url_validation "yes" \
 --use_secure "no" \
 --use_secure_admin "no" \
---secure_base_url "http://' . $base_url . '/" \
+--secure_base_url "http://' . $base_url.'/" \
 --admin_firstname "RichDynamix" \
 --admin_lastname "Magestead" \
 --admin_email "admin@admin.com" \
@@ -88,27 +88,27 @@ 
      */
     protected function setPermissions($projectPath, OutputInterface $output)
     {
-        $command = 'vagrant ssh -c \'cd /var/www/public; sudo find var/ -type f -exec chmod 600 {} \;\'';
+        $command='vagrant ssh -c \'cd /var/www/public; sudo find var/ -type f -exec chmod 600 {} \;\'';
         $output->writeln('<comment>Setting "var" Files Permissions</comment>');
         new ProcessCommand($command, $projectPath, $output);
 
-        $command = 'vagrant ssh -c \'cd /var/www/public; sudo find media/ -type f -exec chmod 600 {} \;\'';
+        $command='vagrant ssh -c \'cd /var/www/public; sudo find media/ -type f -exec chmod 600 {} \;\'';
         $output->writeln('<comment>Setting "media" Files Permissions</comment>');
         new ProcessCommand($command, $projectPath, $output);
 
-        $command = 'vagrant ssh -c \'cd /var/www/public; sudo find var/ -type d -exec chmod 700 {} \;\'';
+        $command='vagrant ssh -c \'cd /var/www/public; sudo find var/ -type d -exec chmod 700 {} \;\'';
         $output->writeln('<comment>Setting "var" Folder Permissions</comment>');
         new ProcessCommand($command, $projectPath, $output);
 
-        $command = 'vagrant ssh -c \'cd /var/www/public; sudo find media/ -type d -exec chmod 700 {} \;\'';
+        $command='vagrant ssh -c \'cd /var/www/public; sudo find media/ -type d -exec chmod 700 {} \;\'';
         $output->writeln('<comment>Setting "media" Folder Permissions</comment>');
         new ProcessCommand($command, $projectPath, $output);
 
-        $command = 'vagrant ssh -c \'cd /var/www/public; sudo chmod 700 includes;\'';
+        $command='vagrant ssh -c \'cd /var/www/public; sudo chmod 700 includes;\'';
         $output->writeln('<comment>Setting "includes" Permissions</comment>');
         new ProcessCommand($command, $projectPath, $output);
 
-        $command = 'vagrant ssh -c \'cd /var/www/public; sudo chmod 600 includes/config.php;\'';
+        $command='vagrant ssh -c \'cd /var/www/public; sudo chmod 600 includes/config.php;\'';
         $output->writeln('<comment>Setting "includes/config.php" Permissions</comment>');
         new ProcessCommand($command, $projectPath, $output);
     }
@@ -119,11 +119,11 @@ 
      */
     protected function installMagerun($projectPath, OutputInterface $output)
     {
-        $command = 'vagrant ssh -c \'cd /var/www/bin; sudo wget https://files.magerun.net/n98-magerun.phar;\'';
+        $command='vagrant ssh -c \'cd /var/www/bin; sudo wget https://files.magerun.net/n98-magerun.phar;\'';
         $output->writeln('<info>Downloading Magerun</info>');
         new ProcessCommand($command, $projectPath, $output);
 
-        $command = 'vagrant ssh -c \'cd /var/www/bin; sudo chmod +x ./n98-magerun.phar;\'';
+        $command='vagrant ssh -c \'cd /var/www/bin; sudo chmod +x ./n98-magerun.phar;\'';
         $output->writeln('<comment>Setting Magerun Permissions</comment>');
         new ProcessCommand($command, $projectPath, $output);
     }
@@ -135,21 +135,21 @@ 
      */
     protected function finaliseSetup(array $options, $projectPath, OutputInterface $output)
     {
-        $command = 'vagrant ssh -c \'cd /var/www/public; ../bin/n98-magerun.phar index:reindex:all;\'';
+        $command='vagrant ssh -c \'cd /var/www/public; ../bin/n98-magerun.phar index:reindex:all;\'';
         $output->writeln('<comment>Reindexing Tables</comment>');
         new ProcessCommand($command, $projectPath, $output);
 
-        $command = 'vagrant ssh -c \'cd /var/www/public; ../bin/n98-magerun.phar cache:enable;\'';
+        $command='vagrant ssh -c \'cd /var/www/public; ../bin/n98-magerun.phar cache:enable;\'';
         $output->writeln('<comment>Enabling All Cache</comment>');
         new ProcessCommand($command, $projectPath, $output);
 
-        $command = 'vagrant ssh -c \'cd /var/www/public; ../bin/n98-magerun.phar cache:flush;\'';
+        $command='vagrant ssh -c \'cd /var/www/public; ../bin/n98-magerun.phar cache:flush;\'';
         $output->writeln('<comment>Flushing All Cache</comment>');
         new ProcessCommand($command, $projectPath, $output);
 
         $this->processVcs($options, $projectPath, $output);
 
-        $command = 'vagrant ssh -c \'cd /var/www/public; ../bin/n98-magerun.phar sys:check;\'';
+        $command='vagrant ssh -c \'cd /var/www/public; ../bin/n98-magerun.phar sys:check;\'';
         $output->writeln('<comment>System Check</comment>');
         new ProcessCommand($command, $projectPath, $output);
     }
@@ -161,7 +161,7 @@ 
     protected function showCredentials(array $options, OutputInterface $output)
     {
         $output->writeln('<info>SUCCESS: Magestead has finished installing Magento!</info>');
-        $table = new Table($output);
+        $table=new Table($output);
         $table
             ->setHeaders(['Username', 'Password', 'Base URL'])
             ->setRows([
@@ -181,7 +181,7 @@ 
     protected function processVcs(array $options, $projectPath, OutputInterface $output)
     {
         if (!empty($options['repo_url'])) {
-            copy($projectPath . "/puphpet/magestead/magento/stubs/gitignore.tmp", $projectPath . "/.gitignore");
+            copy($projectPath."/puphpet/magestead/magento/stubs/gitignore.tmp", $projectPath."/.gitignore");
             return new VersionControl($options['repo_url'], $projectPath, $output);
         }
     }
@@ -192,7 +192,7 @@ 
      */
     protected function composerInstall($projectPath, OutputInterface $output)
     {
-        copy($projectPath . "/puphpet/magestead/magento/stubs/composer.tmp", $projectPath . "/composer.json");
+        copy($projectPath."/puphpet/magestead/magento/stubs/composer.tmp", $projectPath."/composer.json");
         new ProcessCommand('composer install', $projectPath, $output);
     }
 
@@ -210,31 +210,31 @@ 
      */
     protected function updateConfigXml($projectPath)
     {
-        $localFile = '/public/app/etc/local.xml';
-        $localXml  = file_get_contents($projectPath . $localFile);
-
-        $config = new \SimpleXMLElement($localXml);
-
-        $config->global[0]->redis_session[0]->host                  = '127.0.0.1';
-        $config->global[0]->redis_session[0]->port                  = '6379';
-        $config->global[0]->redis_session[0]->password              = '';
-        $config->global[0]->redis_session[0]->timeout               = '2.5';
-        $config->global[0]->redis_session[0]->persistent            = '';
-        $config->global[0]->redis_session[0]->db                    = '';
-        $config->global[0]->redis_session[0]->compression_threshold = '2048';
-        $config->global[0]->redis_session[0]->compression_lib       = 'gzip';
-        $config->global[0]->redis_session[0]->log_level             = '1';
-        $config->global[0]->redis_session[0]->max_concurrency       = '6';
-        $config->global[0]->redis_session[0]->break_after_frontend  = '5';
-        $config->global[0]->redis_session[0]->break_after_adminhtml = '30';
-        $config->global[0]->redis_session[0]->first_lifetime        = '600';
-        $config->global[0]->redis_session[0]->bot_first_lifetime    = '60';
-        $config->global[0]->redis_session[0]->bot_lifetime          = '7200';
-        $config->global[0]->redis_session[0]->disable_locking       = '0';
-        $config->global[0]->redis_session[0]->min_lifetime          = '60';
-        $config->global[0]->redis_session[0]->max_lifetime          = '2592000';
-
-        file_put_contents($projectPath . $localFile, $config->asXML());
+        $localFile='/public/app/etc/local.xml';
+        $localXml=file_get_contents($projectPath.$localFile);
+
+        $config=new \SimpleXMLElement($localXml);
+
+        $config->global[0]->redis_session[0]->host='127.0.0.1';
+        $config->global[0]->redis_session[0]->port='6379';
+        $config->global[0]->redis_session[0]->password='';
+        $config->global[0]->redis_session[0]->timeout='2.5';
+        $config->global[0]->redis_session[0]->persistent='';
+        $config->global[0]->redis_session[0]->db='';
+        $config->global[0]->redis_session[0]->compression_threshold='2048';
+        $config->global[0]->redis_session[0]->compression_lib='gzip';
+        $config->global[0]->redis_session[0]->log_level='1';
+        $config->global[0]->redis_session[0]->max_concurrency='6';
+        $config->global[0]->redis_session[0]->break_after_frontend='5';
+        $config->global[0]->redis_session[0]->break_after_adminhtml='30';
+        $config->global[0]->redis_session[0]->first_lifetime='600';
+        $config->global[0]->redis_session[0]->bot_first_lifetime='60';
+        $config->global[0]->redis_session[0]->bot_lifetime='7200';
+        $config->global[0]->redis_session[0]->disable_locking='0';
+        $config->global[0]->redis_session[0]->min_lifetime='60';
+        $config->global[0]->redis_session[0]->max_lifetime='2592000';
+
+        file_put_contents($projectPath.$localFile, $config->asXML());
     }
 
     /**
@@ -242,12 +242,12 @@ 
      */
     protected function activateModule($projectPath)
     {
-        $moduleFile = '/public/app/etc/modules/Cm_RedisSession.xml';
-        $moduleXml  = file_get_contents($projectPath . $moduleFile);
-        $config     = new \SimpleXMLElement($moduleXml);
+        $moduleFile='/public/app/etc/modules/Cm_RedisSession.xml';
+        $moduleXml=file_get_contents($projectPath.$moduleFile);
+        $config=new \SimpleXMLElement($moduleXml);
 
-        $config->modules[0]->Cm_RedisSession[0]->active = 'true';
-        file_put_contents($projectPath . $moduleFile, $config->asXML());
+        $config->modules[0]->Cm_RedisSession[0]->active='true';
+        file_put_contents($projectPath.$moduleFile, $config->asXML());
     }
 
     /**
@@ -259,10 +259,10 @@ 
     protected function configureTestSuites(array $options, $projectPath, OutputInterface $output)
     {
         $output->writeln('<info>Configuring PHPSpec & Behat Suites</info>');
-        $progress = new ProgressBar($output, 2);
+        $progress=new ProgressBar($output, 2);
 
         $progress->start();
-        copy($projectPath . "/puphpet/magestead/magento/stubs/phpspec.yml", $projectPath . "/phpspec.yml");
+        copy($projectPath."/puphpet/magestead/magento/stubs/phpspec.yml", $projectPath."/phpspec.yml");
         $progress->advance();
         $progress->advance();
 //        $behat = $this->getBehatConfig($options, $projectPath, $output);
@@ -281,12 +281,12 @@ 
      */
     protected function getBehatConfig(array $options, $projectPath, OutputInterface $output)
     {
-        $yaml = new Parser();
+        $yaml=new Parser();
 
         try {
-            $behat = $yaml->parse(file_get_contents($projectPath . "/puphpet/magestead/magento/stubs/behat.yml"));
+            $behat=$yaml->parse(file_get_contents($projectPath."/puphpet/magestead/magento/stubs/behat.yml"));
 
-            $behat['default']['extensions']['MageTest\MagentoExtension\Extension']['base_url'] = $options['base_url'];
+            $behat['default']['extensions']['MageTest\MagentoExtension\Extension']['base_url']=$options['base_url'];
             return $behat;
         } catch (ParseException $e) {
             $output->writeln('<error>Unable to parse the YAML config</error>');
@@ -303,11 +303,11 @@ 
      */
     protected function saveBehatConfig($projectPath, OutputInterface $output, $behat, $progress)
     {
-        $dumper = new Dumper();
-        $yaml   = $dumper->dump($behat, 6);
+        $dumper=new Dumper();
+        $yaml=$dumper->dump($behat, 6);
 
         try {
-            file_put_contents($projectPath . '/behat.yml', $yaml);
+            file_put_contents($projectPath.'/behat.yml', $yaml);
             $progress->advance();
         } catch (\Exception $e) {
             $output->writeln('<error>Unable to write to the YAML file</error>');

src/Magestead/Command/SetupCommand.php

Braces +7 added lines, -14 removed lines

@@ -20,8 +20,7 @@ 
     protected $_projectPath;
     protected $_magesteadConfig;
 
-    protected function configure()
-    {
+    protected function configure() {
         $this->_basePath = dirname( __FILE__ ) . '/../../../';
         $this->_projectPath = getcwd();
 
@@ -34,8 +33,7 @@ 
      * @param OutputInterface $output
      * @return \Magestead\Installers\Magento2Project|\Magestead\Installers\MagentoProject
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
-    {
+    protected function execute(InputInterface $input, OutputInterface $output) {
         $helper = $this->getHelper('question');
         $options = new Options($helper, $input, $output);
 
@@ -52,8 +50,7 @@ 
      * @param $target
      * @param OutputInterface $output
      */
-    protected function copyConfigFiles($source, $target, OutputInterface $output)
-    {
+    protected function copyConfigFiles($source, $target, OutputInterface $output) {
         try {
             $progress = new ProgressBar($output, 3720);
             $progress->start();
@@ -80,8 +77,7 @@ 
      * @param array $options
      * @param OutputInterface $output
      */
-    protected function configureProject(array $options, OutputInterface $output)
-    {
+    protected function configureProject(array $options, OutputInterface $output) {
         $this->_magesteadConfig = $this->getConfigFile($output);
 
         $this->_magesteadConfig['vagrantfile']['vm']['box'] = $options['box'];
@@ -103,8 +99,7 @@ 
      * @param OutputInterface $output
      * @return mixed
      */
-    protected function getConfigFile(OutputInterface $output)
-    {
+    protected function getConfigFile(OutputInterface $output) {
         $yaml = new Parser();
         try {
             return $yaml->parse(file_get_contents($this->_projectPath . '/magestead.yaml'));
@@ -118,8 +113,7 @@ 
      * @param array $config
      * @param OutputInterface $output
      */
-    protected function saveConfigFile(array $config, OutputInterface $output)
-    {
+    protected function saveConfigFile(array $config, OutputInterface $output) {
         $dumper = new Dumper();
         $yaml = $dumper->dump($config, 6);
 
@@ -134,8 +128,7 @@ 
      * @param OutputInterface $output
      * @param $options
      */
-    protected function setupProject(OutputInterface $output, $options)
-    {
+    protected function setupProject(OutputInterface $output, $options) {
         $output->writeln('<info>Setting up project structure</info>');
         $provisionFolder = $this->_basePath . "provision";
         $this->copyConfigFiles($provisionFolder, $this->_projectPath, $output);

Spacing +29 added lines, -29 removed lines

@@ -22,8 +22,8 @@ 
 
     protected function configure()
     {
-        $this->_basePath    = dirname( __FILE__ ) . '/../../../';
-        $this->_projectPath = getcwd();
+        $this->_basePath=dirname(__FILE__).'/../../../';
+        $this->_projectPath=getcwd();
 
         $this->setName("setup");
         $this->setDescription("Initialise Magestead project into current working directory");
@@ -36,8 +36,8 @@ 
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $helper  = $this->getHelper('question');
-        $options = new Options($helper, $input, $output);
+        $helper=$this->getHelper('question');
+        $options=new Options($helper, $input, $output);
 
         $this->setupProject($output, $options);
 
@@ -55,17 +55,17 @@ 
     protected function copyConfigFiles($source, $target, OutputInterface $output)
     {
         try {
-            $progress = new ProgressBar($output, 3720);
+            $progress=new ProgressBar($output, 3720);
             $progress->start();
             foreach (
-                $iterator = new \RecursiveIteratorIterator(
+                $iterator=new \RecursiveIteratorIterator(
                     new \RecursiveDirectoryIterator($source, \RecursiveDirectoryIterator::SKIP_DOTS),
                     \RecursiveIteratorIterator::SELF_FIRST) as $item
             ) {
                 if ($item->isDir()) {
-                    mkdir($target . DIRECTORY_SEPARATOR . $iterator->getSubPathName());
+                    mkdir($target.DIRECTORY_SEPARATOR.$iterator->getSubPathName());
                 } else {
-                    copy($item, $target . DIRECTORY_SEPARATOR . $iterator->getSubPathName());
+                    copy($item, $target.DIRECTORY_SEPARATOR.$iterator->getSubPathName());
                 }
                 $progress->advance();
             }
@@ -82,24 +82,24 @@ 
      */
     protected function configureProject(array $options, OutputInterface $output)
     {
-        $msConfig = $this->getConfigFile($output);
+        $msConfig=$this->getConfigFile($output);
 
-        $app = ($options['app'] == 'magento2') ? 'magento2' : 'magento';
-        $hostname = 'magestead-' . $options['base_url'];
+        $app=($options['app'] == 'magento2') ? 'magento2' : 'magento';
+        $hostname='magestead-'.$options['base_url'];
 
-        $msConfig['vagrantfile']['vm']['box']                           = $options['box'];
-        $msConfig['vagrantfile']['vm']['box_url']                       = $options['box'];
-        $msConfig['vagrantfile']['vm']['hostname']                      = $hostname;
-        $msConfig['vagrantfile']['vm']['memory']                        = $options['memory_limit'];
-        $msConfig['vagrantfile']['vm']['network']['private_network']    = $options['ip_address'];
-        $msConfig['magestead']['apps']['mba_12345']['type']             = $app;
-        $msConfig['magestead']['apps']['mba_12345']['locale']           = $options['locale'];
-        $msConfig['magestead']['apps']['mba_12345']['default_currency'] = $options['default_currency'];
-        $msConfig['magestead']['apps']['mba_12345']['base_url']         = $options['base_url'];
-        $msConfig['magestead']['os']                                    = $options['os'];
-        $msConfig['magestead']['server']                                = $options['server'];
+        $msConfig['vagrantfile']['vm']['box']=$options['box'];
+        $msConfig['vagrantfile']['vm']['box_url']=$options['box'];
+        $msConfig['vagrantfile']['vm']['hostname']=$hostname;
+        $msConfig['vagrantfile']['vm']['memory']=$options['memory_limit'];
+        $msConfig['vagrantfile']['vm']['network']['private_network']=$options['ip_address'];
+        $msConfig['magestead']['apps']['mba_12345']['type']=$app;
+        $msConfig['magestead']['apps']['mba_12345']['locale']=$options['locale'];
+        $msConfig['magestead']['apps']['mba_12345']['default_currency']=$options['default_currency'];
+        $msConfig['magestead']['apps']['mba_12345']['base_url']=$options['base_url'];
+        $msConfig['magestead']['os']=$options['os'];
+        $msConfig['magestead']['server']=$options['server'];
 
-        $this->_msConfig = $msConfig;
+        $this->_msConfig=$msConfig;
 
         $this->saveConfigFile($msConfig, $output);
 
@@ -111,9 +111,9 @@ 
      */
     protected function getConfigFile(OutputInterface $output)
     {
-        $yaml = new Parser();
+        $yaml=new Parser();
         try {
-            return $yaml->parse(file_get_contents($this->_projectPath . '/magestead.yaml'));
+            return $yaml->parse(file_get_contents($this->_projectPath.'/magestead.yaml'));
         } catch (ParseException $e) {
             $output->writeln('<error>Unable to parse the YAML string</error>');
             printf("Unable to parse the YAML string: %s", $e->getMessage());
@@ -126,11 +126,11 @@ 
      */
     protected function saveConfigFile(array $config, OutputInterface $output)
     {
-        $dumper = new Dumper();
-        $yaml   = $dumper->dump($config, 6);
+        $dumper=new Dumper();
+        $yaml=$dumper->dump($config, 6);
 
         try {
-            file_put_contents($this->_projectPath . '/magestead.yaml', $yaml);
+            file_put_contents($this->_projectPath.'/magestead.yaml', $yaml);
         } catch (\Exception $e) {
             $output->writeln('<error>Unable to write to the YAML file</error>');
         }
@@ -143,7 +143,7 @@ 
     protected function setupProject(OutputInterface $output, $options)
     {
         $output->writeln('<info>Setting up project structure</info>');
-        $provisionFolder = $this->_basePath . "provision";
+        $provisionFolder=$this->_basePath."provision";
         $this->copyConfigFiles($provisionFolder, $this->_projectPath, $output);
         $this->configureProject($options->getAllOptions(), $output);
     }