richdynamix / magestead

src/Magestead/Exceptions/ExistingProjectException.php

Braces +3 added lines, -1 removed lines

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

src/Magestead/Helper/Options.php

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.
@@ -81,14 +81,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));
     }
 
     /**
@@ -101,23 +101,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', '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);
     }
 
     /**
@@ -142,11 +142,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));
         }
     }
 
@@ -157,11 +157,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);
     }
 
     /**
@@ -172,12 +172,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;
@@ -186,10 +186,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);
     }
 
@@ -201,13 +201,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);
     }
 
     /**
@@ -215,7 +215,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";
     }
 
     /**
@@ -238,13 +238,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));
     }
 
     /**
@@ -254,12 +254,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

Braces +13 added lines, -26 removed lines

@@ -36,8 +36,7 @@ 
      * @param OutputInterface $output
      * @param $project
      */
-    public function __construct($helper, InputInterface $input, OutputInterface $output, $project)
-    {
+    public function __construct($helper, InputInterface $input, OutputInterface $output, $project) {
         $this->setVagrantSettings($helper, $input, $output);
 
         $this->setServerConfig($helper, $input, $output);
@@ -52,8 +51,7 @@ 
     /**
      * @return array
      */
-    public function getAllOptions()
-    {
+    public function getAllOptions() {
         return [
           'app' => $this->_app,
           'server' => $this->_server,
@@ -77,8 +75,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');
@@ -97,8 +94,7 @@ 
      * @param OutputInterface $output
      * @param $project
      */
-    protected function setApplicationSettings($helper, InputInterface $input, OutputInterface $output, $project)
-    {
+    protected function setApplicationSettings($helper, InputInterface $input, OutputInterface $output, $project) {
         $output->writeln('<comment>Lets configure your project\'s application</comment>');
         if ($this->_phpVer !== '70') {
             $appQuestion = new ChoiceQuestion(
@@ -126,8 +122,7 @@ 
      * @param OutputInterface $output
      * @return boolean|integer
      */
-    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);
         }
@@ -140,8 +135,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) {
@@ -155,8 +149,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);
 
@@ -170,8 +163,7 @@ 
      * @param OutputInterface $output
      * @return boolean|integer
      */
-    protected function verifyAuth($helper, InputInterface $input, OutputInterface $output)
-    {
+    protected function verifyAuth($helper, InputInterface $input, OutputInterface $output) {
         $authFile = $_SERVER['HOME'] . "/.composer/auth.json";
 
         $authObj = [];
@@ -198,8 +190,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?",
@@ -213,8 +204,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";
     }
 
@@ -223,8 +213,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);
@@ -236,8 +225,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'],
@@ -252,8 +240,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'],

src/Magestead/Command/NewCommand.php

Spacing +32 added lines, -32 removed lines

@@ -24,8 +24,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");
@@ -41,10 +41,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);
 
@@ -62,17 +62,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();
             }
@@ -89,24 +89,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);
 
@@ -118,9 +118,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());
@@ -133,11 +133,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>');
         }
@@ -150,7 +150,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);
     }
@@ -162,8 +162,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)) {

Braces +8 added lines, -16 removed lines

@@ -22,8 +22,7 @@ 
     protected $_projectPath;
     protected $_msConfig;
 
-    protected function configure()
-    {
+    protected function configure() {
         $this->_basePath    = dirname( __FILE__ ) . '/../../../';
         $this->_projectPath = getcwd();
 
@@ -39,8 +38,7 @@ 
      * @return \Magestead\Installers\Magento2Project|\Magestead\Installers\MagentoProject
      * @throws ExistingProjectException
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
-    {
+    protected function execute(InputInterface $input, OutputInterface $output) {
         $project = $this->setProject($input);
 
         $helper  = $this->getHelper('question');
@@ -59,8 +57,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();
@@ -87,8 +84,7 @@ 
      * @param array $options
      * @param OutputInterface $output
      */
-    protected function configureProject(array $options, OutputInterface $output)
-    {
+    protected function configureProject(array $options, OutputInterface $output) {
         $msConfig = $this->getConfigFile($output);
 
         $app = ($options['app'] == 'magento2') ? 'magento2' : 'magento';
@@ -116,8 +112,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'));
@@ -131,8 +126,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);
 
@@ -147,8 +141,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);
@@ -160,8 +153,7 @@ 
      * @return mixed
      * @throws ExistingProjectException
      */
-    protected function setProject(InputInterface $input)
-    {
+    protected function setProject(InputInterface $input) {
         $project = $input->getArgument('project');
         $this->_projectPath = $this->_projectPath . '/' . $project;
 

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

@@ -170,7 +170,7 @@
             throw new ExistingProjectException('Target project directory already exists');
         }
 
-        mkdir($this->_projectPath, 0777, true);
+        mkdir($this->_projectPath, 0777, TRUE);
         return $project;
     }
 }