richdynamix / magestead

src/Magestead/Command/NewCommand.php

Braces +8 added lines, -16 removed lines

@@ -22,8 +22,7 @@ 
     protected $_projectPath;
     protected $_msConfig;
 
-    protected function configure()
-    {
+    protected function configure() {
         $this->_basePath    = dirname( __FILE__ ) . '/../../../';
         $this->_projectPath = getcwd();
 
@@ -39,8 +38,7 @@ 
      * @return \Magestead\Installers\Magento2Project|\Magestead\Installers\MagentoProject
      * @throws ExistingProjectException
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
-    {
+    protected function execute(InputInterface $input, OutputInterface $output) {
         $project = $this->setProject($input);
 
         $helper  = $this->getHelper('question');
@@ -59,8 +57,7 @@ 
      * @param $target
      * @param OutputInterface $output
      */
-    protected function copyConfigFiles($source, $target, OutputInterface $output)
-    {
+    protected function copyConfigFiles($source, $target, OutputInterface $output) {
         try {
             $progress = new ProgressBar($output, 3720);
             $progress->start();
@@ -87,8 +84,7 @@ 
      * @param array $options
      * @param OutputInterface $output
      */
-    protected function configureProject(array $options, OutputInterface $output)
-    {
+    protected function configureProject(array $options, OutputInterface $output) {
         $msConfig = $this->getConfigFile($output);
 
         $app = ($options['app'] == 'magento2') ? 'magento2' : 'magento';
@@ -116,8 +112,7 @@ 
      * @param OutputInterface $output
      * @return mixed
      */
-    protected function getConfigFile(OutputInterface $output)
-    {
+    protected function getConfigFile(OutputInterface $output) {
         $yaml = new Parser();
         try {
             return $yaml->parse(file_get_contents($this->_projectPath . '/magestead.yaml'));
@@ -131,8 +126,7 @@ 
      * @param array $config
      * @param OutputInterface $output
      */
-    protected function saveConfigFile(array $config, OutputInterface $output)
-    {
+    protected function saveConfigFile(array $config, OutputInterface $output) {
         $dumper = new Dumper();
         $yaml   = $dumper->dump($config, 6);
 
@@ -147,8 +141,7 @@ 
      * @param OutputInterface $output
      * @param $options
      */
-    protected function setupProject(OutputInterface $output, $options)
-    {
+    protected function setupProject(OutputInterface $output, $options) {
         $output->writeln('<info>Setting up project structure</info>');
         $provisionFolder = $this->_basePath . "provision";
         $this->copyConfigFiles($provisionFolder, $this->_projectPath, $output);
@@ -160,8 +153,7 @@ 
      * @return mixed
      * @throws ExistingProjectException
      */
-    protected function setProject(InputInterface $input)
-    {
+    protected function setProject(InputInterface $input) {
         $project = $input->getArgument('project');
         $this->_projectPath = $this->_projectPath . '/' . $project;
 

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -170,7 +170,7 @@
             throw new ExistingProjectException('Target project directory already exists');
         }
 
-        mkdir($this->_projectPath, 0777, true);
+        mkdir($this->_projectPath, 0777, TRUE);
         return $project;
     }
 }

Spacing +28 added lines, -28 removed lines

@@ -26,8 +26,8 @@ 
 
     protected function configure()
     {
-        $this->_basePath = dirname(__FILE__).'/../../../';
-        $this->_projectPath = getcwd();
+        $this->_basePath=dirname(__FILE__).'/../../../';
+        $this->_projectPath=getcwd();
 
         $this->setName('new');
         $this->setDescription('Initialise new Magestead project into current working directory');
@@ -44,10 +44,10 @@ 
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $project = $this->setProject($input);
+        $project=$this->setProject($input);
 
-        $helper = $this->getHelper('question');
-        $options = new Options($helper, $input, $output, $project);
+        $helper=$this->getHelper('question');
+        $options=new Options($helper, $input, $output, $project);
 
         $this->setupProject($output, $options);
 
@@ -65,10 +65,10 @@ 
     protected function copyConfigFiles($source, $target, OutputInterface $output)
     {
         try {
-            $progress = new ProgressBar($output, 3720);
+            $progress=new ProgressBar($output, 3720);
             $progress->start();
             foreach (
-                $iterator = new \RecursiveIteratorIterator(
+                $iterator=new \RecursiveIteratorIterator(
                     new \RecursiveDirectoryIterator($source, \RecursiveDirectoryIterator::SKIP_DOTS),
                     \RecursiveIteratorIterator::SELF_FIRST) as $item
             ) {
@@ -92,24 +92,24 @@ 
      */
     protected function configureProject(array $options, OutputInterface $output)
     {
-        $msConfig = $this->getConfigFile($output);
+        $msConfig=$this->getConfigFile($output);
 
-        $app = ($options['app'] == 'magento2') ? 'magento2' : 'magento';
-        $hostname = 'magestead-'.$options['base_url'];
+        $app=($options['app'] == 'magento2') ? 'magento2' : 'magento';
+        $hostname='magestead-'.$options['base_url'];
 
-        $msConfig['vagrantfile']['vm']['box'] = $options['box'];
-        $msConfig['vagrantfile']['vm']['box_url'] = $options['box'];
-        $msConfig['vagrantfile']['vm']['hostname'] = $hostname;
-        $msConfig['vagrantfile']['vm']['memory'] = $options['memory_limit'];
-        $msConfig['vagrantfile']['vm']['network']['private_network'] = $options['ip_address'];
-        $msConfig['magestead']['apps']['mba_12345']['type'] = $app;
-        $msConfig['magestead']['apps']['mba_12345']['locale'] = $options['locale'];
-        $msConfig['magestead']['apps']['mba_12345']['default_currency'] = $options['default_currency'];
-        $msConfig['magestead']['apps']['mba_12345']['base_url'] = $options['base_url'];
-        $msConfig['magestead']['os'] = $options['os'];
-        $msConfig['magestead']['server'] = $options['server'];
+        $msConfig['vagrantfile']['vm']['box']=$options['box'];
+        $msConfig['vagrantfile']['vm']['box_url']=$options['box'];
+        $msConfig['vagrantfile']['vm']['hostname']=$hostname;
+        $msConfig['vagrantfile']['vm']['memory']=$options['memory_limit'];
+        $msConfig['vagrantfile']['vm']['network']['private_network']=$options['ip_address'];
+        $msConfig['magestead']['apps']['mba_12345']['type']=$app;
+        $msConfig['magestead']['apps']['mba_12345']['locale']=$options['locale'];
+        $msConfig['magestead']['apps']['mba_12345']['default_currency']=$options['default_currency'];
+        $msConfig['magestead']['apps']['mba_12345']['base_url']=$options['base_url'];
+        $msConfig['magestead']['os']=$options['os'];
+        $msConfig['magestead']['server']=$options['server'];
 
-        $this->_msConfig = $msConfig;
+        $this->_msConfig=$msConfig;
 
         $this->saveConfigFile($msConfig, $output);
     }
@@ -121,7 +121,7 @@ 
      */
     protected function getConfigFile(OutputInterface $output)
     {
-        $yaml = new Parser();
+        $yaml=new Parser();
         try {
             return $yaml->parse(file_get_contents($this->_projectPath.'/magestead.yaml'));
         } catch (ParseException $e) {
@@ -136,8 +136,8 @@ 
      */
     protected function saveConfigFile(array $config, OutputInterface $output)
     {
-        $dumper = new Dumper();
-        $yaml = $dumper->dump($config, 6);
+        $dumper=new Dumper();
+        $yaml=$dumper->dump($config, 6);
 
         try {
             file_put_contents($this->_projectPath.'/magestead.yaml', $yaml);
@@ -153,7 +153,7 @@ 
     protected function setupProject(OutputInterface $output, $options)
     {
         $output->writeln('<info>Setting up project structure</info>');
-        $provisionFolder = $this->_basePath.'provision';
+        $provisionFolder=$this->_basePath.'provision';
         $this->copyConfigFiles($provisionFolder, $this->_projectPath, $output);
         $this->configureProject($options->getAllOptions(), $output);
 
@@ -169,8 +169,8 @@ 
      */
     protected function setProject(InputInterface $input)
     {
-        $project = $input->getArgument('project');
-        $this->_projectPath = $this->_projectPath.'/'.$project;
+        $project=$input->getArgument('project');
+        $this->_projectPath=$this->_projectPath.'/'.$project;
 
         if (is_dir($this->_projectPath)) {
             throw new ExistingProjectException('Target project directory already exists');

src/Magestead/Service/UsageApi.php

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 . '&';

Spacing +17 added lines, -17 removed lines

@@ -10,13 +10,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.
@@ -25,30 +25,30 @@ 
      */
     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']);
     }
 
     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_RETURNTRANSFER, 1);
 
-        $result = curl_exec($ch);
+        $result=curl_exec($ch);
 
         curl_close($ch);
     }
@@ -58,9 +58,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, '&');
 

src/Magestead/Command/Log/ViewCommand.php

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';

Spacing +10 added lines, -10 removed lines

@@ -22,7 +22,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');
@@ -36,15 +36,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);
+        $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);
     }
@@ -57,11 +57,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;
     }
@@ -74,9 +74,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;

src/Magestead/Command/Log/StreamCommand.php

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';

Spacing +10 added lines, -10 removed lines

@@ -22,7 +22,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');
@@ -36,15 +36,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);
+        $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);
     }
@@ -57,11 +57,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;
     }
@@ -74,9 +74,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;

provision/puphpet/magestead/magento2/set_repo_credentials.php

Spacing +4 added lines, -4 removed lines

@@ -1,11 +1,11 @@
 <?php
 
-$file = '/home/vagrant/.composer/auth.json';
+$file='/home/vagrant/.composer/auth.json';
 
-$publicKey = "$argv[1]";
-$privateKey = "$argv[2]";
+$publicKey="$argv[1]";
+$privateKey="$argv[2]";
 
-$contents = [
+$contents=[
     'http-basic' => [
         'repo.magento.com' => [
             'username' => $publicKey,

provision/puphpet/magestead/magento2/add_redis_env.php

Indentation +3 added lines, -3 removed lines

@@ -4,7 +4,7 @@ 
 $env = include $file;
 
 $env['cache'] =
-     [
+        [
         'frontend' =>  [
             'default' =>  [
                 'backend'     => 'Cm_Cache_Backend_Redis',
@@ -24,8 +24,8 @@ 
         ],
             ],
             'page_cache' =>  [
-          'backend'         => 'Cm_Cache_Backend_Redis',
-          'backend_options' =>  [
+            'backend'         => 'Cm_Cache_Backend_Redis',
+            'backend_options' =>  [
                     'server'                    => '127.0.0.1',
                     'port'                      => '6379',
                     'persistent'                => '',

Spacing +3 added lines, -3 removed lines

@@ -1,9 +1,9 @@
 <?php
 
-$file = "$argv[1]/magento2/app/etc/env.php";
-$env = include $file;
+$file="$argv[1]/magento2/app/etc/env.php";
+$env=include $file;
 
-$env['cache'] =
+$env['cache']=
      [
         'frontend' =>  [
             'default' =>  [

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -43,4 +43,4 @@
         ],
     ];
 
-file_put_contents($file, "<?php \n \n return ".var_export($env, true).';');
+file_put_contents($file, "<?php \n \n return ".var_export($env, TRUE).';');