Completed
Push — master ( e48266...c6a956 )
by Steven
8s
created
src/Magestead/Exceptions/ExistingProjectException.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -4,4 +4,6 @@
 block discarded – undo
4 4
  * Class ExistingProjectException
5 5
  * @package Magestead\Exceptions
6 6
  */
7
-class ExistingProjectException extends \Exception {}
8 7
\ No newline at end of file
8
+class ExistingProjectException extends \Exception
9
+{
10
+}
9 11
\ No newline at end of file
Please login to merge, or discard this patch.
src/Magestead/Helper/Options.php 1 patch
Braces   +13 added lines, -26 removed lines patch added patch discarded remove patch
@@ -36,8 +36,7 @@  discard block
 block discarded – undo
36 36
      * @param OutputInterface $output
37 37
      * @param $project
38 38
      */
39
-    public function __construct($helper, InputInterface $input, OutputInterface $output, $project)
40
-    {
39
+    public function __construct($helper, InputInterface $input, OutputInterface $output, $project) {
41 40
         $this->setVagrantSettings($helper, $input, $output);
42 41
 
43 42
         $this->setServerConfig($helper, $input, $output);
@@ -52,8 +51,7 @@  discard block
 block discarded – undo
52 51
     /**
53 52
      * @return array
54 53
      */
55
-    public function getAllOptions()
56
-    {
54
+    public function getAllOptions() {
57 55
         return [
58 56
           'app' => $this->_app,
59 57
           'server' => $this->_server,
@@ -77,8 +75,7 @@  discard block
 block discarded – undo
77 75
      * @param InputInterface $input
78 76
      * @param OutputInterface $output
79 77
      */
80
-    protected function setVagrantSettings($helper, InputInterface $input, OutputInterface $output)
81
-    {
78
+    protected function setVagrantSettings($helper, InputInterface $input, OutputInterface $output) {
82 79
         $output->writeln('<comment>Lets configure your project\'s VM</comment>');
83 80
 
84 81
         $ipQuestion       = new Question("Configure the IP for your VM (192.168.47.47): ", '192.168.47.47');
@@ -97,8 +94,7 @@  discard block
 block discarded – undo
97 94
      * @param OutputInterface $output
98 95
      * @param $project
99 96
      */
100
-    protected function setApplicationSettings($helper, InputInterface $input, OutputInterface $output, $project)
101
-    {
97
+    protected function setApplicationSettings($helper, InputInterface $input, OutputInterface $output, $project) {
102 98
         $output->writeln('<comment>Lets configure your project\'s application</comment>');
103 99
         if ($this->_phpVer !== '70') {
104 100
             $appQuestion = new ChoiceQuestion(
@@ -126,8 +122,7 @@  discard block
 block discarded – undo
126 122
      * @param OutputInterface $output
127 123
      * @return boolean|integer
128 124
      */
129
-    protected function setMagento2Settings($helper, InputInterface $input, OutputInterface $output)
130
-    {
125
+    protected function setMagento2Settings($helper, InputInterface $input, OutputInterface $output) {
131 126
         if ($this->_app === 'magento2') {
132 127
             return $this->verifyAuth($helper, $input, $output);
133 128
         }
@@ -140,8 +135,7 @@  discard block
 block discarded – undo
140 135
      * @param InputInterface $input
141 136
      * @param OutputInterface $output
142 137
      */
143
-    protected function setVersionControlSettings($helper, InputInterface $input, OutputInterface $output)
144
-    {
138
+    protected function setVersionControlSettings($helper, InputInterface $input, OutputInterface $output) {
145 139
         $versionControl = new ConfirmationQuestion("Would you like to add your project to GIT? (no/yes) ", false);
146 140
         $versioning     = $helper->ask($input, $output, $versionControl);
147 141
         if ($versioning) {
@@ -155,8 +149,7 @@  discard block
 block discarded – undo
155 149
      * @param InputInterface $input
156 150
      * @param OutputInterface $output
157 151
      */
158
-    protected function askForAuth($helper, InputInterface $input, OutputInterface $output)
159
-    {
152
+    protected function askForAuth($helper, InputInterface $input, OutputInterface $output) {
160 153
         $username          = new Question("Please enter your Magento username (public key): ", '');
161 154
         $this->_m2Username = $helper->ask($input, $output, $username);
162 155
 
@@ -170,8 +163,7 @@  discard block
 block discarded – undo
170 163
      * @param OutputInterface $output
171 164
      * @return boolean|integer
172 165
      */
173
-    protected function verifyAuth($helper, InputInterface $input, OutputInterface $output)
174
-    {
166
+    protected function verifyAuth($helper, InputInterface $input, OutputInterface $output) {
175 167
         $authFile = $_SERVER['HOME'] . "/.composer/auth.json";
176 168
 
177 169
         $authObj = [];
@@ -198,8 +190,7 @@  discard block
 block discarded – undo
198 190
      * @param InputInterface $input
199 191
      * @param OutputInterface $output
200 192
      */
201
-    protected function setPhp($helper, InputInterface $input, OutputInterface $output)
202
-    {
193
+    protected function setPhp($helper, InputInterface $input, OutputInterface $output) {
203 194
         $output->writeln('<info>Keep in mind PHP7 is only available for Magento 2</info>');
204 195
         $phpVerQuestion = new ChoiceQuestion(
205 196
             "Which version of PHP should be installed?",
@@ -213,8 +204,7 @@  discard block
 block discarded – undo
213 204
     /**
214 205
      * Set box name from concat user options
215 206
      */
216
-    protected function setVagrantBox()
217
-    {
207
+    protected function setVagrantBox() {
218 208
         $this->_box = self::BOX_PREFIX . $this->_os . "-$this->_server-php$this->_phpVer";
219 209
     }
220 210
 
@@ -223,8 +213,7 @@  discard block
 block discarded – undo
223 213
      * @param InputInterface $input
224 214
      * @param OutputInterface $output
225 215
      */
226
-    protected function setServerConfig($helper, InputInterface $input, OutputInterface $output)
227
-    {
216
+    protected function setServerConfig($helper, InputInterface $input, OutputInterface $output) {
228 217
         $output->writeln('<comment>Lets configure your server</comment>');
229 218
         $this->setOperatingSystem($helper, $input, $output);
230 219
         $this->setWebServer($helper, $input, $output);
@@ -236,8 +225,7 @@  discard block
 block discarded – undo
236 225
      * @param InputInterface $input
237 226
      * @param OutputInterface $output
238 227
      */
239
-    protected function setWebServer($helper, InputInterface $input, OutputInterface $output)
240
-    {
228
+    protected function setWebServer($helper, InputInterface $input, OutputInterface $output) {
241 229
         $serverQuestion = new ChoiceQuestion(
242 230
             "Which webserver would you like?",
243 231
             ['NGINX', 'Apache'],
@@ -252,8 +240,7 @@  discard block
 block discarded – undo
252 240
      * @param InputInterface $input
253 241
      * @param OutputInterface $output
254 242
      */
255
-    protected function setOperatingSystem($helper, InputInterface $input, OutputInterface $output)
256
-    {
243
+    protected function setOperatingSystem($helper, InputInterface $input, OutputInterface $output) {
257 244
         $osQuestion = new ChoiceQuestion(
258 245
             "Which OS would you like to install?",
259 246
             ['CentOS 6.5', 'Ubuntu 14'],
Please login to merge, or discard this patch.
src/Magestead/Command/NewCommand.php 1 patch
Braces   +8 added lines, -16 removed lines patch added patch discarded remove patch
@@ -22,8 +22,7 @@  discard block
 block discarded – undo
22 22
     protected $_projectPath;
23 23
     protected $_msConfig;
24 24
 
25
-    protected function configure()
26
-    {
25
+    protected function configure() {
27 26
         $this->_basePath    = dirname( __FILE__ ) . '/../../../';
28 27
         $this->_projectPath = getcwd();
29 28
 
@@ -39,8 +38,7 @@  discard block
 block discarded – undo
39 38
      * @return \Magestead\Installers\Magento2Project|\Magestead\Installers\MagentoProject
40 39
      * @throws ExistingProjectException
41 40
      */
42
-    protected function execute(InputInterface $input, OutputInterface $output)
43
-    {
41
+    protected function execute(InputInterface $input, OutputInterface $output) {
44 42
         $project = $this->setProject($input);
45 43
 
46 44
         $helper  = $this->getHelper('question');
@@ -59,8 +57,7 @@  discard block
 block discarded – undo
59 57
      * @param $target
60 58
      * @param OutputInterface $output
61 59
      */
62
-    protected function copyConfigFiles($source, $target, OutputInterface $output)
63
-    {
60
+    protected function copyConfigFiles($source, $target, OutputInterface $output) {
64 61
         try {
65 62
             $progress = new ProgressBar($output, 3720);
66 63
             $progress->start();
@@ -87,8 +84,7 @@  discard block
 block discarded – undo
87 84
      * @param array $options
88 85
      * @param OutputInterface $output
89 86
      */
90
-    protected function configureProject(array $options, OutputInterface $output)
91
-    {
87
+    protected function configureProject(array $options, OutputInterface $output) {
92 88
         $msConfig = $this->getConfigFile($output);
93 89
 
94 90
         $app = ($options['app'] == 'magento2') ? 'magento2' : 'magento';
@@ -116,8 +112,7 @@  discard block
 block discarded – undo
116 112
      * @param OutputInterface $output
117 113
      * @return mixed
118 114
      */
119
-    protected function getConfigFile(OutputInterface $output)
120
-    {
115
+    protected function getConfigFile(OutputInterface $output) {
121 116
         $yaml = new Parser();
122 117
         try {
123 118
             return $yaml->parse(file_get_contents($this->_projectPath . '/magestead.yaml'));
@@ -131,8 +126,7 @@  discard block
 block discarded – undo
131 126
      * @param array $config
132 127
      * @param OutputInterface $output
133 128
      */
134
-    protected function saveConfigFile(array $config, OutputInterface $output)
135
-    {
129
+    protected function saveConfigFile(array $config, OutputInterface $output) {
136 130
         $dumper = new Dumper();
137 131
         $yaml   = $dumper->dump($config, 6);
138 132
 
@@ -147,8 +141,7 @@  discard block
 block discarded – undo
147 141
      * @param OutputInterface $output
148 142
      * @param $options
149 143
      */
150
-    protected function setupProject(OutputInterface $output, $options)
151
-    {
144
+    protected function setupProject(OutputInterface $output, $options) {
152 145
         $output->writeln('<info>Setting up project structure</info>');
153 146
         $provisionFolder = $this->_basePath . "provision";
154 147
         $this->copyConfigFiles($provisionFolder, $this->_projectPath, $output);
@@ -160,8 +153,7 @@  discard block
 block discarded – undo
160 153
      * @return mixed
161 154
      * @throws ExistingProjectException
162 155
      */
163
-    protected function setProject(InputInterface $input)
164
-    {
156
+    protected function setProject(InputInterface $input) {
165 157
         $project = $input->getArgument('project');
166 158
         $this->_projectPath = $this->_projectPath . '/' . $project;
167 159
 
Please login to merge, or discard this patch.
src/Magestead/Service/UsageApi.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -21,8 +21,7 @@  discard block
 block discarded – undo
21 21
      * UsageApi constructor.
22 22
      * @param $data
23 23
      */
24
-    public function __construct($data)
25
-    {
24
+    public function __construct($data) {
26 25
         $this->_params['os_type']               = urlencode($data['os']);
27 26
         $this->_params['server_type']           = urlencode($data['server']);
28 27
         $this->_params['php_version']           = urlencode($data['phpver']);
@@ -38,8 +37,7 @@  discard block
 block discarded – undo
38 37
     /**
39 38
      *
40 39
      */
41
-    public function send()
42
-    {
40
+    public function send() {
43 41
         $fields_string = $this->getFieldsString();
44 42
 
45 43
         $ch = curl_init();
@@ -58,8 +56,7 @@  discard block
 block discarded – undo
58 56
     /**
59 57
      * @return string
60 58
      */
61
-    protected function getFieldsString()
62
-    {
59
+    protected function getFieldsString() {
63 60
         $fields_string = '';
64 61
         foreach ($this->_params as $key => $value) {
65 62
             $fields_string .= $key . '=' . $value . '&';
Please login to merge, or discard this patch.
src/Magestead/Command/Log/ViewCommand.php 1 patch
Braces   +4 added lines, -8 removed lines patch added patch discarded remove patch
@@ -19,8 +19,7 @@  discard block
 block discarded – undo
19 19
     /**
20 20
      * Configure the view command
21 21
      */
22
-    protected function configure()
23
-    {
22
+    protected function configure() {
24 23
         $this->_projectPath = getcwd();
25 24
         $this->setName("log:view");
26 25
         $this->setDescription("View a specific server log");
@@ -32,8 +31,7 @@  discard block
 block discarded – undo
32 31
      * @param OutputInterface $output
33 32
      * @return ProcessCommand
34 33
      */
35
-    protected function execute(InputInterface $input, OutputInterface $output)
36
-    {
34
+    protected function execute(InputInterface $input, OutputInterface $output) {
37 35
         $log = $input->getArgument('log');
38 36
 
39 37
         $output->writeln('<info>Viewing '. ucwords($log) . ' Log</info>');
@@ -51,8 +49,7 @@  discard block
 block discarded – undo
51 49
      * @param $log
52 50
      * @return string
53 51
      */
54
-    private function getCommand(Config $config, $log)
55
-    {
52
+    private function getCommand(Config $config, $log) {
56 53
         $server = $config->_config['magestead']['server'];
57 54
         $os = $config->_config['magestead']['os'];
58 55
 
@@ -67,8 +64,7 @@  discard block
 block discarded – undo
67 64
      * @param $os
68 65
      * @return string
69 66
      */
70
-    private function getLogLocation($server, $os)
71
-    {
67
+    private function getLogLocation($server, $os) {
72 68
         $location = 'nginx';
73 69
         if ($server != 'nginx') {
74 70
             $location = ($os == 'ubuntu14') ? 'apache2' : 'httpd';
Please login to merge, or discard this patch.
src/Magestead/Command/Log/StreamCommand.php 1 patch
Braces   +4 added lines, -8 removed lines patch added patch discarded remove patch
@@ -19,8 +19,7 @@  discard block
 block discarded – undo
19 19
     /**
20 20
      * Configure the view command
21 21
      */
22
-    protected function configure()
23
-    {
22
+    protected function configure() {
24 23
         $this->_projectPath = getcwd();
25 24
         $this->setName("log:view");
26 25
         $this->setDescription("View a specific server log");
@@ -32,8 +31,7 @@  discard block
 block discarded – undo
32 31
      * @param OutputInterface $output
33 32
      * @return ProcessCommand
34 33
      */
35
-    protected function execute(InputInterface $input, OutputInterface $output)
36
-    {
34
+    protected function execute(InputInterface $input, OutputInterface $output) {
37 35
         $log = $input->getArgument('log');
38 36
 
39 37
         $output->writeln('<info>Viewing '. ucwords($log) . ' Log</info>');
@@ -51,8 +49,7 @@  discard block
 block discarded – undo
51 49
      * @param $log
52 50
      * @return string
53 51
      */
54
-    private function getCommand(Config $config, $log)
55
-    {
52
+    private function getCommand(Config $config, $log) {
56 53
         $server = $config->_config['magestead']['server'];
57 54
         $os = $config->_config['magestead']['os'];
58 55
 
@@ -67,8 +64,7 @@  discard block
 block discarded – undo
67 64
      * @param $os
68 65
      * @return string
69 66
      */
70
-    private function getLogLocation($server, $os)
71
-    {
67
+    private function getLogLocation($server, $os) {
72 68
         $location = 'nginx';
73 69
         if ($server != 'nginx') {
74 70
             $location = ($os == 'ubuntu14') ? 'apache2' : 'httpd';
Please login to merge, or discard this patch.