richdynamix / magestead

src/Magestead/Command/NewCommand.php

Spacing +28 added lines, -28 removed lines

@@ -26,8 +26,8 @@ 
 
     protected function configure()
     {
-        $this->_basePath = dirname(__FILE__).'/../../../';
-        $this->_projectPath = getcwd();
+        $this->_basePath=dirname(__FILE__).'/../../../';
+        $this->_projectPath=getcwd();
 
         $this->setName('new');
         $this->setDescription('Initialise new Magestead project into current working directory');
@@ -44,10 +44,10 @@ 
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $project = $this->setProject($input);
+        $project=$this->setProject($input);
 
-        $helper = $this->getHelper('question');
-        $options = new Options($helper, $input, $output, $project);
+        $helper=$this->getHelper('question');
+        $options=new Options($helper, $input, $output, $project);
 
         $this->setupProject($output, $options);
 
@@ -65,10 +65,10 @@ 
     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
             ) {
@@ -92,24 +92,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);
     }
@@ -121,7 +121,7 @@ 
      */
     protected function getConfigFile(OutputInterface $output)
     {
-        $yaml = new Parser();
+        $yaml=new Parser();
         try {
             return $yaml->parse(file_get_contents($this->_projectPath.'/magestead.yaml'));
         } catch (ParseException $e) {
@@ -136,8 +136,8 @@ 
      */
     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);
@@ -153,7 +153,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);
 
