Completed
Pull Request — epic/2.0.0 (#37)
by Steven
05:56 queued 03:11
created
src/Magestead/Command/Cache/StatusCommand.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@
 block discarded – undo
34 34
 
35 35
     /**
36 36
      * @param Config $config
37
-     * @return bool|string
37
+     * @return string|false
38 38
      */
39 39
     protected function getCommand(Config $config)
40 40
     {
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
 
18 18
     protected function configure()
19 19
     {
20
-        $this->_projectPath = getcwd();
20
+        $this->_projectPath=getcwd();
21 21
         $this->setName("cache:status");
22 22
         $this->setDescription("Checks cache status");
23 23
     }
@@ -31,8 +31,8 @@  discard block
 block discarded – undo
31 31
     {
32 32
         $output->writeln('<info>Checking cache status</info>');
33 33
 
34
-        $command  = $this->getCommand(new Config($output));
35
-        $pCommand = "vagrant ssh -c '". $command ."'";
34
+        $command=$this->getCommand(new Config($output));
35
+        $pCommand="vagrant ssh -c '".$command."'";
36 36
         return new ProcessCommand($pCommand, $this->_projectPath, $output);
37 37
     }
38 38
 
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
      */
43 43
     protected function getCommand(Config $config)
44 44
     {
45
-        $type = $config->type;
45
+        $type=$config->type;
46 46
         switch ($type) {
47 47
             case 'magento':
48 48
                 return "cd /var/www/public;../bin/n98-magerun.phar cache:list";
Please login to merge, or discard this patch.
src/Magestead/Command/Cache/CleanCommand.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@
 block discarded – undo
34 34
 
35 35
     /**
36 36
      * @param Config $config
37
-     * @return bool|string
37
+     * @return string|false
38 38
      */
39 39
     protected function getCommand(Config $config)
40 40
     {
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
 
18 18
     protected function configure()
19 19
     {
20
-        $this->_projectPath = getcwd();
20
+        $this->_projectPath=getcwd();
21 21
         $this->setName("cache:status");
22 22
         $this->setDescription("Checks cache status");
23 23
     }
@@ -31,8 +31,8 @@  discard block
 block discarded – undo
31 31
     {
32 32
         $output->writeln('<info>Checking cache status</info>');
33 33
 
34
-        $command  = $this->getCommand(new Config($output));
35
-        $pCommand = "vagrant ssh -c '". $command ."'";
34
+        $command=$this->getCommand(new Config($output));
35
+        $pCommand="vagrant ssh -c '".$command."'";
36 36
         return new ProcessCommand($pCommand, $this->_projectPath, $output);
37 37
     }
38 38
 
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
      */
43 43
     protected function getCommand(Config $config)
44 44
     {
45
-        $type = $config->type;
45
+        $type=$config->type;
46 46
         switch ($type) {
47 47
             case 'magento':
48 48
                 return "cd /var/www/public;../bin/n98-magerun.phar cache:list";
Please login to merge, or discard this patch.
src/Magestead/Command/Cache/DisableCommand.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@
 block discarded – undo
34 34
 
35 35
     /**
36 36
      * @param Config $config
37
-     * @return bool|string
37
+     * @return string|false
38 38
      */
39 39
     protected function getCommand(Config $config)
40 40
     {
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
 
18 18
     protected function configure()
19 19
     {
20
-        $this->_projectPath = getcwd();
20
+        $this->_projectPath=getcwd();
21 21
         $this->setName("cache:status");
22 22
         $this->setDescription("Checks cache status");
23 23
     }
@@ -31,8 +31,8 @@  discard block
 block discarded – undo
31 31
     {
32 32
         $output->writeln('<info>Checking cache status</info>');
33 33
 
34
-        $command  = $this->getCommand(new Config($output));
35
-        $pCommand = "vagrant ssh -c '". $command ."'";
34
+        $command=$this->getCommand(new Config($output));
35
+        $pCommand="vagrant ssh -c '".$command."'";
36 36
         return new ProcessCommand($pCommand, $this->_projectPath, $output);
37 37
     }
38 38
 
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
      */
43 43
     protected function getCommand(Config $config)
44 44
     {
45
-        $type = $config->type;
45
+        $type=$config->type;
46 46
         switch ($type) {
47 47
             case 'magento':
48 48
                 return "cd /var/www/public;../bin/n98-magerun.phar cache:list";
Please login to merge, or discard this patch.
src/Magestead/Command/Cache/EnableCommand.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@
 block discarded – undo
34 34
 
35 35
     /**
36 36
      * @param Config $config
37
-     * @return bool|string
37
+     * @return string|false
38 38
      */
39 39
     protected function getCommand(Config $config)
40 40
     {
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
 
18 18
     protected function configure()
19 19
     {
20
-        $this->_projectPath = getcwd();
20
+        $this->_projectPath=getcwd();
21 21
         $this->setName("cache:status");
22 22
         $this->setDescription("Checks cache status");
23 23
     }
@@ -31,8 +31,8 @@  discard block
 block discarded – undo
31 31
     {
32 32
         $output->writeln('<info>Checking cache status</info>');
33 33
 
34
-        $command  = $this->getCommand(new Config($output));
35
-        $pCommand = "vagrant ssh -c '". $command ."'";
34
+        $command=$this->getCommand(new Config($output));
35
+        $pCommand="vagrant ssh -c '".$command."'";
36 36
         return new ProcessCommand($pCommand, $this->_projectPath, $output);
37 37
     }
38 38
 
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
      */
43 43
     protected function getCommand(Config $config)
44 44
     {
45
-        $type = $config->type;
45
+        $type=$config->type;
46 46
         switch ($type) {
47 47
             case 'magento':
48 48
                 return "cd /var/www/public;../bin/n98-magerun.phar cache:list";
Please login to merge, or discard this patch.
src/Magestead/Command/Cache/FlushCommand.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@
 block discarded – undo
34 34
 
35 35
     /**
36 36
      * @param Config $config
37
-     * @return bool|string
37
+     * @return string|false
38 38
      */
39 39
     protected function getCommand(Config $config)
40 40
     {
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
 
18 18
     protected function configure()
19 19
     {
20
-        $this->_projectPath = getcwd();
20
+        $this->_projectPath=getcwd();
21 21
         $this->setName("cache:status");
22 22
         $this->setDescription("Checks cache status");
23 23
     }
@@ -31,8 +31,8 @@  discard block
 block discarded – undo
31 31
     {
32 32
         $output->writeln('<info>Checking cache status</info>');
33 33
 
34
-        $command  = $this->getCommand(new Config($output));
35
-        $pCommand = "vagrant ssh -c '". $command ."'";
34
+        $command=$this->getCommand(new Config($output));
35
+        $pCommand="vagrant ssh -c '".$command."'";
36 36
         return new ProcessCommand($pCommand, $this->_projectPath, $output);
37 37
     }
38 38
 
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
      */
43 43
     protected function getCommand(Config $config)
44 44
     {
45
-        $type = $config->type;
45
+        $type=$config->type;
46 46
         switch ($type) {
47 47
             case 'magento':
48 48
                 return "cd /var/www/public;../bin/n98-magerun.phar cache:list";
Please login to merge, or discard this patch.
src/Magestead/Command/Index/InfoCommand.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@
 block discarded – undo
34 34
 
35 35
     /**
36 36
      * @param Config $config
37
-     * @return bool|string
37
+     * @return string|false
38 38
      */
39 39
     protected function getCommand(Config $config)
40 40
     {
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
 
18 18
     protected function configure()
19 19
     {
20
-        $this->_projectPath = getcwd();
20
+        $this->_projectPath=getcwd();
21 21
         $this->setName("cache:status");
22 22
         $this->setDescription("Checks cache status");
23 23
     }
@@ -31,8 +31,8 @@  discard block
 block discarded – undo
31 31
     {
32 32
         $output->writeln('<info>Checking cache status</info>');
33 33
 
34
-        $command  = $this->getCommand(new Config($output));
35
-        $pCommand = "vagrant ssh -c '". $command ."'";
34
+        $command=$this->getCommand(new Config($output));
35
+        $pCommand="vagrant ssh -c '".$command."'";
36 36
         return new ProcessCommand($pCommand, $this->_projectPath, $output);
37 37
     }
38 38
 
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
      */
43 43
     protected function getCommand(Config $config)
44 44
     {
45
-        $type = $config->type;
45
+        $type=$config->type;
46 46
         switch ($type) {
47 47
             case 'magento':
48 48
                 return "cd /var/www/public;../bin/n98-magerun.phar cache:list";
Please login to merge, or discard this patch.
src/Magestead/Command/Index/StatusCommand.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@
 block discarded – undo
34 34
 
35 35
     /**
36 36
      * @param Config $config
37
-     * @return bool|string
37
+     * @return string|false
38 38
      */
39 39
     protected function getCommand(Config $config)
40 40
     {
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
 
18 18
     protected function configure()
19 19
     {
20
-        $this->_projectPath = getcwd();
20
+        $this->_projectPath=getcwd();
21 21
         $this->setName("cache:status");
22 22
         $this->setDescription("Checks cache status");
23 23
     }
@@ -31,8 +31,8 @@  discard block
 block discarded – undo
31 31
     {
32 32
         $output->writeln('<info>Checking cache status</info>');
33 33
 
34
-        $command  = $this->getCommand(new Config($output));
35
-        $pCommand = "vagrant ssh -c '". $command ."'";
34
+        $command=$this->getCommand(new Config($output));
35
+        $pCommand="vagrant ssh -c '".$command."'";
36 36
         return new ProcessCommand($pCommand, $this->_projectPath, $output);
37 37
     }
38 38
 
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
      */
43 43
     protected function getCommand(Config $config)
44 44
     {
45
-        $type = $config->type;
45
+        $type=$config->type;
46 46
         switch ($type) {
47 47
             case 'magento':
48 48
                 return "cd /var/www/public;../bin/n98-magerun.phar cache:list";
Please login to merge, or discard this patch.
src/Magestead/Installers/Project.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -9,8 +9,8 @@
 block discarded – undo
9 9
     /**
10 10
      * @param array $options
11 11
      * @param array $config
12
-     * @param $projectPath
13
-     * @param $output
12
+     * @param string $projectPath
13
+     * @param \Symfony\Component\Console\Output\OutputInterface $output
14 14
      * @return Magento2Project|MagentoProject
15 15
      */
16 16
     public static function create(array $options, array $config, $projectPath, $output)
Please login to merge, or discard this patch.
src/Magestead/Command/SetupCommand.php 2 patches
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -48,8 +48,8 @@  discard block
 block discarded – undo
48 48
     }
49 49
 
50 50
     /**
51
-     * @param $source
52
-     * @param $target
51
+     * @param string $source
52
+     * @param string $target
53 53
      * @param OutputInterface $output
54 54
      */
55 55
     protected function copyConfigFiles($source, $target, OutputInterface $output)
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
 
133 133
     /**
134 134
      * @param OutputInterface $output
135
-     * @param $options
135
+     * @param Options $options
136 136
      */
137 137
     protected function setupProject(OutputInterface $output, $options)
138 138
     {
Please login to merge, or discard this patch.
Spacing   +26 added lines, -26 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,20 +82,20 @@  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 100
         $this->saveConfigFile($msConfig, $output);
101 101
 
@@ -107,9 +107,9 @@  discard block
 block discarded – undo
107 107
      */
108 108
     protected function getConfigFile(OutputInterface $output)
109 109
     {
110
-        $yaml = new Parser();
110
+        $yaml=new Parser();
111 111
         try {
112
-            return $yaml->parse(file_get_contents($this->_projectPath . '/magestead.yaml'));
112
+            return $yaml->parse(file_get_contents($this->_projectPath.'/magestead.yaml'));
113 113
         } catch (ParseException $e) {
114 114
             $output->writeln('<error>Unable to parse the YAML string</error>');
115 115
             printf("Unable to parse the YAML string: %s", $e->getMessage());
@@ -122,11 +122,11 @@  discard block
 block discarded – undo
122 122
      */
123 123
     protected function saveConfigFile(array $config, OutputInterface $output)
124 124
     {
125
-        $dumper = new Dumper();
126
-        $yaml   = $dumper->dump($config, 6);
125
+        $dumper=new Dumper();
126
+        $yaml=$dumper->dump($config, 6);
127 127
 
128 128
         try {
129
-            file_put_contents($this->_projectPath . '/magestead.yaml', $yaml);
129
+            file_put_contents($this->_projectPath.'/magestead.yaml', $yaml);
130 130
         } catch (\Exception $e) {
131 131
             $output->writeln('<error>Unable to write to the YAML file</error>');
132 132
         }
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
     protected function setupProject(OutputInterface $output, $options)
140 140
     {
141 141
         $output->writeln('<info>Setting up project structure</info>');
142
-        $provisionFolder = $this->_basePath . "provision";
142
+        $provisionFolder=$this->_basePath."provision";
143 143
         $this->copyConfigFiles($provisionFolder, $this->_projectPath, $output);
144 144
         $this->configureProject($options->getAllOptions(), $output);
145 145
     }
Please login to merge, or discard this patch.