richdynamix / magestead

src/Magestead/Helper/Options.php

Indentation +14 added lines, -14 removed lines

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

Braces +13 added lines, -26 removed lines

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

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

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

Spacing +41 added lines, -41 removed lines

@@ -12,11 +12,11 @@ 
  */
 class Options
 {
-    const BOX_PREFIX = 'richdynamix/magestead-';
-    protected $_app = 'magento2';
+    const BOX_PREFIX='richdynamix/magestead-';
+    protected $_app='magento2';
     protected $_server;
-    protected $_phpVer = '56';
-    protected $_os = 'centos65';
+    protected $_phpVer='56';
+    protected $_os='centos65';
     protected $_box;
     protected $_m2Username;
     protected $_m2Password;
@@ -26,7 +26,7 @@ 
     protected $_locale;
     protected $_currency;
     protected $_baseUrl;
-    protected $_repoUrl = '';
+    protected $_repoUrl='';
 
     /**
      * Options constructor.
@@ -79,14 +79,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));
     }
 
     /**
@@ -98,22 +98,22 @@ 
     {
         $output->writeln('<comment>Lets configure your project\'s application</comment>');
         if ($this->_phpVer !== '70') {
-            $appQuestion = new ChoiceQuestion(
+            $appQuestion=new ChoiceQuestion(
                 "Which application do you want to install?",
                 ['Magento', 'Magento 2'],
                 0
             );
 
-            $this->_app = strtolower($helper->ask($input, $output, $appQuestion));
+            $this->_app=strtolower($helper->ask($input, $output, $appQuestion));
         }
-        $baseUrlQuestion = new Question("Enter your application's base_url (magestead.dev): ", 'magestead.dev');
-        $this->_baseUrl = strtolower($helper->ask($input, $output, $baseUrlQuestion));
+        $baseUrlQuestion=new Question("Enter your application's base_url (magestead.dev): ", 'magestead.dev');
+        $this->_baseUrl=strtolower($helper->ask($input, $output, $baseUrlQuestion));
 
-        $currenyQuestion = new Question("Enter your application's default currency (GBP): ", 'GBP');
-        $this->_currency = $helper->ask($input, $output, $currenyQuestion);
+        $currenyQuestion=new Question("Enter your application's default currency (GBP): ", 'GBP');
+        $this->_currency=$helper->ask($input, $output, $currenyQuestion);
 
-        $localeQuestion = new Question("Enter your application's default locale (en_GB): ", 'en_GB');
-        $this->_locale = $helper->ask($input, $output, $localeQuestion);
+        $localeQuestion=new Question("Enter your application's default locale (en_GB): ", 'en_GB');
+        $this->_locale=$helper->ask($input, $output, $localeQuestion);
     }
 
     /**
@@ -138,11 +138,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));
         }
     }
 
@@ -153,11 +153,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);
     }
 
     /**
@@ -168,12 +168,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;
@@ -182,10 +182,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);
     }
 
@@ -197,13 +197,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);
     }
 
     /**
@@ -211,7 +211,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";
     }
 
     /**
@@ -234,12 +234,12 @@ 
      */
     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));
     }
 
     /**
@@ -249,11 +249,11 @@ 
      */
     protected function setOperatingSystem($helper, InputInterface $input, OutputInterface $output)
     {
-        $osQuestion = new ChoiceQuestion(
+        $osQuestion=new ChoiceQuestion(
             "Which OS would you like to install?",
             ['CentOS 6.5', 'Ubuntu 14'],
             0
         );
-        $this->_os = str_replace(' ', '', str_replace('.', '', strtolower($helper->ask($input, $output, $osQuestion))));
+        $this->_os=str_replace(' ', '', str_replace('.', '', strtolower($helper->ask($input, $output, $osQuestion))));
     }
 }
\ No newline at end of file

src/Magestead/Command/SetupCommand.php

Braces +7 added lines, -14 removed lines

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

Spacing +26 added lines, -26 removed lines

