Completed
Pull Request — epic/2.0.0 (#37)
by Steven
05:34 queued 02:47
created
src/Magestead/Helper/Options.php 1 patch
Spacing   +41 added lines, -41 removed lines patch added patch discarded remove patch
@@ -12,11 +12,11 @@  discard block
 block discarded – undo
12 12
  */
13 13
 class Options
14 14
 {
15
-    const BOX_PREFIX = 'richdynamix/magestead-';
15
+    const BOX_PREFIX='richdynamix/magestead-';
16 16
 
17
-    protected $_app = 'magento2';
18
-    protected $_phpVer = '56';
19
-    protected $_os = 'centos65';
17
+    protected $_app='magento2';
18
+    protected $_phpVer='56';
19
+    protected $_os='centos65';
20 20
     protected $_server;
21 21
     protected $_box;
22 22
     protected $_m2Username;
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
     protected $_locale;
28 28
     protected $_currency;
29 29
     protected $_baseUrl;
30
-    protected $_repoUrl = '';
30
+    protected $_repoUrl='';
31 31
 
32 32
     /**
33 33
      * Options constructor.
@@ -80,14 +80,14 @@  discard block
 block discarded – undo
80 80
     {
81 81
         $output->writeln('<comment>Lets configure your project\'s VM</comment>');
82 82
 
83
-        $ipQuestion       = new Question("Configure the IP for your VM (192.168.47.47): ", '192.168.47.47');
84
-        $this->_ipAddress = strtolower($helper->ask($input, $output, $ipQuestion));
83
+        $ipQuestion=new Question("Configure the IP for your VM (192.168.47.47): ", '192.168.47.47');
84
+        $this->_ipAddress=strtolower($helper->ask($input, $output, $ipQuestion));
85 85
 
86
-        $cpuQuestion = new Question("How many CPU's would you like to use? (1): ", '1');
87
-        $this->_cpus = strtolower($helper->ask($input, $output, $cpuQuestion));
86
+        $cpuQuestion=new Question("How many CPU's would you like to use? (1): ", '1');
87
+        $this->_cpus=strtolower($helper->ask($input, $output, $cpuQuestion));
88 88
 
89
-        $memoryQuestion     = new Question("Define the VM memory limit (2048): ", '2048');
90
-        $this->_memorylimit = strtolower($helper->ask($input, $output, $memoryQuestion));
89
+        $memoryQuestion=new Question("Define the VM memory limit (2048): ", '2048');
90
+        $this->_memorylimit=strtolower($helper->ask($input, $output, $memoryQuestion));
91 91
     }
92 92
 
93 93
     /**
@@ -99,23 +99,23 @@  discard block
 block discarded – undo
99 99
     {
100 100
         $output->writeln('<comment>Lets configure your project\'s application</comment>');
101 101
         if ($this->_phpVer !== '70') {
102
-            $appQuestion = new ChoiceQuestion(
102
+            $appQuestion=new ChoiceQuestion(
103 103
                 "Which application do you want to install?",
104 104
                 ['Magento', 'Magento 2'],
105 105
                 0
106 106
             );
107 107
 
108
-            $this->_app = strtolower($helper->ask($input, $output, $appQuestion));
108
+            $this->_app=strtolower($helper->ask($input, $output, $appQuestion));
109 109
         }
110 110
 
111
-        $baseUrlQuestion = new Question("Enter your application's base_url (magestead.dev): ", 'magestead.dev');
112
-        $this->_baseUrl  = strtolower($helper->ask($input, $output, $baseUrlQuestion));
111
+        $baseUrlQuestion=new Question("Enter your application's base_url (magestead.dev): ", 'magestead.dev');
112
+        $this->_baseUrl=strtolower($helper->ask($input, $output, $baseUrlQuestion));
113 113
 
114
-        $currenyQuestion = new Question("Enter your application's default currency (GBP): ", 'GBP');
115
-        $this->_currency = $helper->ask($input, $output, $currenyQuestion);
114
+        $currenyQuestion=new Question("Enter your application's default currency (GBP): ", 'GBP');
115
+        $this->_currency=$helper->ask($input, $output, $currenyQuestion);
116 116
 
117
-        $localeQuestion = new Question("Enter your application's default locale (en_GB): ", 'en_GB');
118
-        $this->_locale  = $helper->ask($input, $output, $localeQuestion);
117
+        $localeQuestion=new Question("Enter your application's default locale (en_GB): ", 'en_GB');
118
+        $this->_locale=$helper->ask($input, $output, $localeQuestion);
119 119
     }
120 120
 
121 121
     /**
@@ -140,11 +140,11 @@  discard block
 block discarded – undo
140 140
      */
141 141
     protected function setVersionControlSettings($helper, InputInterface $input, OutputInterface $output)
142 142
     {
143
-        $versionControl = new ConfirmationQuestion("Would you like to add your project to GIT? (no/yes) ", false);
144
-        $versioning     = $helper->ask($input, $output, $versionControl);
143
+        $versionControl=new ConfirmationQuestion("Would you like to add your project to GIT? (no/yes) ", false);
144
+        $versioning=$helper->ask($input, $output, $versionControl);
145 145
         if ($versioning) {
146
-            $repoQuestion   = new Question("Enter your full GitHub/BitBucket repo URL: ", '');
147
-            $this->_repoUrl = strtolower($helper->ask($input, $output, $repoQuestion));
146
+            $repoQuestion=new Question("Enter your full GitHub/BitBucket repo URL: ", '');
147
+            $this->_repoUrl=strtolower($helper->ask($input, $output, $repoQuestion));
148 148
         }
149 149
     }
150 150
 
@@ -155,11 +155,11 @@  discard block
 block discarded – undo
155 155
      */
156 156
     protected function askForAuth($helper, InputInterface $input, OutputInterface $output)
157 157
     {
158
-        $username          = new Question("Please enter your Magento username (public key): ", '');
159
-        $this->_m2Username = $helper->ask($input, $output, $username);
158
+        $username=new Question("Please enter your Magento username (public key): ", '');
159
+        $this->_m2Username=$helper->ask($input, $output, $username);
160 160
 
161
-        $password          = new Question("Please enter your Magento password (private key): ", '');
162
-        $this->_m2Password = $helper->ask($input, $output, $password);
161
+        $password=new Question("Please enter your Magento password (private key): ", '');
162
+        $this->_m2Password=$helper->ask($input, $output, $password);
163 163
     }
164 164
 
165 165
     /**
@@ -170,12 +170,12 @@  discard block
 block discarded – undo
170 170
      */
171 171
     protected function verifyAuth($helper, InputInterface $input, OutputInterface $output)
172 172
     {
173
-        $authFile = $_SERVER['HOME'] . "/.composer/auth.json";
173
+        $authFile=$_SERVER['HOME']."/.composer/auth.json";
174 174
 
175
-        $authObj = [];
175
+        $authObj=[];
176 176
         if (file_exists($authFile)) {
177
-            $authJson = file_get_contents($authFile);
178
-            $authObj  = (array)json_decode($authJson);
177
+            $authJson=file_get_contents($authFile);
178
+            $authObj=(array) json_decode($authJson);
179 179
 
180 180
             if (isset($authObj['http-basic']) && isset($authObj['http-basic']->{'repo.magento.com'})) {
181 181
                 return true;
@@ -184,10 +184,10 @@  discard block
 block discarded – undo
184 184
 
185 185
         $this->askForAuth($helper, $input, $output);
186 186
 
187
-        $authObj['http-basic']['repo.magento.com']['username'] = $this->_m2Username;
188
-        $authObj['http-basic']['repo.magento.com']['password'] = $this->_m2Password;
187
+        $authObj['http-basic']['repo.magento.com']['username']=$this->_m2Username;
188
+        $authObj['http-basic']['repo.magento.com']['password']=$this->_m2Password;
189 189
 
190
-        $authJson = json_encode($authObj);
190
+        $authJson=json_encode($authObj);
191 191
         return file_put_contents($authFile, $authJson);
192 192
     }
193 193
 
@@ -199,13 +199,13 @@  discard block
 block discarded – undo
199 199
     protected function setPhp($helper, InputInterface $input, OutputInterface $output)
200 200
     {
201 201
         $output->writeln('<info>Keep in mind PHP7 is only available for Magento 2</info>');
202
-        $phpVerQuestion = new ChoiceQuestion(
202
+        $phpVerQuestion=new ChoiceQuestion(
203 203
             "Which version of PHP should be installed?",
204 204
             ['56', '70'],
205 205
             0
206 206
         );
207 207
 
208
-        $this->_phpVer = $helper->ask($input, $output, $phpVerQuestion);
208
+        $this->_phpVer=$helper->ask($input, $output, $phpVerQuestion);
209 209
     }
210 210
 
211 211
     /**
@@ -213,7 +213,7 @@  discard block
 block discarded – undo
213 213
      */
214 214
     protected function setVagrantBox()
215 215
     {
216
-        $this->_box = self::BOX_PREFIX . $this->_os . "-$this->_server-php$this->_phpVer";
216
+        $this->_box=self::BOX_PREFIX.$this->_os."-$this->_server-php$this->_phpVer";
217 217
     }
218 218
 
219 219
     /**
@@ -236,13 +236,13 @@  discard block
 block discarded – undo
236 236
      */
237 237
     protected function setWebServer($helper, InputInterface $input, OutputInterface $output)
238 238
     {
239
-        $serverQuestion = new ChoiceQuestion(
239
+        $serverQuestion=new ChoiceQuestion(
240 240
             "Which webserver would you like?",
241 241
             ['NGINX', 'Apache'],
242 242
             0
243 243
         );
244 244
 
245
-        $this->_server = strtolower($helper->ask($input, $output, $serverQuestion));
245
+        $this->_server=strtolower($helper->ask($input, $output, $serverQuestion));
246 246
     }
247 247
 
248 248
     /**
@@ -252,12 +252,12 @@  discard block
 block discarded – undo
252 252
      */
253 253
     protected function setOperatingSystem($helper, InputInterface $input, OutputInterface $output)
254 254
     {
255
-        $osQuestion = new ChoiceQuestion(
255
+        $osQuestion=new ChoiceQuestion(
256 256
             "Which OS would you like to install?",
257 257
             ['CentOS 6.5', 'Ubuntu 14'],
258 258
             0
259 259
         );
260 260
 
261
-        $this->_os = str_replace(' ', '', str_replace('.', '', strtolower($helper->ask($input, $output, $osQuestion))));
261
+        $this->_os=str_replace(' ', '', str_replace('.', '', strtolower($helper->ask($input, $output, $osQuestion))));
262 262
     }
263 263
 }
264 264
\ No newline at end of file
Please login to merge, or discard this patch.
src/Magestead/Command/SetupCommand.php 1 patch
Spacing   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -22,8 +22,8 @@  discard block
 block discarded – undo
22 22
 
23 23
     protected function configure()
24 24
     {
25
-        $this->_basePath    = dirname( __FILE__ ) . '/../../../';
26
-        $this->_projectPath = getcwd();
25
+        $this->_basePath=dirname(__FILE__).'/../../../';
26
+        $this->_projectPath=getcwd();
27 27
 
28 28
         $this->setName("setup");
29 29
         $this->setDescription("Initialise Magestead project into current working directory");
@@ -36,8 +36,8 @@  discard block
 block discarded – undo
36 36
      */
37 37
     protected function execute(InputInterface $input, OutputInterface $output)
38 38
     {
39
-        $helper  = $this->getHelper('question');
40
-        $options = new Options($helper, $input, $output);
39
+        $helper=$this->getHelper('question');
40
+        $options=new Options($helper, $input, $output);
41 41
 
42 42
         $this->setupProject($output, $options);
43 43
 
@@ -55,17 +55,17 @@  discard block
 block discarded – undo
55 55
     protected function copyConfigFiles($source, $target, OutputInterface $output)
56 56
     {
57 57
         try {
58
-            $progress = new ProgressBar($output, 3720);
58
+            $progress=new ProgressBar($output, 3720);
59 59
             $progress->start();
60 60
             foreach (
61
-                $iterator = new \RecursiveIteratorIterator(
61
+                $iterator=new \RecursiveIteratorIterator(
62 62
                     new \RecursiveDirectoryIterator($source, \RecursiveDirectoryIterator::SKIP_DOTS),
63 63
                     \RecursiveIteratorIterator::SELF_FIRST) as $item
64 64
             ) {
65 65
                 if ($item->isDir()) {
66
-                    mkdir($target . DIRECTORY_SEPARATOR . $iterator->getSubPathName());
66
+                    mkdir($target.DIRECTORY_SEPARATOR.$iterator->getSubPathName());
67 67
                 } else {
68
-                    copy($item, $target . DIRECTORY_SEPARATOR . $iterator->getSubPathName());
68
+                    copy($item, $target.DIRECTORY_SEPARATOR.$iterator->getSubPathName());
69 69
                 }
70 70
                 $progress->advance();
71 71
             }
@@ -82,22 +82,22 @@  discard block
 block discarded – undo
82 82
      */
83 83
     protected function configureProject(array $options, OutputInterface $output)
84 84
     {
85
-        $msConfig = $this->getConfigFile($output);
85
+        $msConfig=$this->getConfigFile($output);
86 86
 
87
-        $app = ($options['app'] == 'magento 2') ? 'magento2' : 'magento';
87
+        $app=($options['app'] == 'magento 2') ? 'magento2' : 'magento';
88 88
 
89
-        $msConfig['vagrantfile']['vm']['box']                           = $options['box'];
90
-        $msConfig['vagrantfile']['vm']['box_url']                       = $options['box'];
91
-        $msConfig['vagrantfile']['vm']['memory']                        = $options['memory_limit'];
92
-        $msConfig['vagrantfile']['vm']['network']['private_network']    = $options['ip_address'];
93
-        $msConfig['magestead']['apps']['mba_12345']['type']             = $app;
94
-        $msConfig['magestead']['apps']['mba_12345']['locale']           = $options['locale'];
95
-        $msConfig['magestead']['apps']['mba_12345']['default_currency'] = $options['default_currency'];
96
-        $msConfig['magestead']['apps']['mba_12345']['base_url']         = $options['base_url'];
97
-        $msConfig['magestead']['os']                                    = $options['os'];
98
-        $msConfig['magestead']['server']                                = $options['server'];
89
+        $msConfig['vagrantfile']['vm']['box']=$options['box'];
90
+        $msConfig['vagrantfile']['vm']['box_url']=$options['box'];
91
+        $msConfig['vagrantfile']['vm']['memory']=$options['memory_limit'];
92
+        $msConfig['vagrantfile']['vm']['network']['private_network']=$options['ip_address'];
93
+        $msConfig['magestead']['apps']['mba_12345']['type']=$app;
94
+        $msConfig['magestead']['apps']['mba_12345']['locale']=$options['locale'];
95
+        $msConfig['magestead']['apps']['mba_12345']['default_currency']=$options['default_currency'];
96
+        $msConfig['magestead']['apps']['mba_12345']['base_url']=$options['base_url'];
97
+        $msConfig['magestead']['os']=$options['os'];
98
+        $msConfig['magestead']['server']=$options['server'];
99 99
 
100
-        $this->_msConfig = $msConfig;
100
+        $this->_msConfig=$msConfig;
101 101
 
102 102
         $this->saveConfigFile($msConfig, $output);
103 103
 
@@ -109,9 +109,9 @@  discard block
 block discarded – undo
109 109
      */
110 110
     protected function getConfigFile(OutputInterface $output)
111 111
     {
112
-        $yaml = new Parser();
112
+        $yaml=new Parser();
113 113
         try {
114
-            return $yaml->parse(file_get_contents($this->_projectPath . '/magestead.yaml'));
114
+            return $yaml->parse(file_get_contents($this->_projectPath.'/magestead.yaml'));
115 115
         } catch (ParseException $e) {
116 116
             $output->writeln('<error>Unable to parse the YAML string</error>');
117 117
             printf("Unable to parse the YAML string: %s", $e->getMessage());
@@ -124,11 +124,11 @@  discard block
 block discarded – undo
124 124
      */
125 125
     protected function saveConfigFile(array $config, OutputInterface $output)
126 126
     {
127
-        $dumper = new Dumper();
128
-        $yaml   = $dumper->dump($config, 6);
127
+        $dumper=new Dumper();
128
+        $yaml=$dumper->dump($config, 6);
129 129
 
130 130
         try {
131
-            file_put_contents($this->_projectPath . '/magestead.yaml', $yaml);
131
+            file_put_contents($this->_projectPath.'/magestead.yaml', $yaml);
132 132
         } catch (\Exception $e) {
133 133
             $output->writeln('<error>Unable to write to the YAML file</error>');
134 134
         }
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
     protected function setupProject(OutputInterface $output, $options)
142 142
     {
143 143
         $output->writeln('<info>Setting up project structure</info>');
144
-        $provisionFolder = $this->_basePath . "provision";
144
+        $provisionFolder=$this->_basePath."provision";
145 145
         $this->copyConfigFiles($provisionFolder, $this->_projectPath, $output);
146 146
         $this->configureProject($options->getAllOptions(), $output);
147 147
     }
Please login to merge, or discard this patch.