richdynamix / magestead

src/Magestead/Service/UsageApi.php

Spacing +20 added lines, -20 removed lines

@@ -9,13 +9,13 @@ 
     /**
      * @var string
      */
-    protected $_apiUrl = "http://api.magestead.com/v1/usage";
+    protected $_apiUrl="http://api.magestead.com/v1/usage";
 //    protected $_apiUrl = "http://magestead-api.app/v1/usage";
 
     /**
      * @var array
      */
-    protected $_params = [];
+    protected $_params=[];
 
     /**
      * UsageApi constructor.
@@ -23,16 +23,16 @@ 
      */
     public function __construct($data)
     {
-        $this->_params['os_type']               = urlencode($data['os']);
-        $this->_params['server_type']           = urlencode($data['server']);
-        $this->_params['php_version']           = urlencode($data['phpver']);
-        $this->_params['application_version']   = urlencode($data['app']);
-        $this->_params['vm_memory_limit']       = urlencode($data['memory_limit']);
-        $this->_params['vm_cpu_count']          = urlencode($data['cpus']);
-        $this->_params['ip_address']            = urlencode($data['ip_address']);
-        $this->_params['box']                   = urlencode($data['box']);
-        $this->_params['locale']                = urlencode($data['locale']);
-        $this->_params['default_currency']      = urlencode($data['default_currency']);
+        $this->_params['os_type']=urlencode($data['os']);
+        $this->_params['server_type']=urlencode($data['server']);
+        $this->_params['php_version']=urlencode($data['phpver']);
+        $this->_params['application_version']=urlencode($data['app']);
+        $this->_params['vm_memory_limit']=urlencode($data['memory_limit']);
+        $this->_params['vm_cpu_count']=urlencode($data['cpus']);
+        $this->_params['ip_address']=urlencode($data['ip_address']);
+        $this->_params['box']=urlencode($data['box']);
+        $this->_params['locale']=urlencode($data['locale']);
+        $this->_params['default_currency']=urlencode($data['default_currency']);
     }
 
     /**
@@ -40,16 +40,16 @@ 
      */
     public function send()
     {
-        $fields_string = $this->getFieldsString();
+        $fields_string=$this->getFieldsString();
 
-        $ch = curl_init();
+        $ch=curl_init();
 
-        curl_setopt($ch,CURLOPT_URL, $this->_apiUrl);
-        curl_setopt($ch,CURLOPT_POST, count($this->_params));
-        curl_setopt($ch,CURLOPT_POSTFIELDS, $fields_string);
+        curl_setopt($ch, CURLOPT_URL, $this->_apiUrl);
+        curl_setopt($ch, CURLOPT_POST, count($this->_params));
+        curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
 
-        $result = curl_exec($ch);
+        $result=curl_exec($ch);
 
         curl_close($ch);
 
@@ -60,9 +60,9 @@ 
      */
     protected function getFieldsString()
     {
-        $fields_string = '';
+        $fields_string='';
         foreach ($this->_params as $key => $value) {
-            $fields_string .= $key . '=' . $value . '&';
+            $fields_string.=$key.'='.$value.'&';
         }
         rtrim($fields_string, '&');
         return $fields_string;

Braces +3 added lines, -6 removed lines

@@ -21,8 +21,7 @@ 
      * UsageApi constructor.
      * @param $data
      */
-    public function __construct($data)
-    {
+    public function __construct($data) {
         $this->_params['os_type']               = urlencode($data['os']);
         $this->_params['server_type']           = urlencode($data['server']);
         $this->_params['php_version']           = urlencode($data['phpver']);
@@ -38,8 +37,7 @@ 
     /**
      *
      */
-    public function send()
-    {
+    public function send() {
         $fields_string = $this->getFieldsString();
 
         $ch = curl_init();
@@ -58,8 +56,7 @@ 
     /**
      * @return string
      */
-    protected function getFieldsString()
-    {
+    protected function getFieldsString() {
         $fields_string = '';
         foreach ($this->_params as $key => $value) {
             $fields_string .= $key . '=' . $value . '&';

src/Magestead/Helper/Options.php

Spacing +41 added lines, -41 removed lines

@@ -12,11 +12,11 @@ 
  */
 class Options
 {
-    const BOX_PREFIX = 'richdynamix/magestead-';
+    const BOX_PREFIX='richdynamix/magestead-';
 
-    protected $_app = 'magento2';
-    protected $_phpVer = '56';
-    protected $_os = 'centos65';
+    protected $_app='magento2';
+    protected $_phpVer='56';
+    protected $_os='centos65';
     protected $_server;
     protected $_box;
     protected $_m2Username;
@@ -27,7 +27,7 @@ 
     protected $_locale;
     protected $_currency;
     protected $_baseUrl;
-    protected $_repoUrl = '';
+    protected $_repoUrl='';
 
     /**
      * Options constructor.
@@ -81,14 +81,14 @@ 
     {
         $output->writeln('<comment>Lets configure your project\'s VM</comment>');
 
-        $ipQuestion       = new Question("Configure the IP for your VM (192.168.47.47): ", '192.168.47.47');
-        $this->_ipAddress = strtolower($helper->ask($input, $output, $ipQuestion));
+        $ipQuestion=new Question("Configure the IP for your VM (192.168.47.47): ", '192.168.47.47');
+        $this->_ipAddress=strtolower($helper->ask($input, $output, $ipQuestion));
 
-        $cpuQuestion = new Question("How many CPU's would you like to use? (1): ", '1');
-        $this->_cpus = strtolower($helper->ask($input, $output, $cpuQuestion));
+        $cpuQuestion=new Question("How many CPU's would you like to use? (1): ", '1');
+        $this->_cpus=strtolower($helper->ask($input, $output, $cpuQuestion));
 
-        $memoryQuestion     = new Question("Define the VM memory limit (2048): ", '2048');
-        $this->_memorylimit = strtolower($helper->ask($input, $output, $memoryQuestion));
+        $memoryQuestion=new Question("Define the VM memory limit (2048): ", '2048');
+        $this->_memorylimit=strtolower($helper->ask($input, $output, $memoryQuestion));
     }
 
     /**
@@ -100,22 +100,22 @@ 
     protected function setApplicationSettings($helper, InputInterface $input, OutputInterface $output, $project)
     {
         $output->writeln('<comment>Lets configure your project\'s application</comment>');
-        $appQuestion = new ChoiceQuestion(
+        $appQuestion=new ChoiceQuestion(
             "Which application do you want to install?",
             ['Magento', 'Magento2'],
             0
         );
 
-        $this->_app = strtolower($helper->ask($input, $output, $appQuestion));
+        $this->_app=strtolower($helper->ask($input, $output, $appQuestion));
 
-        $baseUrlQuestion = new Question("Enter your application's base_url ($project.dev): ", $project.'.dev');
-        $this->_baseUrl  = strtolower($helper->ask($input, $output, $baseUrlQuestion));
+        $baseUrlQuestion=new Question("Enter your application's base_url ($project.dev): ", $project.'.dev');
+        $this->_baseUrl=strtolower($helper->ask($input, $output, $baseUrlQuestion));
 
-        $currenyQuestion = new Question("Enter your application's default currency (GBP): ", 'GBP');
-        $this->_currency = $helper->ask($input, $output, $currenyQuestion);
+        $currenyQuestion=new Question("Enter your application's default currency (GBP): ", 'GBP');
+        $this->_currency=$helper->ask($input, $output, $currenyQuestion);
 
-        $localeQuestion = new Question("Enter your application's default locale (en_GB): ", 'en_GB');
-        $this->_locale  = $helper->ask($input, $output, $localeQuestion);
+        $localeQuestion=new Question("Enter your application's default locale (en_GB): ", 'en_GB');
+        $this->_locale=$helper->ask($input, $output, $localeQuestion);
     }
 
     /**
@@ -140,11 +140,11 @@ 
      */
     protected function setVersionControlSettings($helper, InputInterface $input, OutputInterface $output)
     {
-        $versionControl = new ConfirmationQuestion("Would you like to add your project to GIT? (no/yes) ", false);
-        $versioning     = $helper->ask($input, $output, $versionControl);
+        $versionControl=new ConfirmationQuestion("Would you like to add your project to GIT? (no/yes) ", false);
+        $versioning=$helper->ask($input, $output, $versionControl);
         if ($versioning) {
-            $repoQuestion   = new Question("Enter your full GitHub/BitBucket repo URL: ", '');
-            $this->_repoUrl = strtolower($helper->ask($input, $output, $repoQuestion));
+            $repoQuestion=new Question("Enter your full GitHub/BitBucket repo URL: ", '');
+            $this->_repoUrl=strtolower($helper->ask($input, $output, $repoQuestion));
         }
     }
 
@@ -155,11 +155,11 @@ 
      */
     protected function askForAuth($helper, InputInterface $input, OutputInterface $output)
     {
-        $username          = new Question("Please enter your Magento username (public key): ", '');
-        $this->_m2Username = $helper->ask($input, $output, $username);
+        $username=new Question("Please enter your Magento username (public key): ", '');
+        $this->_m2Username=$helper->ask($input, $output, $username);
 
-        $password          = new Question("Please enter your Magento password (private key): ", '');
-        $this->_m2Password = $helper->ask($input, $output, $password);
+        $password=new Question("Please enter your Magento password (private key): ", '');
+        $this->_m2Password=$helper->ask($input, $output, $password);
     }
 
     /**
@@ -170,12 +170,12 @@ 
      */
     protected function verifyAuth($helper, InputInterface $input, OutputInterface $output)
     {
-        $authFile = $_SERVER['HOME'] . "/.composer/auth.json";
+        $authFile=$_SERVER['HOME']."/.composer/auth.json";
 
-        $authObj = [];
+        $authObj=[];
         if (file_exists($authFile)) {
-            $authJson = file_get_contents($authFile);
-            $authObj  = (array)json_decode($authJson);
+            $authJson=file_get_contents($authFile);
+            $authObj=(array) json_decode($authJson);
 
             if (isset($authObj['http-basic']) && isset($authObj['http-basic']->{'repo.magento.com'})) {
                 return true;
@@ -184,10 +184,10 @@ 
 
         $this->askForAuth($helper, $input, $output);
 
-        $authObj['http-basic']['repo.magento.com']['username'] = $this->_m2Username;
-        $authObj['http-basic']['repo.magento.com']['password'] = $this->_m2Password;
+        $authObj['http-basic']['repo.magento.com']['username']=$this->_m2Username;
+        $authObj['http-basic']['repo.magento.com']['password']=$this->_m2Password;
 
-        $authJson = json_encode($authObj);
+        $authJson=json_encode($authObj);
         return file_put_contents($authFile, $authJson);
     }
 
@@ -199,13 +199,13 @@ 
     protected function setPhp($helper, InputInterface $input, OutputInterface $output)
     {
         $output->writeln('<info>Keep in mind PHP7 is only available for Magento 2</info>');
-        $phpVerQuestion = new ChoiceQuestion(
+        $phpVerQuestion=new ChoiceQuestion(
             "Which version of PHP should be installed?",
             ['56', '70'],
             0
         );
 
-        $this->_phpVer = $helper->ask($input, $output, $phpVerQuestion);
+        $this->_phpVer=$helper->ask($input, $output, $phpVerQuestion);
     }
 
     /**
@@ -213,7 +213,7 @@ 
      */
     protected function setVagrantBox()
     {
-        $this->_box = self::BOX_PREFIX . $this->_os . "-$this->_server-php$this->_phpVer";
+        $this->_box=self::BOX_PREFIX.$this->_os."-$this->_server-php$this->_phpVer";
     }
 
     /**
@@ -236,13 +236,13 @@ 
      */
     protected function setWebServer($helper, InputInterface $input, OutputInterface $output)
     {
-        $serverQuestion = new ChoiceQuestion(
+        $serverQuestion=new ChoiceQuestion(
             "Which webserver would you like?",
             ['NGINX', 'Apache'],
             0
         );
 
-        $this->_server = strtolower($helper->ask($input, $output, $serverQuestion));
+        $this->_server=strtolower($helper->ask($input, $output, $serverQuestion));
     }
 
     /**
@@ -252,12 +252,12 @@ 
      */
     protected function setOperatingSystem($helper, InputInterface $input, OutputInterface $output)
     {
-        $osQuestion = new ChoiceQuestion(
+        $osQuestion=new ChoiceQuestion(
             "Which OS would you like to install?",
             ['CentOS 6.5', 'Ubuntu 14'],
             0
         );
 
-        $this->_os = str_replace(' ', '', str_replace('.', '', strtolower($helper->ask($input, $output, $osQuestion))));
+        $this->_os=str_replace(' ', '', str_replace('.', '', strtolower($helper->ask($input, $output, $osQuestion))));
     }
 }
\ No newline at end of file

src/Magestead/Command/Log/StreamCommand.php

Spacing +11 added lines, -11 removed lines

@@ -21,7 +21,7 @@ 
      */
     protected function configure()
     {
-        $this->_projectPath = getcwd();
+        $this->_projectPath=getcwd();
         $this->setName("log:stream");
         $this->setDescription("Stream a specific server log");
         $this->addArgument('log', InputArgument::REQUIRED, 'access or error');
@@ -34,15 +34,15 @@ 
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $log = $input->getArgument('log');
+        $log=$input->getArgument('log');
 
-        $output->writeln('<info>Streaming '. ucwords($log) . ' Log</info>');
-        $command = $this->getCommand(new Config($output), $log);
+        $output->writeln('<info>Streaming '.ucwords($log).' Log</info>');
+        $command=$this->getCommand(new Config($output), $log);
         if (!$command) {
             return $output->writeln('<error>Command not available for this application</error>');
         }
 
-        $pCommand = "vagrant ssh -c '". $command ."'";
+        $pCommand="vagrant ssh -c '".$command."'";
         return new ProcessCommand($pCommand, $this->_projectPath, $output);
     }
 
@@ -53,11 +53,11 @@ 
      */
     private function getCommand(Config $config, $log)
     {
-        $server = $config->_config['magestead']['server'];
-        $os = $config->_config['magestead']['os'];
+        $server=$config->_config['magestead']['server'];
+        $os=$config->_config['magestead']['os'];
 
-        $location = $this->getLogLocation($server, $os);
-        $command = 'tail -f /var/log/' . $location . '/' . $config->base_url . '-' . $log . '.log';
+        $location=$this->getLogLocation($server, $os);
+        $command='tail -f /var/log/'.$location.'/'.$config->base_url.'-'.$log.'.log';
 
         return $command;
     }
@@ -69,9 +69,9 @@ 
      */
     private function getLogLocation($server, $os)
     {
-        $location = 'nginx';
+        $location='nginx';
         if ($server != 'nginx') {
-            $location = ($os == 'ubuntu14') ? 'apache2' : 'httpd';
+            $location=($os == 'ubuntu14') ? 'apache2' : 'httpd';
         }
 
         return $location;

Braces +4 added lines, -8 removed lines

@@ -19,8 +19,7 @@ 
     /**
      * Configure the view command
      */
-    protected function configure()
-    {
+    protected function configure() {
         $this->_projectPath = getcwd();
         $this->setName("log:view");
         $this->setDescription("View a specific server log");
@@ -32,8 +31,7 @@ 
      * @param OutputInterface $output
      * @return ProcessCommand
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
-    {
+    protected function execute(InputInterface $input, OutputInterface $output) {
         $log = $input->getArgument('log');
 
         $output->writeln('<info>Viewing '. ucwords($log) . ' Log</info>');
@@ -51,8 +49,7 @@ 
      * @param $log
      * @return string
      */
-    private function getCommand(Config $config, $log)
-    {
+    private function getCommand(Config $config, $log) {
         $server = $config->_config['magestead']['server'];
         $os = $config->_config['magestead']['os'];
 
@@ -67,8 +64,7 @@ 
      * @param $os
      * @return string
      */
-    private function getLogLocation($server, $os)
-    {
+    private function getLogLocation($server, $os) {
         $location = 'nginx';
         if ($server != 'nginx') {
             $location = ($os == 'ubuntu14') ? 'apache2' : 'httpd';

src/Magestead/Command/Log/ViewCommand.php

Spacing +11 added lines, -11 removed lines

@@ -21,7 +21,7 @@ 
      */
     protected function configure()
     {
-        $this->_projectPath = getcwd();
+        $this->_projectPath=getcwd();
         $this->setName("log:view");
         $this->setDescription("View a specific server log");
         $this->addArgument('log', InputArgument::REQUIRED, 'access or error');
@@ -34,15 +34,15 @@ 
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $log = $input->getArgument('log');
+        $log=$input->getArgument('log');
 
-        $output->writeln('<info>Viewing '. ucwords($log) . ' Log</info>');
-        $command = $this->getCommand(new Config($output), $log);
+        $output->writeln('<info>Viewing '.ucwords($log).' Log</info>');
+        $command=$this->getCommand(new Config($output), $log);
         if (!$command) {
             return $output->writeln('<error>Command not available for this application</error>');
         }
 
-        $pCommand = "vagrant ssh -c '". $command ."'";
+        $pCommand="vagrant ssh -c '".$command."'";
         return new ProcessCommand($pCommand, $this->_projectPath, $output);
     }
 
@@ -53,11 +53,11 @@ 
      */
     private function getCommand(Config $config, $log)
     {
-        $server = $config->_config['magestead']['server'];
-        $os = $config->_config['magestead']['os'];
+        $server=$config->_config['magestead']['server'];
+        $os=$config->_config['magestead']['os'];
 
-        $location = $this->getLogLocation($server, $os);
-        $command = 'cat /var/log/' . $location . '/' . $config->base_url . '-' . $log . '.log';
+        $location=$this->getLogLocation($server, $os);
+        $command='cat /var/log/'.$location.'/'.$config->base_url.'-'.$log.'.log';
 
         return $command;
     }
@@ -69,9 +69,9 @@ 
      */
     private function getLogLocation($server, $os)
     {
-        $location = 'nginx';
+        $location='nginx';
         if ($server != 'nginx') {
-            $location = ($os == 'ubuntu14') ? 'apache2' : 'httpd';
+            $location=($os == 'ubuntu14') ? 'apache2' : 'httpd';
         }
 
         return $location;

Braces +4 added lines, -8 removed lines

@@ -19,8 +19,7 @@ 
     /**
      * Configure the view command
      */
-    protected function configure()
-    {
+    protected function configure() {
         $this->_projectPath = getcwd();
         $this->setName("log:view");
         $this->setDescription("View a specific server log");
@@ -32,8 +31,7 @@ 
      * @param OutputInterface $output
      * @return ProcessCommand
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
-    {
+    protected function execute(InputInterface $input, OutputInterface $output) {
         $log = $input->getArgument('log');
 
         $output->writeln('<info>Viewing '. ucwords($log) . ' Log</info>');
@@ -51,8 +49,7 @@ 
      * @param $log
      * @return string
      */
-    private function getCommand(Config $config, $log)
-    {
+    private function getCommand(Config $config, $log) {
         $server = $config->_config['magestead']['server'];
         $os = $config->_config['magestead']['os'];
 
@@ -67,8 +64,7 @@ 
      * @param $os
      * @return string
      */
-    private function getLogLocation($server, $os)
-    {
+    private function getLogLocation($server, $os) {
         $location = 'nginx';
         if ($server != 'nginx') {
             $location = ($os == 'ubuntu14') ? 'apache2' : 'httpd';