@@ -169,8 +169,8 @@ 
      */
     protected function setProject(InputInterface $input)
     {
-        $project = $input->getArgument('project');
-        $this->_projectPath = $this->_projectPath.'/'.$project;
+        $project=$input->getArgument('project');
+        $this->_projectPath=$this->_projectPath.'/'.$project;
 
         if (is_dir($this->_projectPath)) {
             throw new ExistingProjectException('Target project directory already exists');

src/Magestead/Command/Log/StreamCommand.php

Spacing +10 added lines, -10 removed lines

@@ -22,7 +22,7 @@ 
      */
     protected function configure()
     {
-        $this->_projectPath = getcwd();
+        $this->_projectPath=getcwd();
         $this->setName('log:stream');
         $this->setDescription('Stream a specific server log');
         $this->addArgument('log', InputArgument::REQUIRED, 'access or error');
@@ -36,15 +36,15 @@ 
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $log = $input->getArgument('log');
+        $log=$input->getArgument('log');
 
         $output->writeln('<info>Streaming '.ucwords($log).' Log</info>');
-        $command = $this->getCommand(new Config($output), $log);
+        $command=$this->getCommand(new Config($output), $log);
         if (!$command) {
             return $output->writeln('<error>Command not available for this application</error>');
         }
 
-        $pCommand = "vagrant ssh -c '".$command."'";
+        $pCommand="vagrant ssh -c '".$command."'";
 
         return new ProcessCommand($pCommand, $this->_projectPath, $output);
     }
@@ -57,11 +57,11 @@ 
      */
     private function getCommand(Config $config, $log)
     {
-        $server = $config->_config['magestead']['server'];
-        $os = $config->_config['magestead']['os'];
+        $server=$config->_config['magestead']['server'];
+        $os=$config->_config['magestead']['os'];
 
-        $location = $this->getLogLocation($server, $os);
-        $command = 'tail -f /var/log/'.$location.'/'.$config->base_url.'-'.$log.'.log';
+        $location=$this->getLogLocation($server, $os);
+        $command='tail -f /var/log/'.$location.'/'.$config->base_url.'-'.$log.'.log';
 
         return $command;
     }
@@ -74,9 +74,9 @@ 
      */
     private function getLogLocation($server, $os)
     {
-        $location = 'nginx';
+        $location='nginx';
         if ($server != 'nginx') {
-            $location = ($os == 'ubuntu14') ? 'apache2' : 'httpd';
+            $location=($os == 'ubuntu14') ? 'apache2' : 'httpd';
         }
 
         return $location;

src/Magestead/Command/Log/ViewCommand.php

Spacing +10 added lines, -10 removed lines

@@ -22,7 +22,7 @@ 
      */
     protected function configure()
     {
-        $this->_projectPath = getcwd();
+        $this->_projectPath=getcwd();
         $this->setName('log:view');
         $this->setDescription('View a specific server log');
         $this->addArgument('log', InputArgument::REQUIRED, 'access or error');
@@ -36,15 +36,15 @@ 
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $log = $input->getArgument('log');
+        $log=$input->getArgument('log');
 
         $output->writeln('<info>Viewing '.ucwords($log).' Log</info>');
-        $command = $this->getCommand(new Config($output), $log);
+        $command=$this->getCommand(new Config($output), $log);
         if (!$command) {
             return $output->writeln('<error>Command not available for this application</error>');
         }
 
-        $pCommand = "vagrant ssh -c '".$command."'";
+        $pCommand="vagrant ssh -c '".$command."'";
 
         return new ProcessCommand($pCommand, $this->_projectPath, $output);
     }
@@ -57,11 +57,11 @@ 
      */
     private function getCommand(Config $config, $log)
     {
-        $server = $config->_config['magestead']['server'];
-        $os = $config->_config['magestead']['os'];
+        $server=$config->_config['magestead']['server'];
+        $os=$config->_config['magestead']['os'];
 
-        $location = $this->getLogLocation($server, $os);
-        $command = 'cat /var/log/'.$location.'/'.$config->base_url.'-'.$log.'.log';
+        $location=$this->getLogLocation($server, $os);
+        $command='cat /var/log/'.$location.'/'.$config->base_url.'-'.$log.'.log';
 
         return $command;
     }
@@ -74,9 +74,9 @@ 
      */
     private function getLogLocation($server, $os)
     {
-        $location = 'nginx';
+        $location='nginx';
         if ($server != 'nginx') {
-            $location = ($os == 'ubuntu14') ? 'apache2' : 'httpd';
+            $location=($os == 'ubuntu14') ? 'apache2' : 'httpd';
         }
 
         return $location;

src/Magestead/Command/PhpspecCommand.php

Spacing +5 added lines, -5 removed lines

@@ -17,7 +17,7 @@ 
 
     protected function configure()
     {
-        $this->_projectPath = getcwd();
+        $this->_projectPath=getcwd();
 
         $this->setName('phpspec');
         $this->setDescription('Run PHPSpec against your project');
@@ -32,15 +32,15 @@ 
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $option = $input->getArgument('option');
+        $option=$input->getArgument('option');
 
-        $command = $this->getCommand(new Config($output), $option);
+        $command=$this->getCommand(new Config($output), $option);
         if (!$command) {
             return $output->writeln('<error>Command not available for this application</error>');
         }
 
         $output->writeln('<info>Running PHPSpec</info>');
-        $passedCommand = "vagrant ssh -c '".$command."'";
+        $passedCommand="vagrant ssh -c '".$command."'";
         passthru($passedCommand);
     }
 
@@ -52,7 +52,7 @@ 
      */
     protected function getCommand(Config $config, $option)
     {
-        $type = $config->type;
+        $type=$config->type;
         switch ($type) {
             case 'magento':
                 return "cd /var/www;bin/phpspec $option";

src/Magestead/Helper/Config.php

Spacing +3 added lines, -3 removed lines

@@ -18,8 +18,8 @@ 
      */
     public function __construct(OutputInterface $output)
     {
-        $this->_projectPath = getcwd();
-        $this->_config = $this->getConfigFile($output);
+        $this->_projectPath=getcwd();
+        $this->_config=$this->getConfigFile($output);
     }
 
     /**
@@ -39,7 +39,7 @@ 
      */
     protected function getConfigFile(OutputInterface $output)
     {
-        $config = new Parser();
+        $config=new Parser();
         try {
             return $config->parse($this->readConfigFile());
         } catch (ParseException $e) {

Braces +4 added lines, -8 removed lines

@@ -16,8 +16,7 @@ 
      *
      * @param OutputInterface $output
      */
-    public function __construct(OutputInterface $output)
-    {
+    public function __construct(OutputInterface $output) {
         $this->_projectPath = getcwd();
         $this->_config = $this->getConfigFile($output);
     }
@@ -27,8 +26,7 @@ 
      *
      * @return mixed
      */
-    public function __get($name)
-    {
+    public function __get($name) {
         return $this->_config['magestead']['apps']['mba_12345'][$name];
     }
 
@@ -37,8 +35,7 @@ 
      *
      * @return bool|mixed
      */
-    protected function getConfigFile(OutputInterface $output)
-    {
+    protected function getConfigFile(OutputInterface $output) {
         $config = new Parser();
         try {
             return $config->parse($this->readConfigFile());
@@ -54,8 +51,7 @@ 
      *
      * @return string
      */
-    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?');
         }

src/Magestead/Helper/HostsPluginChecker.php

Spacing +2 added lines, -2 removed lines

@@ -15,7 +15,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);
 
@@ -33,7 +33,7 @@ 
     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'].
+        $comment=$options['vagrantfile']['vm']['network']['private_network'].
             ' '.$options['magestead']['apps']['mba_12345']['base_url'];
         $output->writeln('<info>'.$comment.'</info>');
     }

src/Magestead/Helper/Options.php

Indentation +14 added lines, -14 removed lines

@@ -57,20 +57,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,
         ];
     }
 

Spacing +41 added lines, -41 removed lines

@@ -13,11 +13,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;
@@ -28,7 +28,7 @@ 
     protected $_locale;
     protected $_currency;
     protected $_baseUrl;
-    protected $_repoUrl = '';
+    protected $_repoUrl='';
 
     /**
      * Options constructor.
@@ -83,14 +83,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));
     }
 
     /**
@@ -102,22 +102,22 @@ 
     protected function setApplicationSettings($helper, InputInterface $input, OutputInterface $output, $project)
     {
         $output->writeln('<comment>Lets configure your project\'s application</comment>');
-        $appQuestion = new ChoiceQuestion(
+        $appQuestion=new ChoiceQuestion(
             'Which application do you want to install?',
             ['Magento', 'Magento2'],
             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 ($project.dev): ", $project.'.dev');
-        $this->_baseUrl = strtolower($helper->ask($input, $output, $baseUrlQuestion));
+        $baseUrlQuestion=new Question("Enter your application's base_url ($project.dev): ", $project.'.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);
     }
 
     /**
@@ -143,11 +143,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));
         }
     }
 
@@ -158,11 +158,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);
     }
 
     /**
@@ -174,12 +174,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;
@@ -188,10 +188,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);
     }
@@ -204,13 +204,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);
     }
 
     /**
@@ -218,7 +218,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";
     }
 
     /**
@@ -241,13 +241,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));
     }
 
     /**
@@ -257,12 +257,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))));
     }
 }

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

@@ -133,7 +133,7 @@ 
             return $this->verifyAuth($helper, $input, $output);
         }
 
-        return true;
+        return TRUE;
     }
 
     /**
@@ -143,7 +143,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: ', '');
@@ -182,7 +182,7 @@ 
             $authObj = (array) json_decode($authJson);
 
             if (isset($authObj['http-basic']) && isset($authObj['http-basic']->{'repo.magento.com'})) {
-                return true;
+                return TRUE;
             }
         }
 

src/Magestead/Installers/MagentoProject.php

Spacing +51 added lines, -51 removed lines

@@ -50,12 +50,12 @@ 
      */
     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.'" \
 --timezone "Europe/London" \
@@ -90,27 +90,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);
     }
@@ -121,11 +121,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);
     }
@@ -137,21 +137,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);
     }
@@ -163,7 +163,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([
@@ -214,29 +214,29 @@ 
      */
     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';
+        $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());
     }
@@ -246,11 +246,11 @@ 
      */
     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';
+        $config->modules[0]->Cm_RedisSession[0]->active='true';
         file_put_contents($projectPath.$moduleFile, $config->asXML());
     }
 
@@ -264,7 +264,7 @@ 
     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');
@@ -288,12 +288,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) {
@@ -311,8 +311,8 @@ 
      */
     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);

src/Magestead/Installers/Magento2Project.php

Spacing +22 added lines, -22 removed lines

@@ -39,7 +39,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);
@@ -54,7 +54,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);
@@ -67,7 +67,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);
@@ -83,12 +83,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 \
@@ -115,15 +115,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; sudo chmod 755 bin/phpspec; sudo chmod 755 bin/behat;\'';
+        $command='vagrant ssh -c \'cd /var/www/public; sudo chmod +x bin/magento; sudo chmod 755 bin/phpspec; sudo chmod 755 bin/behat;\'';
         new ProcessCommand($command, $projectPath, $output);
         $output->writeln('<comment>bin/magento Permissions Set</comment>');
     }
@@ -135,10 +135,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',
@@ -187,11 +187,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);
 
@@ -206,7 +206,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([
@@ -238,10 +238,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));
     }
 
@@ -251,7 +251,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);
     }
 
@@ -261,7 +261,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);
     }
 }

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

@@ -177,7 +177,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).';');
     }
 
     /**
@@ -239,7 +239,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));