@@ -34,7 +34,7 @@ |
||
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 | { |
@@ -15,8 +15,7 @@ discard block |
||
15 | 15 | protected $_config; |
16 | 16 | protected $_projectPath; |
17 | 17 | |
18 | - protected function configure() |
|
19 | - { |
|
18 | + protected function configure() { |
|
20 | 19 | $this->_projectPath = getcwd(); |
21 | 20 | $this->setName("cache:disable"); |
22 | 21 | $this->setDescription("Disable cache types"); |
@@ -27,8 +26,7 @@ discard block |
||
27 | 26 | * @param OutputInterface $output |
28 | 27 | * @return ProcessCommand |
29 | 28 | */ |
30 | - protected function execute(InputInterface $input, OutputInterface $output) |
|
31 | - { |
|
29 | + protected function execute(InputInterface $input, OutputInterface $output) { |
|
32 | 30 | $output->writeln('<info>Disabling all cache types</info>'); |
33 | 31 | |
34 | 32 | $command = $this->getCommand(new Config($output)); |
@@ -40,8 +38,7 @@ discard block |
||
40 | 38 | * @param Config $config |
41 | 39 | * @return bool|string |
42 | 40 | */ |
43 | - protected function getCommand(Config $config) |
|
44 | - { |
|
41 | + protected function getCommand(Config $config) { |
|
45 | 42 | $type = $config->type; |
46 | 43 | switch ($type) { |
47 | 44 | case 'magento': |
@@ -52,6 +52,6 @@ |
||
52 | 52 | break; |
53 | 53 | } |
54 | 54 | |
55 | - return false; |
|
55 | + return FALSE; |
|
56 | 56 | } |
57 | 57 | } |
58 | 58 | \ No newline at end of file |
@@ -17,7 +17,7 @@ discard block |
||
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 |
||
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 |
||
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"; |
@@ -34,7 +34,7 @@ |
||
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 | { |
@@ -15,8 +15,7 @@ discard block |
||
15 | 15 | protected $_config; |
16 | 16 | protected $_projectPath; |
17 | 17 | |
18 | - protected function configure() |
|
19 | - { |
|
18 | + protected function configure() { |
|
20 | 19 | $this->_projectPath = getcwd(); |
21 | 20 | $this->setName("cache:disable"); |
22 | 21 | $this->setDescription("Disable cache types"); |
@@ -27,8 +26,7 @@ discard block |
||
27 | 26 | * @param OutputInterface $output |
28 | 27 | * @return ProcessCommand |
29 | 28 | */ |
30 | - protected function execute(InputInterface $input, OutputInterface $output) |
|
31 | - { |
|
29 | + protected function execute(InputInterface $input, OutputInterface $output) { |
|
32 | 30 | $output->writeln('<info>Disabling all cache types</info>'); |
33 | 31 | |
34 | 32 | $command = $this->getCommand(new Config($output)); |
@@ -40,8 +38,7 @@ discard block |
||
40 | 38 | * @param Config $config |
41 | 39 | * @return bool|string |
42 | 40 | */ |
43 | - protected function getCommand(Config $config) |
|
44 | - { |
|
41 | + protected function getCommand(Config $config) { |
|
45 | 42 | $type = $config->type; |
46 | 43 | switch ($type) { |
47 | 44 | case 'magento': |
@@ -52,6 +52,6 @@ |
||
52 | 52 | break; |
53 | 53 | } |
54 | 54 | |
55 | - return false; |
|
55 | + return FALSE; |
|
56 | 56 | } |
57 | 57 | } |
58 | 58 | \ No newline at end of file |
@@ -17,7 +17,7 @@ discard block |
||
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 |
||
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 |
||
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"; |
@@ -34,7 +34,7 @@ |
||
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 | { |
@@ -15,8 +15,7 @@ discard block |
||
15 | 15 | protected $_config; |
16 | 16 | protected $_projectPath; |
17 | 17 | |
18 | - protected function configure() |
|
19 | - { |
|
18 | + protected function configure() { |
|
20 | 19 | $this->_projectPath = getcwd(); |
21 | 20 | $this->setName("cache:disable"); |
22 | 21 | $this->setDescription("Disable cache types"); |
@@ -27,8 +26,7 @@ discard block |
||
27 | 26 | * @param OutputInterface $output |
28 | 27 | * @return ProcessCommand |
29 | 28 | */ |
30 | - protected function execute(InputInterface $input, OutputInterface $output) |
|
31 | - { |
|
29 | + protected function execute(InputInterface $input, OutputInterface $output) { |
|
32 | 30 | $output->writeln('<info>Disabling all cache types</info>'); |
33 | 31 | |
34 | 32 | $command = $this->getCommand(new Config($output)); |
@@ -40,8 +38,7 @@ discard block |
||
40 | 38 | * @param Config $config |
41 | 39 | * @return bool|string |
42 | 40 | */ |
43 | - protected function getCommand(Config $config) |
|
44 | - { |
|
41 | + protected function getCommand(Config $config) { |
|
45 | 42 | $type = $config->type; |
46 | 43 | switch ($type) { |
47 | 44 | case 'magento': |
@@ -52,6 +52,6 @@ |
||
52 | 52 | break; |
53 | 53 | } |
54 | 54 | |
55 | - return false; |
|
55 | + return FALSE; |
|
56 | 56 | } |
57 | 57 | } |
58 | 58 | \ No newline at end of file |
@@ -17,7 +17,7 @@ discard block |
||
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 |
||
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 |
||
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"; |
@@ -9,8 +9,8 @@ |
||
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) |
@@ -13,8 +13,7 @@ |
||
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); |
@@ -15,8 +15,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
@@ -17,9 +17,9 @@ discard block |
||
17 | 17 | */ |
18 | 18 | public function __construct($repoUrl, $projectPath, OutputInterface $output) |
19 | 19 | { |
20 | - $this->_output = $output; |
|
21 | - $this->_repoUrl = $repoUrl; |
|
22 | - $this->_projectPath = $projectPath; |
|
20 | + $this->_output=$output; |
|
21 | + $this->_repoUrl=$repoUrl; |
|
22 | + $this->_projectPath=$projectPath; |
|
23 | 23 | |
24 | 24 | $this->execute($output); |
25 | 25 | } |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | */ |
47 | 47 | public function init() |
48 | 48 | { |
49 | - $command = 'git init; git remote add origin ' . $this->_repoUrl; |
|
49 | + $command='git init; git remote add origin '.$this->_repoUrl; |
|
50 | 50 | new ProcessCommand($command, $this->_projectPath, $this->_output); |
51 | 51 | |
52 | 52 | return $this; |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | */ |
60 | 60 | public function addFiles() |
61 | 61 | { |
62 | - $command = 'git add -A'; |
|
62 | + $command='git add -A'; |
|
63 | 63 | new ProcessCommand($command, $this->_projectPath, $this->_output); |
64 | 64 | |
65 | 65 | return $this; |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | */ |
73 | 73 | public function commitFiles() |
74 | 74 | { |
75 | - $command = "git commit -m 'Initial commit'"; |
|
75 | + $command="git commit -m 'Initial commit'"; |
|
76 | 76 | new ProcessCommand($command, $this->_projectPath, $this->_output); |
77 | 77 | |
78 | 78 | return $this; |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | */ |
86 | 86 | public function pushFiles() |
87 | 87 | { |
88 | - $command = "git push -u origin master"; |
|
88 | + $command="git push -u origin master"; |
|
89 | 89 | new ProcessCommand($command, $this->_projectPath, $this->_output); |
90 | 90 | |
91 | 91 | return $this; |
@@ -14,8 +14,7 @@ |
||
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 = |
@@ -16,13 +16,13 @@ |
||
16 | 16 | */ |
17 | 17 | public static function send($message) |
18 | 18 | { |
19 | - $notifier = NotifierFactory::create(); |
|
20 | - $basePath = dirname( __FILE__ ) . '/../../../'; |
|
21 | - $notification = |
|
19 | + $notifier=NotifierFactory::create(); |
|
20 | + $basePath=dirname(__FILE__).'/../../../'; |
|
21 | + $notification= |
|
22 | 22 | (new Notify()) |
23 | 23 | ->setTitle('Magestead') |
24 | 24 | ->setBody($message) |
25 | - ->setIcon($basePath .'assets/magentologo.png') |
|
25 | + ->setIcon($basePath.'assets/magentologo.png') |
|
26 | 26 | ; |
27 | 27 | |
28 | 28 | $notifier->send($notification); |
@@ -12,8 +12,7 @@ discard block |
||
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 |
||
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']; |
@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | */ |
15 | 15 | public static function verify(array $options, OutputInterface $output) |
16 | 16 | { |
17 | - $hostPlugin = `vagrant plugin list | grep vagrant-hostsupdater`; |
|
17 | + $hostPlugin=`vagrant plugin list | grep vagrant-hostsupdater`; |
|
18 | 18 | if (is_null($hostPlugin)) { |
19 | 19 | self::editHostsInstructions($options, $output); |
20 | 20 | |
@@ -29,8 +29,8 @@ discard block |
||
29 | 29 | protected static function editHostsInstructions(array $options, OutputInterface $output) |
30 | 30 | { |
31 | 31 | $output->writeln('<comment>NOTE: You will need to add the following to your hosts file!</comment>'); |
32 | - $comment = $options['vagrantfile']['vm']['network']['private_network'] . |
|
33 | - ' ' . $options['magestead']['apps']['mba_12345']['base_url']; |
|
34 | - $output->writeln('<info>' . $comment . '</info>'); |
|
32 | + $comment=$options['vagrantfile']['vm']['network']['private_network']. |
|
33 | + ' '.$options['magestead']['apps']['mba_12345']['base_url']; |
|
34 | + $output->writeln('<info>'.$comment.'</info>'); |
|
35 | 35 | } |
36 | 36 | } |
37 | 37 | \ No newline at end of file |
@@ -24,8 +24,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 { |
@@ -58,6 +58,6 @@ |
||
58 | 58 | break; |
59 | 59 | } |
60 | 60 | |
61 | - return false; |
|
61 | + return FALSE; |
|
62 | 62 | } |
63 | 63 | } |
@@ -48,27 +48,27 @@ discard block |
||
48 | 48 | */ |
49 | 49 | protected function installMagento(array $options, $projectPath, OutputInterface $output) |
50 | 50 | { |
51 | - $locale = $options['magestead']['apps']['mba_12345']['locale']; |
|
52 | - $db_name = $options['magestead']['apps']['mba_12345']['db_name']; |
|
53 | - $base_url = $options['magestead']['apps']['mba_12345']['base_url']; |
|
54 | - $default_currency = $options['magestead']['apps']['mba_12345']['default_currency']; |
|
51 | + $locale=$options['magestead']['apps']['mba_12345']['locale']; |
|
52 | + $db_name=$options['magestead']['apps']['mba_12345']['db_name']; |
|
53 | + $base_url=$options['magestead']['apps']['mba_12345']['base_url']; |
|
54 | + $default_currency=$options['magestead']['apps']['mba_12345']['default_currency']; |
|
55 | 55 | |
56 | - $install = 'vagrant ssh -c \'cd /var/www/public; php -f install.php -- \ |
|
56 | + $install='vagrant ssh -c \'cd /var/www/public; php -f install.php -- \ |
|
57 | 57 | --license_agreement_accepted "yes" \ |
58 | ---locale "' . $locale . '" \ |
|
58 | +--locale "' . $locale.'" \ |
|
59 | 59 | --timezone "Europe/London" \ |
60 | ---default_currency "' . $default_currency . '" \ |
|
60 | +--default_currency "' . $default_currency.'" \ |
|
61 | 61 | --db_host "localhost" \ |
62 | ---db_name "' . $db_name . '" \ |
|
62 | +--db_name "' . $db_name.'" \ |
|
63 | 63 | --db_user "magestead" \ |
64 | 64 | --db_pass "vagrant" \ |
65 | 65 | --session_save "db" \ |
66 | ---url "http://' . $base_url . '/" \ |
|
66 | +--url "http://' . $base_url.'/" \ |
|
67 | 67 | --use_rewrites "yes" \ |
68 | 68 | --skip_url_validation "yes" \ |
69 | 69 | --use_secure "no" \ |
70 | 70 | --use_secure_admin "no" \ |
71 | ---secure_base_url "http://' . $base_url . '/" \ |
|
71 | +--secure_base_url "http://' . $base_url.'/" \ |
|
72 | 72 | --admin_firstname "RichDynamix" \ |
73 | 73 | --admin_lastname "Magestead" \ |
74 | 74 | --admin_email "[email protected]" \ |
@@ -88,27 +88,27 @@ discard block |
||
88 | 88 | */ |
89 | 89 | protected function setPermissions($projectPath, OutputInterface $output) |
90 | 90 | { |
91 | - $command = 'vagrant ssh -c \'cd /var/www/public; sudo find var/ -type f -exec chmod 600 {} \;\''; |
|
91 | + $command='vagrant ssh -c \'cd /var/www/public; sudo find var/ -type f -exec chmod 600 {} \;\''; |
|
92 | 92 | $output->writeln('<comment>Setting "var" Files Permissions</comment>'); |
93 | 93 | new ProcessCommand($command, $projectPath, $output); |
94 | 94 | |
95 | - $command = 'vagrant ssh -c \'cd /var/www/public; sudo find media/ -type f -exec chmod 600 {} \;\''; |
|
95 | + $command='vagrant ssh -c \'cd /var/www/public; sudo find media/ -type f -exec chmod 600 {} \;\''; |
|
96 | 96 | $output->writeln('<comment>Setting "media" Files Permissions</comment>'); |
97 | 97 | new ProcessCommand($command, $projectPath, $output); |
98 | 98 | |
99 | - $command = 'vagrant ssh -c \'cd /var/www/public; sudo find var/ -type d -exec chmod 700 {} \;\''; |
|
99 | + $command='vagrant ssh -c \'cd /var/www/public; sudo find var/ -type d -exec chmod 700 {} \;\''; |
|
100 | 100 | $output->writeln('<comment>Setting "var" Folder Permissions</comment>'); |
101 | 101 | new ProcessCommand($command, $projectPath, $output); |
102 | 102 | |
103 | - $command = 'vagrant ssh -c \'cd /var/www/public; sudo find media/ -type d -exec chmod 700 {} \;\''; |
|
103 | + $command='vagrant ssh -c \'cd /var/www/public; sudo find media/ -type d -exec chmod 700 {} \;\''; |
|
104 | 104 | $output->writeln('<comment>Setting "media" Folder Permissions</comment>'); |
105 | 105 | new ProcessCommand($command, $projectPath, $output); |
106 | 106 | |
107 | - $command = 'vagrant ssh -c \'cd /var/www/public; sudo chmod 700 includes;\''; |
|
107 | + $command='vagrant ssh -c \'cd /var/www/public; sudo chmod 700 includes;\''; |
|
108 | 108 | $output->writeln('<comment>Setting "includes" Permissions</comment>'); |
109 | 109 | new ProcessCommand($command, $projectPath, $output); |
110 | 110 | |
111 | - $command = 'vagrant ssh -c \'cd /var/www/public; sudo chmod 600 includes/config.php;\''; |
|
111 | + $command='vagrant ssh -c \'cd /var/www/public; sudo chmod 600 includes/config.php;\''; |
|
112 | 112 | $output->writeln('<comment>Setting "includes/config.php" Permissions</comment>'); |
113 | 113 | new ProcessCommand($command, $projectPath, $output); |
114 | 114 | } |
@@ -119,11 +119,11 @@ discard block |
||
119 | 119 | */ |
120 | 120 | protected function installMagerun($projectPath, OutputInterface $output) |
121 | 121 | { |
122 | - $command = 'vagrant ssh -c \'cd /var/www/bin; sudo wget https://files.magerun.net/n98-magerun.phar;\''; |
|
122 | + $command='vagrant ssh -c \'cd /var/www/bin; sudo wget https://files.magerun.net/n98-magerun.phar;\''; |
|
123 | 123 | $output->writeln('<info>Downloading Magerun</info>'); |
124 | 124 | new ProcessCommand($command, $projectPath, $output); |
125 | 125 | |
126 | - $command = 'vagrant ssh -c \'cd /var/www/bin; sudo chmod +x ./n98-magerun.phar;\''; |
|
126 | + $command='vagrant ssh -c \'cd /var/www/bin; sudo chmod +x ./n98-magerun.phar;\''; |
|
127 | 127 | $output->writeln('<comment>Setting Magerun Permissions</comment>'); |
128 | 128 | new ProcessCommand($command, $projectPath, $output); |
129 | 129 | } |
@@ -135,21 +135,21 @@ discard block |
||
135 | 135 | */ |
136 | 136 | protected function finaliseSetup(array $options, $projectPath, OutputInterface $output) |
137 | 137 | { |
138 | - $command = 'vagrant ssh -c \'cd /var/www/public; ../bin/n98-magerun.phar index:reindex:all;\''; |
|
138 | + $command='vagrant ssh -c \'cd /var/www/public; ../bin/n98-magerun.phar index:reindex:all;\''; |
|
139 | 139 | $output->writeln('<comment>Reindexing Tables</comment>'); |
140 | 140 | new ProcessCommand($command, $projectPath, $output); |
141 | 141 | |
142 | - $command = 'vagrant ssh -c \'cd /var/www/public; ../bin/n98-magerun.phar cache:enable;\''; |
|
142 | + $command='vagrant ssh -c \'cd /var/www/public; ../bin/n98-magerun.phar cache:enable;\''; |
|
143 | 143 | $output->writeln('<comment>Enabling All Cache</comment>'); |
144 | 144 | new ProcessCommand($command, $projectPath, $output); |
145 | 145 | |
146 | - $command = 'vagrant ssh -c \'cd /var/www/public; ../bin/n98-magerun.phar cache:flush;\''; |
|
146 | + $command='vagrant ssh -c \'cd /var/www/public; ../bin/n98-magerun.phar cache:flush;\''; |
|
147 | 147 | $output->writeln('<comment>Flushing All Cache</comment>'); |
148 | 148 | new ProcessCommand($command, $projectPath, $output); |
149 | 149 | |
150 | 150 | $this->processVcs($options, $projectPath, $output); |
151 | 151 | |
152 | - $command = 'vagrant ssh -c \'cd /var/www/public; ../bin/n98-magerun.phar sys:check;\''; |
|
152 | + $command='vagrant ssh -c \'cd /var/www/public; ../bin/n98-magerun.phar sys:check;\''; |
|
153 | 153 | $output->writeln('<comment>System Check</comment>'); |
154 | 154 | new ProcessCommand($command, $projectPath, $output); |
155 | 155 | } |
@@ -161,7 +161,7 @@ discard block |
||
161 | 161 | protected function showCredentials(array $options, OutputInterface $output) |
162 | 162 | { |
163 | 163 | $output->writeln('<info>SUCCESS: Magestead has finished installing Magento!</info>'); |
164 | - $table = new Table($output); |
|
164 | + $table=new Table($output); |
|
165 | 165 | $table |
166 | 166 | ->setHeaders(['Username', 'Password', 'Base URL']) |
167 | 167 | ->setRows([ |
@@ -181,7 +181,7 @@ discard block |
||
181 | 181 | protected function processVcs(array $options, $projectPath, OutputInterface $output) |
182 | 182 | { |
183 | 183 | if (!empty($options['repo_url'])) { |
184 | - copy($projectPath . "/puphpet/magestead/magento/stubs/gitignore.tmp", $projectPath . "/.gitignore"); |
|
184 | + copy($projectPath."/puphpet/magestead/magento/stubs/gitignore.tmp", $projectPath."/.gitignore"); |
|
185 | 185 | return new VersionControl($options['repo_url'], $projectPath, $output); |
186 | 186 | } |
187 | 187 | } |
@@ -192,7 +192,7 @@ discard block |
||
192 | 192 | */ |
193 | 193 | protected function composerInstall($projectPath, OutputInterface $output) |
194 | 194 | { |
195 | - copy($projectPath . "/puphpet/magestead/magento/stubs/composer.tmp", $projectPath . "/composer.json"); |
|
195 | + copy($projectPath."/puphpet/magestead/magento/stubs/composer.tmp", $projectPath."/composer.json"); |
|
196 | 196 | new ProcessCommand('composer install', $projectPath, $output); |
197 | 197 | } |
198 | 198 | |
@@ -210,31 +210,31 @@ discard block |
||
210 | 210 | */ |
211 | 211 | protected function updateConfigXml($projectPath) |
212 | 212 | { |
213 | - $localFile = '/public/app/etc/local.xml'; |
|
214 | - $localXml = file_get_contents($projectPath . $localFile); |
|
215 | - |
|
216 | - $config = new \SimpleXMLElement($localXml); |
|
217 | - |
|
218 | - $config->global[0]->redis_session[0]->host = '127.0.0.1'; |
|
219 | - $config->global[0]->redis_session[0]->port = '6379'; |
|
220 | - $config->global[0]->redis_session[0]->password = ''; |
|
221 | - $config->global[0]->redis_session[0]->timeout = '2.5'; |
|
222 | - $config->global[0]->redis_session[0]->persistent = ''; |
|
223 | - $config->global[0]->redis_session[0]->db = ''; |
|
224 | - $config->global[0]->redis_session[0]->compression_threshold = '2048'; |
|
225 | - $config->global[0]->redis_session[0]->compression_lib = 'gzip'; |
|
226 | - $config->global[0]->redis_session[0]->log_level = '1'; |
|
227 | - $config->global[0]->redis_session[0]->max_concurrency = '6'; |
|
228 | - $config->global[0]->redis_session[0]->break_after_frontend = '5'; |
|
229 | - $config->global[0]->redis_session[0]->break_after_adminhtml = '30'; |
|
230 | - $config->global[0]->redis_session[0]->first_lifetime = '600'; |
|
231 | - $config->global[0]->redis_session[0]->bot_first_lifetime = '60'; |
|
232 | - $config->global[0]->redis_session[0]->bot_lifetime = '7200'; |
|
233 | - $config->global[0]->redis_session[0]->disable_locking = '0'; |
|
234 | - $config->global[0]->redis_session[0]->min_lifetime = '60'; |
|
235 | - $config->global[0]->redis_session[0]->max_lifetime = '2592000'; |
|
236 | - |
|
237 | - file_put_contents($projectPath . $localFile, $config->asXML()); |
|
213 | + $localFile='/public/app/etc/local.xml'; |
|
214 | + $localXml=file_get_contents($projectPath.$localFile); |
|
215 | + |
|
216 | + $config=new \SimpleXMLElement($localXml); |
|
217 | + |
|
218 | + $config->global[0]->redis_session[0]->host='127.0.0.1'; |
|
219 | + $config->global[0]->redis_session[0]->port='6379'; |
|
220 | + $config->global[0]->redis_session[0]->password=''; |
|
221 | + $config->global[0]->redis_session[0]->timeout='2.5'; |
|
222 | + $config->global[0]->redis_session[0]->persistent=''; |
|
223 | + $config->global[0]->redis_session[0]->db=''; |
|
224 | + $config->global[0]->redis_session[0]->compression_threshold='2048'; |
|
225 | + $config->global[0]->redis_session[0]->compression_lib='gzip'; |
|
226 | + $config->global[0]->redis_session[0]->log_level='1'; |
|
227 | + $config->global[0]->redis_session[0]->max_concurrency='6'; |
|
228 | + $config->global[0]->redis_session[0]->break_after_frontend='5'; |
|
229 | + $config->global[0]->redis_session[0]->break_after_adminhtml='30'; |
|
230 | + $config->global[0]->redis_session[0]->first_lifetime='600'; |
|
231 | + $config->global[0]->redis_session[0]->bot_first_lifetime='60'; |
|
232 | + $config->global[0]->redis_session[0]->bot_lifetime='7200'; |
|
233 | + $config->global[0]->redis_session[0]->disable_locking='0'; |
|
234 | + $config->global[0]->redis_session[0]->min_lifetime='60'; |
|
235 | + $config->global[0]->redis_session[0]->max_lifetime='2592000'; |
|
236 | + |
|
237 | + file_put_contents($projectPath.$localFile, $config->asXML()); |
|
238 | 238 | } |
239 | 239 | |
240 | 240 | /** |
@@ -242,12 +242,12 @@ discard block |
||
242 | 242 | */ |
243 | 243 | protected function activateModule($projectPath) |
244 | 244 | { |
245 | - $moduleFile = '/public/app/etc/modules/Cm_RedisSession.xml'; |
|
246 | - $moduleXml = file_get_contents($projectPath . $moduleFile); |
|
247 | - $config = new \SimpleXMLElement($moduleXml); |
|
245 | + $moduleFile='/public/app/etc/modules/Cm_RedisSession.xml'; |
|
246 | + $moduleXml=file_get_contents($projectPath.$moduleFile); |
|
247 | + $config=new \SimpleXMLElement($moduleXml); |
|
248 | 248 | |
249 | - $config->modules[0]->Cm_RedisSession[0]->active = 'true'; |
|
250 | - file_put_contents($projectPath . $moduleFile, $config->asXML()); |
|
249 | + $config->modules[0]->Cm_RedisSession[0]->active='true'; |
|
250 | + file_put_contents($projectPath.$moduleFile, $config->asXML()); |
|
251 | 251 | } |
252 | 252 | |
253 | 253 | /** |
@@ -259,10 +259,10 @@ discard block |
||
259 | 259 | protected function configureTestSuites(array $options, $projectPath, OutputInterface $output) |
260 | 260 | { |
261 | 261 | $output->writeln('<info>Configuring PHPSpec & Behat Suites</info>'); |
262 | - $progress = new ProgressBar($output, 2); |
|
262 | + $progress=new ProgressBar($output, 2); |
|
263 | 263 | |
264 | 264 | $progress->start(); |
265 | - copy($projectPath . "/puphpet/magestead/magento/stubs/phpspec.yml", $projectPath . "/phpspec.yml"); |
|
265 | + copy($projectPath."/puphpet/magestead/magento/stubs/phpspec.yml", $projectPath."/phpspec.yml"); |
|
266 | 266 | $progress->advance(); |
267 | 267 | $progress->advance(); |
268 | 268 | // $behat = $this->getBehatConfig($options, $projectPath, $output); |
@@ -281,12 +281,12 @@ discard block |
||
281 | 281 | */ |
282 | 282 | protected function getBehatConfig(array $options, $projectPath, OutputInterface $output) |
283 | 283 | { |
284 | - $yaml = new Parser(); |
|
284 | + $yaml=new Parser(); |
|
285 | 285 | |
286 | 286 | try { |
287 | - $behat = $yaml->parse(file_get_contents($projectPath . "/puphpet/magestead/magento/stubs/behat.yml")); |
|
287 | + $behat=$yaml->parse(file_get_contents($projectPath."/puphpet/magestead/magento/stubs/behat.yml")); |
|
288 | 288 | |
289 | - $behat['default']['extensions']['MageTest\MagentoExtension\Extension']['base_url'] = $options['base_url']; |
|
289 | + $behat['default']['extensions']['MageTest\MagentoExtension\Extension']['base_url']=$options['base_url']; |
|
290 | 290 | return $behat; |
291 | 291 | } catch (ParseException $e) { |
292 | 292 | $output->writeln('<error>Unable to parse the YAML config</error>'); |
@@ -303,11 +303,11 @@ discard block |
||
303 | 303 | */ |
304 | 304 | protected function saveBehatConfig($projectPath, OutputInterface $output, $behat, $progress) |
305 | 305 | { |
306 | - $dumper = new Dumper(); |
|
307 | - $yaml = $dumper->dump($behat, 6); |
|
306 | + $dumper=new Dumper(); |
|
307 | + $yaml=$dumper->dump($behat, 6); |
|
308 | 308 | |
309 | 309 | try { |
310 | - file_put_contents($projectPath . '/behat.yml', $yaml); |
|
310 | + file_put_contents($projectPath.'/behat.yml', $yaml); |
|
311 | 311 | $progress->advance(); |
312 | 312 | } catch (\Exception $e) { |
313 | 313 | $output->writeln('<error>Unable to write to the YAML file</error>'); |
@@ -28,6 +28,6 @@ |
||
28 | 28 | protected function execute(InputInterface $input, OutputInterface $output) |
29 | 29 | { |
30 | 30 | passthru('vagrant ssh'); |
31 | - return true; |
|
31 | + return TRUE; |
|
32 | 32 | } |
33 | 33 | } |
@@ -14,8 +14,7 @@ discard block |
||
14 | 14 | protected $_config; |
15 | 15 | protected $_projectPath; |
16 | 16 | |
17 | - protected function configure() |
|
18 | - { |
|
17 | + protected function configure() { |
|
19 | 18 | $this->_projectPath = getcwd(); |
20 | 19 | $this->setName("redis:flush-all"); |
21 | 20 | $this->setDescription("Flush redis storage"); |
@@ -26,8 +25,7 @@ discard block |
||
26 | 25 | * @param OutputInterface $output |
27 | 26 | * @return ProcessCommand |
28 | 27 | */ |
29 | - protected function execute(InputInterface $input, OutputInterface $output) |
|
30 | - { |
|
28 | + protected function execute(InputInterface $input, OutputInterface $output) { |
|
31 | 29 | $output->writeln('<info>Flushing Redis Storage</info>'); |
32 | 30 | |
33 | 31 | $command = "redis-cli flushall"; |
@@ -15,7 +15,7 @@ |
||
15 | 15 | |
16 | 16 | protected function configure() |
17 | 17 | { |
18 | - $this->_projectPath = getcwd(); |
|
18 | + $this->_projectPath=getcwd(); |
|
19 | 19 | |
20 | 20 | $this->setName("vm:up"); |
21 | 21 | $this->setDescription("Spin up your development machine"); |