LippertComponents / Blend

src/Blendable/SystemSetting.php

Spacing +3 added lines, -3 removed lines

@@ -237,13 +237,13 @@ 
      * @param string $type ~ seed or revert
      * @return string
      */
-    public function getSeedKey($type='seed')
+    public function getSeedKey($type = 'seed')
     {
         $key = $this->blender->getSeedKeyFromName($this->getFieldNamespace().'-'.$this->getFieldName());
 
         switch ($type) {
             case 'revert':
-                $seed_key = 'revert-' . $key;
+                $seed_key = 'revert-'.$key;
                 break;
 
             case 'seed':
@@ -350,7 +350,7 @@ 
     /**
      * @param bool $load_defaults
      */
-    protected function loadObject($load_defaults=false)
+    protected function loadObject($load_defaults = false)
     {
         parent::loadObject();
 

src/Blendable/Plugin.php

Spacing +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
      * @param int $property_set
      * @return $this
      */
-    public function attachOnEvent($event_name, $priority=0, $property_set=0)
+    public function attachOnEvent($event_name, $priority = 0, $property_set = 0)
     {
         $this->related_data[] = [
             'event' => $event_name,
@@ -137,7 +137,7 @@ 
     /**
      * @var string $type blend or revert
      */
-    protected function seedRelated($type='blend')
+    protected function seedRelated($type = 'blend')
     {
         // get all related Events:
         $events = [];

src/Helpers/DownloadModxVersion.php

Spacing +13 added lines, -13 removed lines

@@ -56,7 +56,7 @@ 
      * DownloadModxVersion constructor.
      * @param null|OutputInterface $output
      */
-    public function __construct($output=null)
+    public function __construct($output = null)
     {
         $this->output = $output;
     }
@@ -107,7 +107,7 @@ 
      * @param string $branch
      * @return bool
      */
-    public function getGitBranch($branch='3.x')
+    public function getGitBranch($branch = '3.x')
     {
         $this->git_project_version = $branch;
         $this->loadGuzzle();
@@ -125,7 +125,7 @@ 
      * @param string $release
      * @return bool
      */
-    public function getGitRelease($release='v2.6.1-pl')
+    public function getGitRelease($release = 'v2.6.1-pl')
     {
         $this->git_project_version = ltrim($release, 'v');
         $this->loadGuzzle();
@@ -165,7 +165,7 @@ 
             // Base URI is used with relative requests
             'base_uri' => 'https://github.com/modxcms/revolution/archive/',
             // You can set any number of default request options.
-            'timeout'  => 300.0,// for slow internet
+            'timeout'  => 300.0, // for slow internet
         ]);
     }
 
@@ -175,7 +175,7 @@ 
      * @param bool $remove_build
      * @return bool
      */
-    protected function moveGitFiles($run_composer_update=true, $remove_setup=true, $remove_build=true)
+    protected function moveGitFiles($run_composer_update = true, $remove_setup = true, $remove_build = true)
     {
         // unzip into proper directory:
         $zip = new ZipArchive;
@@ -183,14 +183,14 @@ 
             $file_count = $zip->numFiles;
 
             if ($this->output instanceof OutputInterface) {
-                $this->output->writeln('Extracting '.$this->zip_file. ' to '.BLEND_CACHE_DIR.' File count: '.$file_count);
+                $this->output->writeln('Extracting '.$this->zip_file.' to '.BLEND_CACHE_DIR.' File count: '.$file_count);
                 $progress = new ProgressBar($this->output, $file_count);
                 $progress->start();
 
                 $progress->setRedrawFrequency(10);
             }
 
-            for($i = 0; $i < $zip->numFiles; $i++) {
+            for ($i = 0; $i < $zip->numFiles; $i++) {
                 $zip->extractTo(BLEND_CACHE_DIR, [$zip->getNameIndex($i)]);
 
                 if (isset($progress) && $progress instanceof ProgressBar) {
@@ -210,11 +210,11 @@ 
 
             if ($remove_build) {
                 // delete the _build:
-                $this->deleteDirectory(MODX_PATH . '_build');
+                $this->deleteDirectory(MODX_PATH.'_build');
             }
             if ($remove_setup) {
                 // delete the setup:
-                $this->deleteDirectory(MODX_PATH . 'setup');
+                $this->deleteDirectory(MODX_PATH.'setup');
             }
 
             // run composer update:
@@ -226,7 +226,7 @@ 
 
         } else {
             // error
-            $this->output->writeln('<error>Error Extracting '.$this->zip_file. ' to '.BLEND_CACHE_DIR.'</error>');
+            $this->output->writeln('<error>Error Extracting '.$this->zip_file.' to '.BLEND_CACHE_DIR.'</error>');
         }
         return false;
     }
@@ -234,7 +234,7 @@ 
     /**
      * @param int $file_count ~ count of files in the directory
      */
-    protected function copyExtractedDirectory($file_count=4000)
+    protected function copyExtractedDirectory($file_count = 4000)
     {
         $source = BLEND_CACHE_DIR.'revolution-'.$this->git_project_version;
         $destination = MODX_PATH;
@@ -249,11 +249,11 @@ 
     {
         // Composer\Factory::getHomeDir() method
         // needs COMPOSER_HOME environment variable set
-        putenv('COMPOSER_HOME=' . MODX_PATH . 'vendor/bin/composer');
+        putenv('COMPOSER_HOME='.MODX_PATH.'vendor/bin/composer');
         putenv('COMPOSER='.MODX_PATH.'composer.json');
 
         $output = new ConsoleOutput();
-        $output->writeln('Run: composer install: COMPOSER='.MODX_PATH.'composer.json'.PHP_EOL.'COMPOSER_HOME=' . MODX_PATH . 'vendor/bin/composer');
+        $output->writeln('Run: composer install: COMPOSER='.MODX_PATH.'composer.json'.PHP_EOL.'COMPOSER_HOME='.MODX_PATH.'vendor/bin/composer');
 
         try {
             //ini_set('memory_limit', '1024M');

src/Helpers/Files.php

Spacing +4 added lines, -4 removed lines

@@ -21,7 +21,7 @@ 
      * @param string $destination ~ full path of destination
      * @param int $file_count
      */
-    public function copyDirectory($source, $destination, $file_count=4000)
+    public function copyDirectory($source, $destination, $file_count = 4000)
     {
         if (!is_dir($destination)) {
             mkdir($destination, 0700);
@@ -44,13 +44,13 @@ 
         /** @var \DirectoryIterator $item */
         foreach ($recursiveIteratorIterator as $item) {
             if ($item->isDir()) {
-                if (is_dir($destination. DIRECTORY_SEPARATOR. $recursiveIteratorIterator->getSubPathName())) {
+                if (is_dir($destination.DIRECTORY_SEPARATOR.$recursiveIteratorIterator->getSubPathName())) {
                     continue;
                 }
-                mkdir($destination . DIRECTORY_SEPARATOR . $recursiveIteratorIterator->getSubPathName());
+                mkdir($destination.DIRECTORY_SEPARATOR.$recursiveIteratorIterator->getSubPathName());
 
             } else {
-                copy($item, $destination . DIRECTORY_SEPARATOR . $recursiveIteratorIterator->getSubPathName());
+                copy($item, $destination.DIRECTORY_SEPARATOR.$recursiveIteratorIterator->getSubPathName());
             }
 
             if (isset($progress) && $progress instanceof ProgressBar) {

src/Helpers/UserInteractionHandler.php

Spacing +2 added lines, -2 removed lines

@@ -39,7 +39,7 @@ 
      * @param array $options ~ ex: ['Option1' => 'value', 'Option2' => 'value2', ...]
      * @return mixed ~ selected value
      */
-    public function promptSelectOneOption(string $question, $default, $options=[]);
+    public function promptSelectOneOption(string $question, $default, $options = []);
 
     /**
      * @param string $question
@@ -47,7 +47,7 @@ 
      * @param array $options ~ ex: ['Option1' => 'value', 'Option2' => 'value2', ...]
      * @return array ~ array of selected values
      */
-    public function promptSelectMultipleOptions(string $question, $default, $options=[]);
+    public function promptSelectMultipleOptions(string $question, $default, $options = []);
 
     /**
      * @param string $question

src/Helpers/EmptyUserInteractionHandler.php

Spacing +3 added lines, -3 removed lines

@@ -30,7 +30,7 @@ 
      * @param bool $default
      * @return bool
      */
-    public function promptConfirm(string $question, $default=true)
+    public function promptConfirm(string $question, $default = true)
     {
         return $default;
     }
@@ -52,7 +52,7 @@ 
      * @param string $error_message ~ ex: 'Color %s is invalid.'
      * @return mixed ~ selected value
      */
-    public function promptSelectOneOption(string $question, $default, $options=[], $error_message='%s is an invalid choice.')
+    public function promptSelectOneOption(string $question, $default, $options = [], $error_message = '%s is an invalid choice.')
     {
         return $default;
     }
@@ -64,7 +64,7 @@ 
      * @param string $error_message ~ ex: 'Color %s is invalid.'
      * @return array ~ array of selected values
      */
-    public function promptSelectMultipleOptions(string $question, $default, $options=[], $error_message='%s is an invalid choice.')
+    public function promptSelectMultipleOptions(string $question, $default, $options = [], $error_message = '%s is an invalid choice.')
     {
         return $default;
     }

src/Helpers/SimpleCache.php

Spacing +7 added lines, -7 removed lines

@@ -34,7 +34,7 @@ 
      * @param string $key
      * @return bool|mixed
      */
-    public function get($key='install-config')
+    public function get($key = 'install-config')
     {
         $path = $this->getFullKeyPath($key);
         $data = false;
@@ -50,10 +50,10 @@ 
      * @param string $key
      * @param array $data
      */
-    public function set($key='install-config', $data=[])
+    public function set($key = 'install-config', $data = [])
     {
         $content = '<?php '.PHP_EOL.
-            'return ' . var_export($data, true) . ';';
+            'return '.var_export($data, true).';';
 
         file_put_contents($this->getFullKeyPath($key), $content);
     }
@@ -61,7 +61,7 @@ 
     /**
      * @param null|string $key ~ if null will delete the complete directory
      */
-    public function remove($key=null)
+    public function remove($key = null)
     {
         if (!empty($key)) {
             $path = $this->getFullKeyPath($key);
@@ -71,7 +71,7 @@ 
 
         } else {
             // clean the directory:
-            $this->deleteDirectory(MODX_PATH . $this->directory);
+            $this->deleteDirectory(MODX_PATH.$this->directory);
         }
     }
 
@@ -81,8 +81,8 @@ 
      */
     protected function getFullKeyPath($key)
     {
-        return rtrim($this->directory, '/') . DIRECTORY_SEPARATOR .
-            preg_replace('/[^A-Za-z0-9\_\-]/', '', str_replace(['/', ' '], '_', $key)) .
+        return rtrim($this->directory, '/').DIRECTORY_SEPARATOR.
+            preg_replace('/[^A-Za-z0-9\_\-]/', '', str_replace(['/', ' '], '_', $key)).
             '.php';
     }
 

src/Helpers/ConsoleUserInteractionHandler.php

Spacing +7 added lines, -7 removed lines

@@ -58,7 +58,7 @@ 
      * @param bool $default
      * @return bool
      */
-    public function promptConfirm(string $question, $default=true)
+    public function promptConfirm(string $question, $default = true)
     {
         $confirmationQuestion = new ConfirmationQuestion($question.' <comment>(Y/N)</comment> ', $default);
         return $this->questionHelper->ask($this->input, $this->output, $confirmationQuestion);
@@ -69,7 +69,7 @@ 
      * @param string|mixed $default
      * @return string|mixed ~ user input
      */
-    public function promptInput(string $question, $default=null)
+    public function promptInput(string $question, $default = null)
     {
         $questionInput = new Question($question, $default);
         return $this->questionHelper->ask($this->input, $this->output, $questionInput);
@@ -82,7 +82,7 @@ 
      * @param string $error_message ~ ex: 'Color %s is invalid.'
      * @return mixed ~ selected value
      */
-    public function promptSelectOneOption(string $question, $default=null, $options=[], $error_message='%s is an invalid choice.')
+    public function promptSelectOneOption(string $question, $default = null, $options = [], $error_message = '%s is an invalid choice.')
     {
         $pretty_options = $this->getPrettyOptions($options);
 
@@ -104,7 +104,7 @@ 
      * @param string $error_message ~ ex: 'Color %s is invalid.'
      * @return array ~ array of selected values
      */
-    public function promptSelectMultipleOptions(string $question, $default=null, $options=[], $error_message='%s is an invalid choice.')
+    public function promptSelectMultipleOptions(string $question, $default = null, $options = [], $error_message = '%s is an invalid choice.')
     {
         $pretty_options = $this->getPrettyOptions($options);
 
@@ -126,7 +126,7 @@ 
      * @param string|mixed $default
      * @return string|mixed ~ user input
      */
-    public function promptHiddenInput(string $question, $default=null)
+    public function promptHiddenInput(string $question, $default = null)
     {
         $questionInput = new Question($question, $default);
         $questionInput
@@ -165,8 +165,8 @@ 
         // https://stackoverflow.com/questions/173400/how-to-check-if-php-array-is-associative-or-sequential#173479
         if (array_keys($options) !== range(0, count($options) - 1)) {
             foreach ($options as $option => $value) {
-                $pretty_options['choices'][] = $option . '(' . $value . ')';
-                $pretty_options['choices'][$option . '(' . $value . ')'] = $value;
+                $pretty_options['choices'][] = $option.'('.$value.')';
+                $pretty_options['choices'][$option.'('.$value.')'] = $value;
             }
 
         } else {

src/Helpers/ModxConfig.php

Spacing +13 added lines, -13 removed lines

@@ -21,22 +21,22 @@ 
      * @param string $config_path
      * @param array $config
      */
-    public function __construct($config_path, array $config=[])
+    public function __construct($config_path, array $config = [])
     {
 
-        $this->config_path = $config_path . 'core/config/' . (defined('MODX_CONFIG_KEY') ? MODX_CONFIG_PATH : 'config'). '.inc.php';
+        $this->config_path = $config_path.'core/config/'.(defined('MODX_CONFIG_KEY') ? MODX_CONFIG_PATH : 'config').'.inc.php';
 
         $defaults = [
-            'site_sessionname' => 'SN' . uniqid(''),
-            'core_path' => (defined('MODX_CORE_PATH') ? MODX_CORE_PATH : MODX_PATH . 'core/'),
-            'mgr_path' => (defined('MODX_MANAGER_PATH') ? MODX_MANAGER_PATH : MODX_PATH . 'manager/'),
+            'site_sessionname' => 'SN'.uniqid(''),
+            'core_path' => (defined('MODX_CORE_PATH') ? MODX_CORE_PATH : MODX_PATH.'core/'),
+            'mgr_path' => (defined('MODX_MANAGER_PATH') ? MODX_MANAGER_PATH : MODX_PATH.'manager/'),
             'mgr_url' => (defined('MODX_MANAGER_URL') ? MODX_MANAGER_URL : '/manager/'),
-            'connectors_path' => (defined('MODX_CONNECTORS_PATH') ? MODX_CONNECTORS_PATH : MODX_PATH . 'connectors/'),
+            'connectors_path' => (defined('MODX_CONNECTORS_PATH') ? MODX_CONNECTORS_PATH : MODX_PATH.'connectors/'),
             'connectors_url' => (defined('MODX_CONNECTORS_URL') ? MODX_CONNECTORS_URL : '/connectors/'),
             'web_path' => (defined('MODX_BASE_PATH') ? MODX_BASE_PATH : MODX_PATH),
             'web_url' => (defined('MODX_BASE_URL') ? MODX_BASE_URL : '/'),
-            'processors_path' => (defined('MODX_CORE_PATH') ? MODX_CORE_PATH : MODX_PATH . 'core/') . 'model/modx/processors/',
-            'assets_path' => (defined('MODX_ASSETS_PATH') ? MODX_ASSETS_PATH : MODX_PATH . 'assets/'),
+            'processors_path' => (defined('MODX_CORE_PATH') ? MODX_CORE_PATH : MODX_PATH.'core/').'model/modx/processors/',
+            'assets_path' => (defined('MODX_ASSETS_PATH') ? MODX_ASSETS_PATH : MODX_PATH.'assets/'),
             'assets_url' => (defined('MODX_ASSETS_URL') ? MODX_ASSETS_URL : '/assets/'),
 
             'database_dsn' => '',
@@ -102,7 +102,7 @@ 
         $this->config['database_password'] = addslashes($this->config['database_password']);
 
         $this->config['last_install_time'] = time();
-        $this->config['site_id'] = uniqid('modx',true);
+        $this->config['site_id'] = uniqid('modx', true);
 
         /* make UUID if not set */
         if (empty($this->config['uuid'])) {
@@ -118,9 +118,9 @@ 
                 $replace = [];
                 foreach ($this->config as $key => $value) {
                     if (is_scalar($value)) {
-                        $replace['{' . $key . '}'] = $value;
+                        $replace['{'.$key.'}'] = $value;
                     } elseif (is_array($value)) {
-                        $replace['{' . $key . '}'] = var_export($value, true);
+                        $replace['{'.$key.'}'] = var_export($value, true);
                     }
                 }
 
@@ -168,9 +168,9 @@ 
      */
     protected function generateUUID() {
         srand(intval(microtime(true) * 1000));
-        $b = md5(uniqid(rand(),true),true);
+        $b = md5(uniqid(rand(), true), true);
         $b[6] = chr((ord($b[6]) & 0x0F) | 0x40);
         $b[8] = chr((ord($b[8]) & 0x3F) | 0x80);
-        return implode('-',unpack('H8a/H4b/H4c/H4d/H12e',$b));
+        return implode('-', unpack('H8a/H4b/H4c/H4d/H12e', $b));
     }
 }
\ No newline at end of file