@@ -22,8 +22,8 @@ 
 
     protected function configure()
     {
-        $this->_basePath = dirname( __FILE__ ) . '/../../../';
-        $this->_projectPath = getcwd();
+        $this->_basePath=dirname(__FILE__).'/../../../';
+        $this->_projectPath=getcwd();
 
         $this->setName("setup");
         $this->setDescription("Initialise Magestead project into current working directory");
@@ -36,8 +36,8 @@ 
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $helper = $this->getHelper('question');
-        $options = new Options($helper, $input, $output);
+        $helper=$this->getHelper('question');
+        $options=new Options($helper, $input, $output);
 
         $this->setupProject($output, $options);
 
@@ -55,17 +55,17 @@ 
     protected function copyConfigFiles($source, $target, OutputInterface $output)
     {
         try {
-            $progress = new ProgressBar($output, 3720);
+            $progress=new ProgressBar($output, 3720);
             $progress->start();
             foreach (
-                $iterator = new \RecursiveIteratorIterator(
+                $iterator=new \RecursiveIteratorIterator(
                     new \RecursiveDirectoryIterator($source, \RecursiveDirectoryIterator::SKIP_DOTS),
                     \RecursiveIteratorIterator::SELF_FIRST) as $item
             ) {
                 if ($item->isDir()) {
-                    mkdir($target . DIRECTORY_SEPARATOR . $iterator->getSubPathName());
+                    mkdir($target.DIRECTORY_SEPARATOR.$iterator->getSubPathName());
                 } else {
-                    copy($item, $target . DIRECTORY_SEPARATOR . $iterator->getSubPathName());
+                    copy($item, $target.DIRECTORY_SEPARATOR.$iterator->getSubPathName());
                 }
                 $progress->advance();
             }
@@ -82,18 +82,18 @@ 
      */
     protected function configureProject(array $options, OutputInterface $output)
     {
-        $this->_magesteadConfig = $this->getConfigFile($output);
-
-        $this->_magesteadConfig['vagrantfile']['vm']['box'] = $options['box'];
-        $this->_magesteadConfig['vagrantfile']['vm']['box_url'] = $options['box'];
-        $this->_magesteadConfig['vagrantfile']['vm']['memory'] = $options['memory_limit'];
-        $this->_magesteadConfig['vagrantfile']['vm']['network']['private_network'] = $options['ip_address'];
-        $this->_magesteadConfig['magestead']['apps']['mba_12345']['type'] = ($options['app'] == 'magento 2') ? 'magento2' : 'magento';
-        $this->_magesteadConfig['magestead']['apps']['mba_12345']['locale'] = $options['locale'];
-        $this->_magesteadConfig['magestead']['apps']['mba_12345']['default_currency'] = $options['default_currency'];
-        $this->_magesteadConfig['magestead']['apps']['mba_12345']['base_url'] = $options['base_url'];
-        $this->_magesteadConfig['magestead']['os'] = $options['os'];
-        $this->_magesteadConfig['magestead']['server'] = $options['server'];
+        $this->_magesteadConfig=$this->getConfigFile($output);
+
+        $this->_magesteadConfig['vagrantfile']['vm']['box']=$options['box'];
+        $this->_magesteadConfig['vagrantfile']['vm']['box_url']=$options['box'];
+        $this->_magesteadConfig['vagrantfile']['vm']['memory']=$options['memory_limit'];
+        $this->_magesteadConfig['vagrantfile']['vm']['network']['private_network']=$options['ip_address'];
+        $this->_magesteadConfig['magestead']['apps']['mba_12345']['type']=($options['app'] == 'magento 2') ? 'magento2' : 'magento';
+        $this->_magesteadConfig['magestead']['apps']['mba_12345']['locale']=$options['locale'];
+        $this->_magesteadConfig['magestead']['apps']['mba_12345']['default_currency']=$options['default_currency'];
+        $this->_magesteadConfig['magestead']['apps']['mba_12345']['base_url']=$options['base_url'];
+        $this->_magesteadConfig['magestead']['os']=$options['os'];
+        $this->_magesteadConfig['magestead']['server']=$options['server'];
 
         $this->saveConfigFile($this->_magesteadConfig, $output);
 
@@ -105,9 +105,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());
@@ -120,11 +120,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>');
         }
@@ -137,7 +137,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);
     }