Completed
Push — master ( e48266...c6a956 )
by Steven
8s
created
src/Magestead/Service/VersionControl.php 1 patch
Braces   +6 added lines, -12 removed lines patch added patch discarded remove patch
@@ -15,8 +15,7 @@  discard block
 block discarded – undo
15 15
      * @param $projectPath
16 16
      * @param OutputInterface $output
17 17
      */
18
-    public function __construct($repoUrl, $projectPath, OutputInterface $output)
19
-    {
18
+    public function __construct($repoUrl, $projectPath, OutputInterface $output) {
20 19
         $this->_repoUrl = $repoUrl;
21 20
         $this->_projectPath = $projectPath;
22 21
         $this->_output = $output;
@@ -27,8 +26,7 @@  discard block
 block discarded – undo
27 26
     /**
28 27
      * @param OutputInterface $output
29 28
      */
30
-    protected function execute(OutputInterface $output)
31
-    {
29
+    protected function execute(OutputInterface $output) {
32 30
         $output->writeln('<info>Configuring GIT repo</info>');
33 31
         $this->init();
34 32
 
@@ -47,8 +45,7 @@  discard block
 block discarded – undo
47 45
      *
48 46
      * @return $this
49 47
      */
50
-    public function init()
51
-    {
48
+    public function init() {
52 49
         $command = 'git init; git remote add origin ' . $this->_repoUrl;
53 50
         new ProcessCommand($command, $this->_projectPath, $this->_output);
54 51
 
@@ -60,8 +57,7 @@  discard block
 block discarded – undo
60 57
      *
61 58
      * @return $this
62 59
      */
63
-    public function addFiles()
64
-    {
60
+    public function addFiles() {
65 61
         $command = 'git add -A';
66 62
         new ProcessCommand($command, $this->_projectPath, $this->_output);
67 63
 
@@ -73,8 +69,7 @@  discard block
 block discarded – undo
73 69
      *
74 70
      * @return $this
75 71
      */
76
-    public function commitFiles()
77
-    {
72
+    public function commitFiles() {
78 73
         $command = "git commit -m 'Initial commit'";
79 74
         new ProcessCommand($command, $this->_projectPath, $this->_output);
80 75
 
@@ -86,8 +81,7 @@  discard block
 block discarded – undo
86 81
      *
87 82
      * @return $this
88 83
      */
89
-    public function pushFiles()
90
-    {
84
+    public function pushFiles() {
91 85
         $command = "git push -u origin master";
92 86
         new ProcessCommand($command, $this->_projectPath, $this->_output);
93 87
 
Please login to merge, or discard this patch.
src/Magestead/Service/Notification.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -14,8 +14,7 @@
 block discarded – undo
14 14
      *
15 15
      * @param $message
16 16
      */
17
-    public static function send($message)
18
-    {
17
+    public static function send($message) {
19 18
         $notifier = NotifierFactory::create();
20 19
         $basePath = dirname( __FILE__ ) . '/../../../';
21 20
         $notification =
Please login to merge, or discard this patch.
src/Magestead/Helper/HostsPluginChecker.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -12,8 +12,7 @@  discard block
 block discarded – undo
12 12
      * @param array $options
13 13
      * @param OutputInterface $output
14 14
      */
15
-    public static function verify(array $options, OutputInterface $output)
16
-    {
15
+    public static function verify(array $options, OutputInterface $output) {
17 16
         $hostPlugin = `vagrant plugin list | grep vagrant-hostsupdater`;
18 17
         if (is_null($hostPlugin)) {
19 18
             self::editHostsInstructions($options, $output);
@@ -26,8 +25,7 @@  discard block
 block discarded – undo
26 25
      * @param array $options
27 26
      * @param OutputInterface $output
28 27
      */
29
-    protected static function editHostsInstructions(array $options, OutputInterface $output)
30
-    {
28
+    protected static function editHostsInstructions(array $options, OutputInterface $output) {
31 29
         $output->writeln('<comment>NOTE: You will need to add the following to your hosts file!</comment>');
32 30
         $comment = $options['vagrantfile']['vm']['network']['private_network'] .
33 31
             ' ' . $options['magestead']['apps']['mba_12345']['base_url'];
Please login to merge, or discard this patch.
src/Magestead/Helper/Config.php 1 patch
Braces   +4 added lines, -8 removed lines patch added patch discarded remove patch
@@ -13,8 +13,7 @@  discard block
 block discarded – undo
13 13
      * Config constructor.
14 14
      * @param OutputInterface $output
15 15
      */
16
-    public function __construct(OutputInterface $output)
17
-    {
16
+    public function __construct(OutputInterface $output) {
18 17
         $this->_projectPath = getcwd();
19 18
         $this->_config = $this->getConfigFile($output);
20 19
     }
@@ -23,8 +22,7 @@  discard block
 block discarded – undo
23 22
      * @param $name
24 23
      * @return mixed
25 24
      */
26
-    function __get($name)
27
-    {
25
+    function __get($name) {
28 26
         return $this->_config['magestead']['apps']['mba_12345'][$name];
29 27
     }
30 28
 
@@ -32,8 +30,7 @@  discard block
 block discarded – undo
32 30
      * @param OutputInterface $output
33 31
      * @return bool|mixed
34 32
      */
35
-    protected function getConfigFile(OutputInterface $output)
36
-    {
33
+    protected function getConfigFile(OutputInterface $output) {
37 34
         $config = new Parser();
38 35
         try {
39 36
             return $config->parse($this->readConfigFile());
@@ -48,8 +45,7 @@  discard block
 block discarded – undo
48 45
      * @return string
49 46
      * @throws MissingConfigFileException
50 47
      */
51
-    protected function readConfigFile()
52
-    {
48
+    protected function readConfigFile() {
53 49
         if (!file_exists($this->_projectPath . '/magestead.yaml')) {
54 50
             throw new MissingConfigFileException('No config file was found, are you in the project root?');
55 51
         }
Please login to merge, or discard this patch.
src/Magestead/Installers/Magento2Project.php 1 patch
Braces   +13 added lines, -26 removed lines patch added patch discarded remove patch
@@ -20,8 +20,7 @@  discard block
 block discarded – undo
20 20
      * @param $projectPath
21 21
      * @param OutputInterface $output
22 22
      */
23
-    public function __construct(array $options, array $config, $projectPath, OutputInterface $output)
24
-    {
23
+    public function __construct(array $options, array $config, $projectPath, OutputInterface $output) {
25 24
         $this->composerInstall($projectPath, $output);
26 25
         $this->installMagento($config, $projectPath, $output);
27 26
         $this->finaliseSetup($options, $projectPath, $output);
@@ -34,8 +33,7 @@  discard block
 block discarded – undo
34 33
      * @param $projectPath
35 34
      * @param OutputInterface $output
36 35
      */
37
-    protected function composerInstall($projectPath, OutputInterface $output)
38
-    {
36
+    protected function composerInstall($projectPath, OutputInterface $output) {
39 37
         $output->writeln('<info>Installing Magento 2 with Composer</info>');
40 38
         $command = 'composer create-project --repository-url=https://repo.magento.com/ magento/project-community-edition public';
41 39
         new ProcessCommand($command, $projectPath, $output);
@@ -49,8 +47,7 @@  discard block
 block discarded – undo
49 47
      * @param $projectPath
50 48
      * @param OutputInterface $output
51 49
      */
52
-    protected function addPhpSpecPackage($projectPath, OutputInterface $output)
53
-    {
50
+    protected function addPhpSpecPackage($projectPath, OutputInterface $output) {
54 51
         $output->writeln('<comment>Installing PHPSpec</comment>');
55 52
         $command = 'cd '.$projectPath.'/public; composer require phpspec/phpspec --dev;';
56 53
         new ProcessCommand($command, $projectPath, $output);
@@ -62,8 +59,7 @@  discard block
 block discarded – undo
62 59
      * @param $projectPath
63 60
      * @param OutputInterface $output
64 61
      */
65
-    protected function addBehatPackage($projectPath, OutputInterface $output)
66
-    {
62
+    protected function addBehatPackage($projectPath, OutputInterface $output) {
67 63
         $output->writeln('<comment>Installing Behat</comment>');
68 64
         $command = 'cd '.$projectPath.'/public; composer require behat/behat --dev;';
69 65
         new ProcessCommand($command, $projectPath, $output);
@@ -76,8 +72,7 @@  discard block
 block discarded – undo
76 72
      * @param $projectPath
77 73
      * @param OutputInterface $output
78 74
      */
79
-    protected function installMagento(array $options, $projectPath, OutputInterface $output)
80
-    {
75
+    protected function installMagento(array $options, $projectPath, OutputInterface $output) {
81 76
         $this->setPermissions($projectPath, $output);
82 77
 
83 78
         $output->writeln('<info>Installing Magento 2 Software</info>');
@@ -110,8 +105,7 @@  discard block
 block discarded – undo
110 105
      * @param $projectPath
111 106
      * @param OutputInterface $output
112 107
      */
113
-    protected function setPermissions($projectPath, OutputInterface $output)
114
-    {
108
+    protected function setPermissions($projectPath, OutputInterface $output) {
115 109
         $output->writeln('<info>Setting Permissions</info>');
116 110
         $command = 'vagrant ssh -c \'cd /var/www/public; sudo find . -type d -exec chmod 700 {} \;\'';
117 111
         new ProcessCommand($command, $projectPath, $output);
@@ -130,8 +124,7 @@  discard block
 block discarded – undo
130 124
      * @param $projectPath
131 125
      * @param OutputInterface $output
132 126
      */
133
-    protected function configureRedis($projectPath, OutputInterface $output)
134
-    {
127
+    protected function configureRedis($projectPath, OutputInterface $output) {
135 128
         $output->writeln('<comment>Configuring Redis Cache</comment>');
136 129
         $file = "$projectPath/public/app/etc/env.php";
137 130
         $env = include $file;
@@ -183,8 +176,7 @@  discard block
 block discarded – undo
183 176
      * @param $projectPath
184 177
      * @param OutputInterface $output
185 178
      */
186
-    protected function finaliseSetup(array $options, $projectPath, OutputInterface $output)
187
-    {
179
+    protected function finaliseSetup(array $options, $projectPath, OutputInterface $output) {
188 180
         $command = 'vagrant ssh -c \'cd /var/www/public; bin/magento indexer:reindex; \'';
189 181
         $output->writeln('<comment>Reindexing Tables</comment>');
190 182
         new ProcessCommand($command, $projectPath, $output);
@@ -201,8 +193,7 @@  discard block
 block discarded – undo
201 193
      * @param array $options
202 194
      * @param OutputInterface $output
203 195
      */
204
-    protected function showCredentials(array $options, OutputInterface $output)
205
-    {
196
+    protected function showCredentials(array $options, OutputInterface $output) {
206 197
         $output->writeln('<info>SUCCESS: Magestead has finished installing Magento 2!</info>');
207 198
         $table = new Table($output);
208 199
         $table
@@ -221,8 +212,7 @@  discard block
 block discarded – undo
221 212
      * @param OutputInterface $output
222 213
      * @return VersionControl
223 214
      */
224
-    protected function processVcs(array $options, $projectPath, OutputInterface $output)
225
-    {
215
+    protected function processVcs(array $options, $projectPath, OutputInterface $output) {
226 216
         if (!empty($options['repo_url'])) {
227 217
             copy($projectPath . "/puphpet/magestead/magento2/stubs/gitignore.tmp", $projectPath . "/.gitignore");
228 218
             return new VersionControl($options['repo_url'], $projectPath, $output);
@@ -232,8 +222,7 @@  discard block
 block discarded – undo
232 222
     /**
233 223
      * @param $projectPath
234 224
      */
235
-    protected function setComposerBinDir($projectPath)
236
-    {
225
+    protected function setComposerBinDir($projectPath) {
237 226
         $file = "$projectPath/public/composer.json";
238 227
         $composer = json_decode(file_get_contents($file), true);
239 228
         $composer['config']['bin-dir'] = 'bin';
@@ -244,8 +233,7 @@  discard block
 block discarded – undo
244 233
      * @param $projectPath
245 234
      * @param OutputInterface $output
246 235
      */
247
-    protected function setPhpSpecPermissions($projectPath, OutputInterface $output)
248
-    {
236
+    protected function setPhpSpecPermissions($projectPath, OutputInterface $output) {
249 237
         $command = 'vagrant ssh -c \'cd /var/www/public; sudo chmod 755 bin/phpspec; bin/phpspec run\'';
250 238
         new ProcessCommand($command, $projectPath, $output);
251 239
     }
@@ -254,8 +242,7 @@  discard block
 block discarded – undo
254 242
      * @param $projectPath
255 243
      * @param OutputInterface $output
256 244
      */
257
-    protected function setBehatPermissions($projectPath, OutputInterface $output)
258
-    {
245
+    protected function setBehatPermissions($projectPath, OutputInterface $output) {
259 246
         $command = 'vagrant ssh -c \'cd /var/www/public; sudo chmod 755 bin/behat; bin/behat --init\'';
260 247
         new ProcessCommand($command, $projectPath, $output);
261 248
     }
Please login to merge, or discard this patch.
src/Magestead/Installers/Project.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -13,8 +13,7 @@
 block discarded – undo
13 13
      * @param $output
14 14
      * @return Magento2Project|MagentoProject
15 15
      */
16
-    public static function create(array $options, array $config, $projectPath, $output)
17
-    {
16
+    public static function create(array $options, array $config, $projectPath, $output) {
18 17
         switch ($options['app']) {
19 18
             case "magento":
20 19
                 return new MagentoProject($options, $config, $projectPath, $output);
Please login to merge, or discard this patch.
src/Magestead/Installers/MagentoProject.php 1 patch
Braces   +14 added lines, -28 removed lines patch added patch discarded remove patch
@@ -24,8 +24,7 @@  discard block
 block discarded – undo
24 24
      * @param $projectPath
25 25
      * @param OutputInterface $output
26 26
      */
27
-    public function __construct(array $options, array $config, $projectPath, OutputInterface $output)
28
-    {
27
+    public function __construct(array $options, array $config, $projectPath, OutputInterface $output) {
29 28
         $output->writeln('<info>Installing Magento with Composer</info>');
30 29
         $this->composerInstall($projectPath, $output);
31 30
 
@@ -46,8 +45,7 @@  discard block
 block discarded – undo
46 45
      * @param $projectPath
47 46
      * @param $output
48 47
      */
49
-    protected function installMagento(array $options, $projectPath, OutputInterface $output)
50
-    {
48
+    protected function installMagento(array $options, $projectPath, OutputInterface $output) {
51 49
         $locale = $options['magestead']['apps']['mba_12345']['locale'];
52 50
         $db_name = $options['magestead']['apps']['mba_12345']['db_name'];
53 51
         $base_url = $options['magestead']['apps']['mba_12345']['base_url'];
@@ -86,8 +84,7 @@  discard block
 block discarded – undo
86 84
      * @param $projectPath
87 85
      * @param OutputInterface $output
88 86
      */
89
-    protected function setPermissions($projectPath, OutputInterface $output)
90
-    {
87
+    protected function setPermissions($projectPath, OutputInterface $output) {
91 88
 //        $command = 'vagrant ssh -c \'cd /var/www/public; sudo find . -type f -exec chmod 400 {} \;\'';
92 89
 //        $output->writeln('<comment>Setting Files Permissions</comment>');
93 90
 //        new ProcessCommand($command, $projectPath, $output);
@@ -125,8 +122,7 @@  discard block
 block discarded – undo
125 122
      * @param $projectPath
126 123
      * @param OutputInterface $output
127 124
      */
128
-    protected function installMagerun($projectPath, OutputInterface $output)
129
-    {
125
+    protected function installMagerun($projectPath, OutputInterface $output) {
130 126
         $command = 'vagrant ssh -c \'cd /var/www/bin; sudo wget https://files.magerun.net/n98-magerun.phar;\'';
131 127
         $output->writeln('<info>Downloading Magerun</info>');
132 128
         new ProcessCommand($command, $projectPath, $output);
@@ -141,8 +137,7 @@  discard block
 block discarded – undo
141 137
      * @param $projectPath
142 138
      * @param OutputInterface $output
143 139
      */
144
-    protected function finaliseSetup(array $options, $projectPath, OutputInterface $output)
145
-    {
140
+    protected function finaliseSetup(array $options, $projectPath, OutputInterface $output) {
146 141
         $command = 'vagrant ssh -c \'cd /var/www/public; ../bin/n98-magerun.phar index:reindex:all;\'';
147 142
         $output->writeln('<comment>Reindexing Tables</comment>');
148 143
         new ProcessCommand($command, $projectPath, $output);
@@ -166,8 +161,7 @@  discard block
 block discarded – undo
166 161
      * @param array $options
167 162
      * @param OutputInterface $output
168 163
      */
169
-    protected function showCredentials(array $options, OutputInterface $output)
170
-    {
164
+    protected function showCredentials(array $options, OutputInterface $output) {
171 165
         $output->writeln('<info>SUCCESS: Magestead has finished installing Magento!</info>');
172 166
         $table = new Table($output);
173 167
         $table
@@ -186,8 +180,7 @@  discard block
 block discarded – undo
186 180
      * @param OutputInterface $output
187 181
      * @return VersionControl
188 182
      */
189
-    protected function processVcs(array $options, $projectPath, OutputInterface $output)
190
-    {
183
+    protected function processVcs(array $options, $projectPath, OutputInterface $output) {
191 184
         if (!empty($options['repo_url'])) {
192 185
             copy($projectPath . "/puphpet/magestead/magento/stubs/gitignore.tmp", $projectPath . "/.gitignore");
193 186
             return new VersionControl($options['repo_url'], $projectPath, $output);
@@ -198,8 +191,7 @@  discard block
 block discarded – undo
198 191
      * @param $projectPath
199 192
      * @param OutputInterface $output
200 193
      */
201
-    protected function composerInstall($projectPath, OutputInterface $output)
202
-    {
194
+    protected function composerInstall($projectPath, OutputInterface $output) {
203 195
         copy($projectPath . "/puphpet/magestead/magento/stubs/composer.tmp", $projectPath . "/composer.json");
204 196
         new ProcessCommand('composer install', $projectPath, $output);
205 197
     }
@@ -207,8 +199,7 @@  discard block
 block discarded – undo
207 199
     /**
208 200
      * @param $projectPath
209 201
      */
210
-    protected function configureRedis($projectPath)
211
-    {
202
+    protected function configureRedis($projectPath) {
212 203
         $this->updateConfigXml($projectPath);
213 204
         $this->activateModule($projectPath);
214 205
     }
@@ -216,8 +207,7 @@  discard block
 block discarded – undo
216 207
     /**
217 208
      * @param $projectPath
218 209
      */
219
-    protected function updateConfigXml($projectPath)
220
-    {
210
+    protected function updateConfigXml($projectPath) {
221 211
         $localFile = '/public/app/etc/local.xml';
222 212
         $localXml = file_get_contents($projectPath . $localFile);
223 213
 
@@ -247,8 +237,7 @@  discard block
 block discarded – undo
247 237
     /**
248 238
      * @param $projectPath
249 239
      */
250
-    protected function activateModule($projectPath)
251
-    {
240
+    protected function activateModule($projectPath) {
252 241
         $moduleFile = '/public/app/etc/modules/Cm_RedisSession.xml';
253 242
         $moduleXml = file_get_contents($projectPath . $moduleFile);
254 243
         $config = new \SimpleXMLElement($moduleXml);
@@ -262,8 +251,7 @@  discard block
 block discarded – undo
262 251
      * @param OutputInterface $output
263 252
      * @return ProcessCommand
264 253
      */
265
-    protected function configureTestSuites(array $options, $projectPath, OutputInterface $output)
266
-    {
254
+    protected function configureTestSuites(array $options, $projectPath, OutputInterface $output) {
267 255
         $output->writeln('<info>Configuring PHPSpec & Behat Suites</info>');
268 256
         $progress = new ProgressBar($output, 2);
269 257
 
@@ -285,8 +273,7 @@  discard block
 block discarded – undo
285 273
      * @param OutputInterface $output
286 274
      * @return bool|mixed
287 275
      */
288
-    protected function getBehatConfig(array $options, $projectPath, OutputInterface $output)
289
-    {
276
+    protected function getBehatConfig(array $options, $projectPath, OutputInterface $output) {
290 277
         $yaml = new Parser();
291 278
         try {
292 279
             $behat = $yaml->parse(file_get_contents($projectPath . "/puphpet/magestead/magento/stubs/behat.yml"));
@@ -305,8 +292,7 @@  discard block
 block discarded – undo
305 292
      * @param $behat
306 293
      * @param $progress
307 294
      */
308
-    protected function saveBehatConfig($projectPath, OutputInterface $output, $behat, $progress)
309
-    {
295
+    protected function saveBehatConfig($projectPath, OutputInterface $output, $behat, $progress) {
310 296
         $dumper = new Dumper();
311 297
         $yaml = $dumper->dump($behat, 6);
312 298
         try {
Please login to merge, or discard this patch.
src/Magestead/Command/Index/SetModeCommand.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -16,8 +16,7 @@  discard block
 block discarded – undo
16 16
     protected $_config;
17 17
     protected $_projectPath;
18 18
 
19
-    protected function configure()
20
-    {
19
+    protected function configure() {
21 20
         $this->_projectPath = getcwd();
22 21
         $this->setName("index:mode:set");
23 22
         $this->setDescription("Set index mode type");
@@ -29,8 +28,7 @@  discard block
 block discarded – undo
29 28
      * @param OutputInterface $output
30 29
      * @return ProcessCommand
31 30
      */
32
-    protected function execute(InputInterface $input, OutputInterface $output)
33
-    {
31
+    protected function execute(InputInterface $input, OutputInterface $output) {
34 32
         $mode = $input->getArgument('mode');
35 33
         $command = $this->getCommand(new Config($output), $mode);
36 34
         if ($command) {
@@ -47,8 +45,7 @@  discard block
 block discarded – undo
47 45
      * @param $mode
48 46
      * @return bool|string
49 47
      */
50
-    protected function getCommand(Config $config, $mode)
51
-    {
48
+    protected function getCommand(Config $config, $mode) {
52 49
         $type = $config->type;
53 50
         switch ($type) {
54 51
             case 'magento2':
Please login to merge, or discard this patch.
src/Magestead/Command/Index/ReindexCommand.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -16,8 +16,7 @@  discard block
 block discarded – undo
16 16
     protected $_config;
17 17
     protected $_projectPath;
18 18
 
19
-    protected function configure()
20
-    {
19
+    protected function configure() {
21 20
         $this->_projectPath = getcwd();
22 21
         $this->setName("index:reindex");
23 22
         $this->setDescription("Reindex data");
@@ -29,8 +28,7 @@  discard block
 block discarded – undo
29 28
      * @param OutputInterface $output
30 29
      * @return ProcessCommand
31 30
      */
32
-    protected function execute(InputInterface $input, OutputInterface $output)
33
-    {
31
+    protected function execute(InputInterface $input, OutputInterface $output) {
34 32
         $output->writeln('<info>Reindexing data</info>');
35 33
         $index = $input->getArgument('index');
36 34
 
@@ -44,8 +42,7 @@  discard block
 block discarded – undo
44 42
      * @param $index
45 43
      * @return bool|string
46 44
      */
47
-    protected function getCommand(Config $config, $index)
48
-    {
45
+    protected function getCommand(Config $config, $index) {
49 46
         $type = $config->type;
50 47
         switch ($type) {
51 48
             case 'magento':
Please login to merge, or discard this patch.