richdynamix / magestead

src/Magestead/Exceptions/MissingComposerHomeException.php

Braces +3 added lines, -1 removed lines

@@ -4,4 +4,6 @@
  * Class MissingComposerHomeException
  * @package Magestead\Exceptions
  */
-class MissingComposerHomeException extends \Exception {}
\ No newline at end of file
+class MissingComposerHomeException extends \Exception
+{
+}
\ No newline at end of file

src/Magestead/Helper/Config.php

Spacing +7 added lines, -7 removed lines

@@ -23,8 +23,8 @@ 
      */
     public function __construct(OutputInterface $output)
     {
-        $this->_projectPath = getcwd();
-        $this->output = $output;
+        $this->_projectPath=getcwd();
+        $this->output=$output;
     }
 
     /**
@@ -33,7 +33,7 @@ 
      */
     function __get($name)
     {
-        $this->_config = $this->getConfigFile($this->output);
+        $this->_config=$this->getConfigFile($this->output);
         return $this->_config['magestead']['apps']['mba_12345'][$name];
     }
 
@@ -43,7 +43,7 @@ 
      */
     protected function getConfigFile(OutputInterface $output)
     {
-        $config = new Parser();
+        $config=new Parser();
         try {
             return $config->parse($this->readConfigFile());
         } catch (ParseException $e) {
@@ -59,11 +59,11 @@ 
      */
     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');
     }
 
     /**
@@ -74,7 +74,7 @@ 
      */
     public function getComposerHomeDir()
     {
-        $composerConfig = shell_exec('composer config --list --global | grep home');
+        $composerConfig=shell_exec('composer config --list --global | grep home');
 
         if (is_null($composerConfig)) {
             throw new MissingComposerHomeException('Composer home directory is not found. Do you have it installed?');

Braces +5 added lines, -10 removed lines

@@ -21,8 +21,7 @@ 
      * Config constructor.
      * @param OutputInterface $output
      */
-    public function __construct(OutputInterface $output)
-    {
+    public function __construct(OutputInterface $output) {
         $this->_projectPath = getcwd();
         $this->output = $output;
     }
@@ -31,8 +30,7 @@ 
      * @param $name
      * @return mixed
      */
-    function __get($name)
-    {
+    function __get($name) {
         $this->_config = $this->getConfigFile($this->output);
         return $this->_config['magestead']['apps']['mba_12345'][$name];
     }
@@ -41,8 +39,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());
@@ -57,8 +54,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?');
         }
@@ -72,8 +68,7 @@ 
      * @return string
      * @throws MissingComposerHomeException
      */
-    public function getComposerHomeDir()
-    {
+    public function getComposerHomeDir() {
         $composerConfig = shell_exec('composer config --list --global | grep home');
 
         if (is_null($composerConfig)) {

src/Magestead/Installers/Magento2Project.php

Spacing +29 added lines, -29 removed lines

@@ -28,7 +28,7 @@ 
      */
     public function __construct(array $options, array $config, $projectPath, OutputInterface $output)
     {
-        $this->output = $output;
+        $this->output=$output;
         $this->composerInstall($projectPath, $output);
         $this->installMagento($config, $options, $projectPath, $output);
         $this->finaliseSetup($options, $projectPath, $output);
@@ -44,7 +44,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->copyAuthFile($projectPath);
@@ -59,10 +59,10 @@ 
      */
     protected function copyAuthFile($destination)
     {
-        $composerHome = (new Config($this->output))->getComposerHomeDir();
-        $authFile = $composerHome . "/auth.json";
+        $composerHome=(new Config($this->output))->getComposerHomeDir();
+        $authFile=$composerHome."/auth.json";
 
-        return copy($authFile, $destination . '/public/auth.json');
+        return copy($authFile, $destination.'/public/auth.json');
     }
 
     /**
@@ -72,7 +72,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);
@@ -85,7 +85,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);
@@ -104,12 +104,12 @@ 
         $this->installSampleData($options, $projectPath, $output);
 
         $output->writeln('<info>Installing Magento 2 Software</info>');
-        $locale           = $config['magestead']['apps']['mba_12345']['locale'];
-        $db_name          = $config['magestead']['apps']['mba_12345']['db_name'];
-        $base_url         = $config['magestead']['apps']['mba_12345']['base_url'];
-        $default_currency = $config['magestead']['apps']['mba_12345']['default_currency'];
+        $locale=$config['magestead']['apps']['mba_12345']['locale'];
+        $db_name=$config['magestead']['apps']['mba_12345']['db_name'];
+        $base_url=$config['magestead']['apps']['mba_12345']['base_url'];
+        $default_currency=$config['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 \
@@ -138,7 +138,7 @@ 
     {
         if (true === $options['installSampleData']) {
             $output->writeln('<info>Installing Magento 2 Sample Data</info>');
-            $deployCommand = 'vagrant ssh -c \'cd /var/www/public; bin/magento sampledata:deploy \'';
+            $deployCommand='vagrant ssh -c \'cd /var/www/public; bin/magento sampledata:deploy \'';
             new ProcessCommand($deployCommand, $projectPath, $output);
         }
     }
@@ -150,15 +150,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>');
     }
@@ -170,10 +170,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',
@@ -212,7 +212,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).";");
     }
 
     /**
@@ -222,11 +222,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);
 
@@ -241,7 +241,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([
@@ -261,7 +261,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);
         }
     }
@@ -271,10 +271,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));
     }
 
@@ -284,7 +284,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);
     }
 
@@ -294,7 +294,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/Helper/Options.php

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

@@ -28,7 +28,7 @@ 
     protected $_currency;
     protected $_baseUrl;
     protected $_repoUrl = '';
-    protected $installSampleData = false;
+    protected $installSampleData = FALSE;
 
     /**
      * Options constructor.
@@ -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: ", '');
@@ -153,7 +153,7 @@ 
 
     protected function installSampleData($helper, InputInterface $input, OutputInterface $output)
     {
-        $sampleInstall = new ConfirmationQuestion("Would you like to install sample data? (no/yes) ", false);
+        $sampleInstall = new ConfirmationQuestion("Would you like to install sample data? (no/yes) ", FALSE);
         $this->installSampleData = $helper->ask($input, $output, $sampleInstall);
     }
 
@@ -184,10 +184,10 @@ 
         $authObj = [];
         if (file_exists($authFile)) {
             $authJson = file_get_contents($authFile);
-            $authObj  = (array)json_decode($authJson, true);
+            $authObj  = (array)json_decode($authJson, TRUE);
 
             if (isset($authObj['http-basic']) && isset($authObj['http-basic']->{'repo.magento.com'})) {
-                return true;
+                return TRUE;
             }
         }
 

Spacing +45 added lines, -45 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,8 +27,8 @@ 
     protected $_locale;
     protected $_currency;
     protected $_baseUrl;
-    protected $_repoUrl = '';
-    protected $installSampleData = false;
+    protected $_repoUrl='';
+    protected $installSampleData=false;
 
     /**
      * 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,18 +143,18 @@ 
      */
     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));
         }
     }
 
     protected function installSampleData($helper, InputInterface $input, OutputInterface $output)
     {
-        $sampleInstall = new ConfirmationQuestion("Would you like to install sample data? (no/yes) ", false);
-        $this->installSampleData = $helper->ask($input, $output, $sampleInstall);
+        $sampleInstall=new ConfirmationQuestion("Would you like to install sample data? (no/yes) ", false);
+        $this->installSampleData=$helper->ask($input, $output, $sampleInstall);
     }
 
     /**
@@ -164,11 +164,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);
     }
 
     /**
@@ -179,13 +179,13 @@ 
      */
     protected function verifyAuth($helper, InputInterface $input, OutputInterface $output)
     {
-        $composerHome = (new Config($output))->getComposerHomeDir();
-        $authFile = $composerHome . "/auth.json";
+        $composerHome=(new Config($output))->getComposerHomeDir();
+        $authFile=$composerHome."/auth.json";
 
-        $authObj = [];
+        $authObj=[];
         if (file_exists($authFile)) {
-            $authJson = file_get_contents($authFile);
-            $authObj  = (array)json_decode($authJson, true);
+            $authJson=file_get_contents($authFile);
+            $authObj=(array) json_decode($authJson, true);
 
             if (isset($authObj['http-basic']) && isset($authObj['http-basic']->{'repo.magento.com'})) {
                 return true;
@@ -194,10 +194,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);
     }
 
@@ -208,13 +208,13 @@ 
      */
     protected function setPhp($helper, InputInterface $input, OutputInterface $output)
     {
-        $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);
     }
 
     /**
@@ -222,7 +222,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";
     }
 
     /**
@@ -245,13 +245,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));
     }
 
     /**
@@ -261,12 +261,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))));
     }
 }