LippertComponents / Blend

src/Properties.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
      *
      * @return $this
      */
-    public function mergePropertiesFromArray(array $data=[])
+    public function mergePropertiesFromArray(array $data = [])
     {
         if ($this->verifyArray($data)) {
             $this->data = array_merge($data, $this->data);

src/Blendable/Blendable.php

Spacing +24 added lines, -24 removed lines

@@ -81,11 +81,11 @@ 
      * @param Blender $blender
      * @param string|array $unique_value
      */
-    public function __construct(\modx $modx, Blender $blender, $unique_value='')
+    public function __construct(\modx $modx, Blender $blender, $unique_value = '')
     {
         $this->modx = $modx;
         $this->blender = $blender;
-        if (method_exists($this, 'loadProperties') ) {
+        if (method_exists($this, 'loadProperties')) {
             $this->loadProperties();
         }
 
@@ -134,9 +134,9 @@ 
      */
     public function setSeedsDir($dir)
     {
-        $this->seeds_dir = (string) $dir;
+        $this->seeds_dir = (string)$dir;
         if (!empty($this->seeds_dir)) {
-            $this->cacheOptions[\xPDO::OPT_CACHE_PATH] = $this->blender->getSeedsPath() . $dir . '/';
+            $this->cacheOptions[\xPDO::OPT_CACHE_PATH] = $this->blender->getSeedsPath().$dir.'/';
         }
         return $this;
     }
@@ -169,7 +169,7 @@ 
      * @param string $type ~ seed or revert
      * @return string
      */
-    public function getSeedKey($type='seed')
+    public function getSeedKey($type = 'seed')
     {
         $name = $this->blendable_xpdo_simple_object_data[$this->unique_key_column];
         if (method_exists($this, 'getFieldName')) {
@@ -179,7 +179,7 @@ 
 
         switch ($type) {
             case 'revert':
-                $seed_key = 'revert-' . $key;
+                $seed_key = 'revert-'.$key;
                 break;
 
             case 'seed':
@@ -204,7 +204,7 @@ 
      * @param bool $overwrite
      * @return bool
      */
-    public function blendFromArray($data, $overwrite=false)
+    public function blendFromArray($data, $overwrite = false)
     {
         if (isset($data['columns'])) {
             $this->blendable_xpdo_simple_object_data = $data['columns'];
@@ -229,7 +229,7 @@ 
      *
      * @return bool
      */
-    public function blendFromSeed($seed_key, $overwrite=false)
+    public function blendFromSeed($seed_key, $overwrite = false)
     {
         $this->loadObjectDataFromSeed($seed_key);
         return $this->blend($overwrite);
@@ -240,7 +240,7 @@ 
      *
      * @return bool
      */
-    public function blend($overwrite=false)
+    public function blend($overwrite = false)
     {
         if ($this->type == 'blend') {
             /** @var \LCI\Blend\Blendable\Blendable $currentVersion */
@@ -285,26 +285,26 @@ 
      * @param bool $make_revert_seed
      * @return bool
      */
-    public function delete($make_revert_seed=true)
+    public function delete($make_revert_seed = true)
     {
         if ($make_revert_seed) {
             $this->seed('revert');
         }
         $removed = false;
         if (!is_object($this->xPDOSimpleObject)) {
-            $this->blender->out($this->blendable_xpdo_simple_object_data[$this->unique_key_column] . ' of xPDO class '.
+            $this->blender->out($this->blendable_xpdo_simple_object_data[$this->unique_key_column].' of xPDO class '.
                 $this->xpdo_simple_object_class.' was not found, could not be removed/deleted', true);
 
         } elseif ($this->xPDOSimpleObject->remove()) {
             $this->onDeleteRevertRelatedPieces();
             if ($this->isDebug()) {
-                $this->blender->out($this->blendable_xpdo_simple_object_data[$this->unique_key_column] . ' has been removed/deleted');
+                $this->blender->out($this->blendable_xpdo_simple_object_data[$this->unique_key_column].' has been removed/deleted');
             }
             $removed = true;
 
         } else {
             if ($this->isDebug()) {
-                $this->blender->out($this->blendable_xpdo_simple_object_data[$this->unique_key_column] . ' did not remove/delete', true);
+                $this->blender->out($this->blendable_xpdo_simple_object_data[$this->unique_key_column].' did not remove/delete', true);
             }
         }
 
@@ -329,7 +329,7 @@ 
      * @param string $type ~ seed or revert
      * @return string ~ the related seed key
      */
-    public function seed($type='seed')
+    public function seed($type = 'seed')
     {
         $data = false;
         // No IDs! must get the alias and get a seed key,
@@ -353,7 +353,7 @@ 
      * @param string $seed_key
      * @return array
      */
-    public function seedToArray($type='seed', $seed_key='')
+    public function seedToArray($type = 'seed', $seed_key = '')
     {
         if (is_object($this->xPDOSimpleObject)) {
             $this->current_xpdo_simple_object_data = $this->xPDOSimpleObject->toArray();
@@ -364,7 +364,7 @@ 
                 }
                 // Any child class can create a seed method, an example for modResource:
                 // seedTemplate(1) and would return the string name
-                $method = 'seed' . $this->makeStudyCase($column);
+                $method = 'seed'.$this->makeStudyCase($column);
                 if (method_exists($this, $method)) {
                     $value = $this->$method($value);
                 }
@@ -420,15 +420,15 @@ 
      *
      * @return bool
      */
-    protected function save($overwrite=false)
+    protected function save($overwrite = false)
     {
         $saved = false;
 
         if (is_object($this->xPDOSimpleObject)) {
             if (!$overwrite) {
                 $this->error = true;
-                $this->error_messages['exits'] = $this->xpdo_simple_object_class.': ' .
-                    $this->blendable_xpdo_simple_object_data[$this->unique_key_column] . ' already exists ';
+                $this->error_messages['exits'] = $this->xpdo_simple_object_class.': '.
+                    $this->blendable_xpdo_simple_object_data[$this->unique_key_column].' already exists ';
                 return $saved;
             }
         } else {
@@ -456,13 +456,13 @@ 
         if ($this->xPDOSimpleObject->save()) {
             $this->attachRelatedPiecesAfterSave();
             if ($this->isDebug()) {
-                $this->blender->out($this->blendable_xpdo_simple_object_data[$this->unique_key_column] . ' has been installed/saved');
+                $this->blender->out($this->blendable_xpdo_simple_object_data[$this->unique_key_column].' has been installed/saved');
             }
             $saved = true;
 
         } else {
             if ($this->isDebug()) {
-                $this->blender->out($this->blendable_xpdo_simple_object_data[$this->unique_key_column] . ' did not install/update', true);
+                $this->blender->out($this->blendable_xpdo_simple_object_data[$this->unique_key_column].' did not install/update', true);
             }
 
         }
@@ -509,7 +509,7 @@ 
      *
      * @return $this
      */
-    protected function loadFromArray($data=[])
+    protected function loadFromArray($data = [])
     {
         foreach ($data as $column => $value) {
             $method_name = 'seed'.$this->makeStudyCase($column);
@@ -537,7 +537,7 @@ 
                 }
                 $this->$method_name($value);
                 
-            } elseif($this->isDebug()) {
+            } elseif ($this->isDebug()) {
                 $this->blender->out(__METHOD__.' missing: '.$method_name.' V: '.$value, true);
             }
         }
@@ -626,7 +626,7 @@ 
     /**
      * @var string $type blend or revert
      */
-    protected function seedRelated($type='blend')
+    protected function seedRelated($type = 'blend')
     {
         // load related data:
         $this->loadRelatedData();

src/Blender.php

Spacing +105 added lines, -105 removed lines

@@ -78,7 +78,7 @@ 
      * @param UserInteractionHandler $userInteractionHandler
      * @param array $config
      */
-    public function __construct(modX $modx, UserInteractionHandler $userInteractionHandler, $config=[])
+    public function __construct(modX $modx, UserInteractionHandler $userInteractionHandler, $config = [])
     {
         $this->modx = $modx;
 
@@ -86,7 +86,7 @@ 
 
         $this->userInteractionHandler = $userInteractionHandler;
 
-        if (version_compare($this->modx_version_info['full_version'], '3.0') >= 0 ) {
+        if (version_compare($this->modx_version_info['full_version'], '3.0') >= 0) {
             $this->xpdo_version = 3;
             $this->blend_class_object = 'LCI\\Blend\\Model\\xPDO\\BlendMigrations';
             $this->blend_package = 'LCI\\Blend\\Model\\xPDO';
@@ -101,10 +101,10 @@ 
         }
 
         $this->config = [
-            'migration_templates_path' => __DIR__. '/Migrations/templates/',
+            'migration_templates_path' => __DIR__.'/Migrations/templates/',
             'migrations_path' => $blend_modx_migration_dir.'database/migrations/',
             'seeds_path' => $blend_modx_migration_dir.'database/seeds/',
-            'model_dir' => __DIR__ . ($this->xpdo_version >= 3 ? '/' : '/xpdo2/'),
+            'model_dir' => __DIR__.($this->xpdo_version >= 3 ? '/' : '/xpdo2/'),
             'extras' => [
                 'tagger' => false
             ]
@@ -113,7 +113,7 @@ 
 
         $this->seeds_dir = date('Y_m_d_His');
 
-        $tagger_path = $this->modx->getOption('tagger.core_path', null, $this->modx->getOption('core_path') . 'components/tagger/') . 'model/tagger/';
+        $tagger_path = $this->modx->getOption('tagger.core_path', null, $this->modx->getOption('core_path').'components/tagger/').'model/tagger/';
         if (is_dir($tagger_path)) {
             $this->config['extras']['tagger'] = true;
             /** @var \Tagger $tagger */
@@ -175,11 +175,11 @@ 
      * @param null $directory_key
      * @return string
      */
-    public function getSeedsPath($directory_key=null)
+    public function getSeedsPath($directory_key = null)
     {
         $seed_path = $this->config['seeds_path'];
         if (!empty($directory_key)) {
-            $seed_path .= trim($directory_key, '/') . DIRECTORY_SEPARATOR;
+            $seed_path .= trim($directory_key, '/').DIRECTORY_SEPARATOR;
         }
         return $seed_path;
     }
@@ -201,21 +201,21 @@ 
      *
      * @return array ~ array of \BlendMigrations
      */
-    public function getBlendMigrationCollection($reload=false, $dir='ASC', $count=0, $id=0, $name=null)
+    public function getBlendMigrationCollection($reload = false, $dir = 'ASC', $count = 0, $id = 0, $name = null)
     {
         if (!$this->blendMigrations || $reload) {
             $blendMigrations = [];
 
             /** @var \xPDOQuery $query */
             $query = $this->modx->newQuery($this->blend_class_object);
-            if ($id > 0 ) {
+            if ($id > 0) {
                 $query->where(['id' => $id]);
             } elseif (!empty($name)) {
                 $query->where(['name' => $name]);
             }
             // @TODO need a ran sequence column to better order of down
             $query->sortBy('name', $dir);
-            if ($count > 0 ) {
+            if ($count > 0) {
                 $query->limit($count);
             }
             $query->prepare();
@@ -239,7 +239,7 @@ 
         return $this->tagger;
     }
 
-    public function getCategoryMap($refresh=false)
+    public function getCategoryMap($refresh = false)
     {
         if (count($this->category_map) == 0 || $refresh) {
             $this->category_map = [
@@ -284,14 +284,14 @@ 
     public function getBlendableChunk($name)
     {
         /** @var \LCI\Blend\Blendable\Chunk $chunk */
-        $chunk =  new Chunk($this->modx, $this, $name);
+        $chunk = new Chunk($this->modx, $this, $name);
         return $chunk->setSeedsDir($this->getSeedsDir());
     }
     /**
      * @param array $chunks
      * @param string $seeds_dir
      */
-    public function blendManyChunks($chunks=[], $seeds_dir='')
+    public function blendManyChunks($chunks = [], $seeds_dir = '')
     {
         // will update if element does exist or create new
         foreach ($chunks as $seed_key) {
@@ -303,7 +303,7 @@ 
             if ($blendChunk->blendFromSeed($seed_key)) {
                 $this->out($seed_key.' has been blended into ID: ');
 
-            } elseif($blendChunk->isExists()) {
+            } elseif ($blendChunk->isExists()) {
                 // @TODO prompt Do you want to blend Y/N/Compare
                 $this->out($seed_key.' chunk already exists', true);
                 if ($this->prompt('Would you like to update?', 'Y') === 'Y') {
@@ -321,7 +321,7 @@ 
      * @param array $chunks
      * @param string $seeds_dir
      */
-    public function revertBlendManyChunks($chunks=[], $seeds_dir='')
+    public function revertBlendManyChunks($chunks = [], $seeds_dir = '')
     {
         // will update if system setting does exist or create new
         foreach ($chunks as $seed_key) {
@@ -331,7 +331,7 @@ 
                 $blendChunk->setSeedsDir($seeds_dir);
             }
 
-            if ( $blendChunk->revertBlend() ) {
+            if ($blendChunk->revertBlend()) {
                 $this->out($blendChunk->getFieldName().' chunk has been reverted to '.$seeds_dir);
 
             } else {
@@ -348,7 +348,7 @@ 
     public function getBlendableContext($key)
     {
         /** @var \LCI\Blend\Blendable\Context $chunk */
-        $context =  new Context($this->modx, $this, $key);
+        $context = new Context($this->modx, $this, $key);
         return $context->setSeedsDir($this->getSeedsDir());
     }
 
@@ -356,7 +356,7 @@ 
      * @param array $contexts
      * @param string $seeds_dir
      */
-    public function blendManyContexts($contexts=[], $seeds_dir='')
+    public function blendManyContexts($contexts = [], $seeds_dir = '')
     {
         // will update if element does exist or create new
         foreach ($contexts as $seed_key) {
@@ -368,7 +368,7 @@ 
             if ($blendContext->blendFromSeed($seed_key)) {
                 $this->out($seed_key.' has been blended ');
 
-            } elseif($blendContext->isExists()) {
+            } elseif ($blendContext->isExists()) {
                 // @TODO prompt Do you want to blend Y/N/Compare
                 $this->out($seed_key.' chunk already exists', true);
                 if ($this->prompt('Would you like to update?', 'Y') === 'Y') {
@@ -386,7 +386,7 @@ 
      * @param array $contexts
      * @param string $seeds_dir
      */
-    public function revertBlendManyContexts($contexts=[], $seeds_dir='')
+    public function revertBlendManyContexts($contexts = [], $seeds_dir = '')
     {
         // will update if system setting does exist or create new
         foreach ($contexts as $seed_key) {
@@ -396,7 +396,7 @@ 
                 $blendContext->setSeedsDir($seeds_dir);
             }
 
-            if ( $blendContext->revertBlend() ) {
+            if ($blendContext->revertBlend()) {
                 $this->out($blendContext->getFieldKey().' context has been reverted to '.$seeds_dir);
 
             } else {
@@ -413,7 +413,7 @@ 
     public function getBlendableMediaSource($name)
     {
         /** @var \LCI\Blend\Blendable\MediaSource $mediaSource */
-        $mediaSource =  new MediaSource($this->modx, $this, $name);
+        $mediaSource = new MediaSource($this->modx, $this, $name);
         return $mediaSource
             ->setFieldName($name)
             ->setSeedsDir($this->getSeedsDir());
@@ -423,7 +423,7 @@ 
      * @param array $media_sources
      * @param string $seeds_dir
      */
-    public function blendManyMediaSources($media_sources=[], $seeds_dir='')
+    public function blendManyMediaSources($media_sources = [], $seeds_dir = '')
     {
         // will update if element does exist or create new
         foreach ($media_sources as $seed_key) {
@@ -435,7 +435,7 @@ 
             if ($blendMediaSource->blendFromSeed($seed_key)) {
                 $this->out($seed_key.' has been blended into ID: ');
 
-            } elseif($blendMediaSource->isExists()) {
+            } elseif ($blendMediaSource->isExists()) {
                 // @TODO add Compare as option
                 $this->out($seed_key.' media source already exists', true);
                 if ($this->prompt('Would you like to update?', 'Y') === 'Y') {
@@ -453,7 +453,7 @@ 
      * @param array $media_sources
      * @param string $seeds_dir
      */
-    public function revertBlendManyMediaSources($media_sources=[], $seeds_dir='')
+    public function revertBlendManyMediaSources($media_sources = [], $seeds_dir = '')
     {
         // will update if system setting does exist or create new
         foreach ($media_sources as $seed_key) {
@@ -463,7 +463,7 @@ 
                 $blendMediaSource->setSeedsDir($seeds_dir);
             }
 
-            if ( $blendMediaSource->revertBlend() ) {
+            if ($blendMediaSource->revertBlend()) {
                 $this->out($blendMediaSource->getFieldName().' media source has been reverted to '.$seeds_dir);
 
             } else {
@@ -480,7 +480,7 @@ 
     public function getBlendablePlugin($name)
     {
         /** @var \LCI\Blend\Blendable\Plugin $plugin */
-        $plugin =  new Plugin($this->modx, $this, $name);
+        $plugin = new Plugin($this->modx, $this, $name);
         return $plugin->setSeedsDir($this->getSeedsDir());
     }
 
@@ -488,7 +488,7 @@ 
      * @param array $plugins
      * @param string $seeds_dir
      */
-    public function blendManyPlugins($plugins=[], $seeds_dir='')
+    public function blendManyPlugins($plugins = [], $seeds_dir = '')
     {
         // will update if element does exist or create new
         foreach ($plugins as $seed_key) {
@@ -500,7 +500,7 @@ 
             if ($blendPlugin->blendFromSeed($seed_key)) {
                 $this->out($seed_key.' has been blended into ID: ');
 
-            } elseif($blendPlugin->isExists()) {
+            } elseif ($blendPlugin->isExists()) {
                 // @TODO prompt Do you want to blend Y/N/Compare
                 $this->out($seed_key.' plugin already exists', true);
                 if ($this->prompt('Would you like to update?', 'Y') === 'Y') {
@@ -518,7 +518,7 @@ 
      * @param array $plugins
      * @param string $seeds_dir
      */
-    public function revertBlendManyPlugins($plugins=[], $seeds_dir='')
+    public function revertBlendManyPlugins($plugins = [], $seeds_dir = '')
     {
         // will update if system setting does exist or create new
         foreach ($plugins as $seed_key) {
@@ -528,7 +528,7 @@ 
                 $blendPlugin->setSeedsDir($seeds_dir);
             }
 
-            if ( $blendPlugin->revertBlend() ) {
+            if ($blendPlugin->revertBlend()) {
                 $this->out($blendPlugin->getFieldName().' plugin has been reverted to '.$seeds_dir);
 
             } else {
@@ -545,7 +545,7 @@ 
     public function getBlendableSnippet($name)
     {
         /** @var Snippet $snippet */
-        $snippet =  new Snippet($this->modx, $this, $name);
+        $snippet = new Snippet($this->modx, $this, $name);
         return $snippet->setSeedsDir($this->getSeedsDir());
     }
 
@@ -553,7 +553,7 @@ 
      * @param array $snippets
      * @param string $seeds_dir
      */
-    public function blendManySnippets($snippets=[], $seeds_dir='')
+    public function blendManySnippets($snippets = [], $seeds_dir = '')
     {
         // will update if element does exist or create new
         foreach ($snippets as $seed_key) {
@@ -565,7 +565,7 @@ 
             if ($blendSnippet->blendFromSeed($seed_key)) {
                 $this->out($seed_key.' has been blended');
 
-            } elseif($blendSnippet->isExists()) {
+            } elseif ($blendSnippet->isExists()) {
                 // @TODO prompt Do you want to blend Y/N/Compare
                 $this->out($seed_key.' snippet already exists', true);
                 if ($this->prompt('Would you like to update?', 'Y') === 'Y') {
@@ -582,7 +582,7 @@ 
      * @param array $snippets
      * @param string $seeds_dir
      */
-    public function revertBlendManySnippets($snippets=[], $seeds_dir='')
+    public function revertBlendManySnippets($snippets = [], $seeds_dir = '')
     {
         // will update if system setting does exist or create new
         foreach ($snippets as $seed_key) {
@@ -592,7 +592,7 @@ 
                 $blendSnippet->setSeedsDir($seeds_dir);
             }
 
-            if ( $blendSnippet->revertBlend() ) {
+            if ($blendSnippet->revertBlend()) {
                 $this->out($blendSnippet->getFieldName().' snippet has been reverted to '.$seeds_dir);
 
             } else {
@@ -609,7 +609,7 @@ 
     public function getBlendableTemplate($name)
     {
         /** @var \LCI\Blend\Blendable\Template $template */
-        $template =  new Template($this->modx, $this, $name);
+        $template = new Template($this->modx, $this, $name);
         return $template->setSeedsDir($this->seeds_dir);
     }
 
@@ -618,7 +618,7 @@ 
      * @param string $seeds_dir
      * @param bool $overwrite
      */
-    public function blendManyTemplates($templates=[], $seeds_dir='', $overwrite=false)
+    public function blendManyTemplates($templates = [], $seeds_dir = '', $overwrite = false)
     {
         // will update if template does exist or create new
         foreach ($templates as $seed_key) {
@@ -631,7 +631,7 @@ 
             if ($blendTemplate->blendFromSeed($seed_key, $overwrite)) {
                 $this->out($seed_key.' has been blended');
 
-            } elseif($blendTemplate->isExists()) {
+            } elseif ($blendTemplate->isExists()) {
                 $this->out($seed_key.' template already exists', true);
                 if ($this->prompt('Would you like to update?', 'Y') === 'Y') {
                     if ($blendTemplate->blendFromSeed($seed_key, true)) {
@@ -648,7 +648,7 @@ 
      * @param array $templates
      * @param string $seeds_dir
      */
-    public function revertBlendManyTemplates($templates=[], $seeds_dir='')
+    public function revertBlendManyTemplates($templates = [], $seeds_dir = '')
     {
         // will update if system setting does exist or create new
         foreach ($templates as $seed_key) {
@@ -658,7 +658,7 @@ 
                 $blendTemplate->setSeedsDir($seeds_dir);
             }
 
-            if ( $blendTemplate->revertBlend() ) {
+            if ($blendTemplate->revertBlend()) {
                 $this->out($blendTemplate->getFieldName().' template has been reverted to '.$seeds_dir);
 
             } else {
@@ -675,7 +675,7 @@ 
     public function getBlendableTemplateVariable($name)
     {
         /** @var \LCI\Blend\Blendable\TemplateVariable $tv */
-        $tv =  new TemplateVariable($this->modx, $this, $name);
+        $tv = new TemplateVariable($this->modx, $this, $name);
         return $tv->setSeedsDir($this->seeds_dir);
     }
 
@@ -684,10 +684,10 @@ 
      * @param  string $context
      * @return \LCI\Blend\Blendable\Resource
      */
-    public function getBlendableResource($alias, $context='web')
+    public function getBlendableResource($alias, $context = 'web')
     {
         /** @var \LCI\Blend\Blendable\Resource $resource */
-        $resource =  new Resource($this->modx, $this, $alias, $context);
+        $resource = new Resource($this->modx, $this, $alias, $context);
         return $resource
             ->setSeedsDir($this->getSeedsDir());
     }
@@ -698,7 +698,7 @@ 
      *
      * @return bool
      */
-    public function blendManyResources($resources=[], $seeds_dir='', $overwrite=false)
+    public function blendManyResources($resources = [], $seeds_dir = '', $overwrite = false)
     {
         $saved = true;
         // will update if resource does exist or create new
@@ -712,19 +712,19 @@ 
                 }
 
                 if ($blendResource->blendFromSeed($seed_key, $overwrite)) {
-                    $this->out($seed_key . ' has been blended into ID: ');
+                    $this->out($seed_key.' has been blended into ID: ');
 
                 } elseif ($blendResource->isExists()) {
                     // @TODO prompt Do you want to blend Y/N/Compare
-                    $this->out($seed_key . ' already exists', true);
+                    $this->out($seed_key.' already exists', true);
                     if ($this->prompt('Would you like to update?', 'Y') === 'Y') {
                         if ($blendResource->blendFromSeed($seed_key, true)) {
-                            $this->out($seed_key . ' has been blended into ID: ');
+                            $this->out($seed_key.' has been blended into ID: ');
                         }
                     }
                 } else {
-                    $this->out('There was an error saving ' . $seed_key, true);
-                    echo 'There was an error saving ' . $seed_key; exit();
+                    $this->out('There was an error saving '.$seed_key, true);
+                    echo 'There was an error saving '.$seed_key; exit();
                     $saved = false;
                 }
             }
@@ -740,7 +740,7 @@ 
      *
      * @return bool
      */
-    public function revertBlendManyResources($resources=[], $seeds_dir='', $overwrite=false)
+    public function revertBlendManyResources($resources = [], $seeds_dir = '', $overwrite = false)
     {
         $saved = true;
         // will update if resource does exist or create new
@@ -753,10 +753,10 @@ 
                     $blendResource->setSeedsDir($seeds_dir);
                 }
                 if ($blendResource->revertBlend()) {
-                    $this->out($seed_key . ' has been reverted ');
+                    $this->out($seed_key.' has been reverted ');
 
                 } else {
-                    $this->out('There was an error reverting resource ' . $seed_key, true);
+                    $this->out('There was an error reverting resource '.$seed_key, true);
                     $saved = false;
                 }
             }
@@ -769,10 +769,10 @@ 
      * @param string $key
      * @return \LCI\Blend\Blendable\SystemSetting
      */
-    public function getBlendableSystemSetting($key='')
+    public function getBlendableSystemSetting($key = '')
     {
         /** @var \LCI\Blend\Blendable\SystemSetting $systemSetting */
-        $systemSetting =  new SystemSetting($this->modx, $this, $key);
+        $systemSetting = new SystemSetting($this->modx, $this, $key);
         return $systemSetting->setSeedsDir($this->getSeedsDir());
     }
 
@@ -782,7 +782,7 @@ 
      *
      * @return bool
      */
-    public function blendManySystemSettings($settings=[], $seeds_dir='')
+    public function blendManySystemSettings($settings = [], $seeds_dir = '')
     {
         $success = true;
         // will update if system setting does exist or create new
@@ -827,7 +827,7 @@ 
      *
      * @return bool
      */
-    public function revertBlendManySystemSettings($settings=[], $seeds_dir='')
+    public function revertBlendManySystemSettings($settings = [], $seeds_dir = '')
     {
         $success = true;
         // will update if system setting does exist or create new
@@ -857,7 +857,7 @@ 
                 $systemSetting->setSeedsDir($seeds_dir);
             }
 
-            if ( $systemSetting->revertBlend() ) {
+            if ($systemSetting->revertBlend()) {
                 $this->out($systemSetting->getFieldName().' setting has been reverted to '.$seeds_dir);
 
             } else {
@@ -875,7 +875,7 @@ 
      *
      * @return mixed
      */
-    protected function prompt($question, $default='')
+    protected function prompt($question, $default = '')
     {
         return $this->userInteractionHandler->promptInput($question, $default);
     }
@@ -885,7 +885,7 @@ 
      * @param bool $default
      * @return bool
      */
-    protected function promptConfirm($question, $default=true)
+    protected function promptConfirm($question, $default = true)
     {
         return $this->userInteractionHandler->promptConfirm($question, $default);
     }
@@ -896,7 +896,7 @@ 
      * @param array $options ~ ex: ['Option1' => 'value', 'Option2' => 'value2', ...]
      * @return mixed ~ selected value
      */
-    protected function promptSelectOneOption($question, $default, $options=[])
+    protected function promptSelectOneOption($question, $default, $options = [])
     {
         return $this->userInteractionHandler->promptSelectOneOption($question, $default, $options);
     }
@@ -907,7 +907,7 @@ 
      * @param array $options ~ ex: ['Option1' => 'value', 'Option2' => 'value2', ...]
      * @return array ~ array of selected values
      */
-    protected function promptSelectMultipleOptions($question, $default, $options=[])
+    protected function promptSelectMultipleOptions($question, $default, $options = [])
     {
         return $this->userInteractionHandler->promptSelectMultipleOptions($question, $default, $options);
     }
@@ -916,7 +916,7 @@ 
      * @param string $message
      * @param bool $error
      */
-    public function out($message, $error=false)
+    public function out($message, $error = false)
     {
         if ($error) {
             $this->userInteractionHandler->tellUser($message, userInteractionHandler::MASSAGE_ERROR);
@@ -940,7 +940,7 @@ 
      *
      * @return bool
      */
-    public function createBlankMigrationClassFile($name, $server_type='master')
+    public function createBlankMigrationClassFile($name, $server_type = 'master')
     {
         return $this->writeMigrationClassFile('blank', [], $server_type, $name);
     }
@@ -953,7 +953,7 @@ 
      *
      * @return array
      */
-    public function makeChunkSeeds($criteria, $server_type='master', $name=null, $create_migration_file=true)
+    public function makeChunkSeeds($criteria, $server_type = 'master', $name = null, $create_migration_file = true)
     {
         $keys = [];
         $collection = $this->modx->getCollection('modChunk', $criteria);
@@ -982,7 +982,7 @@ 
      *
      * @return array
      */
-    public function makeContextSeeds($criteria, $server_type='master', $name=null, $create_migration_file=true)
+    public function makeContextSeeds($criteria, $server_type = 'master', $name = null, $create_migration_file = true)
     {
         $keys = [];
         $collection = $this->modx->getCollection('modContext', $criteria);
@@ -1011,7 +1011,7 @@ 
      *
      * @return array
      */
-    public function makeMediaSourceSeeds($criteria, $server_type='master', $name=null, $create_migration_file=true)
+    public function makeMediaSourceSeeds($criteria, $server_type = 'master', $name = null, $create_migration_file = true)
     {
         $keys = [];
         $collection = $this->modx->getCollection('modMediaSource', $criteria);
@@ -1040,7 +1040,7 @@ 
      *
      * @return array
      */
-    public function makePluginSeeds($criteria, $server_type='master', $name=null, $create_migration_file=true)
+    public function makePluginSeeds($criteria, $server_type = 'master', $name = null, $create_migration_file = true)
     {
         $keys = [];
         $collection = $this->modx->getCollection('modPlugin', $criteria);
@@ -1069,7 +1069,7 @@ 
      *
      * @return array
      */
-    public function makeResourceSeeds($criteria, $server_type='master', $name=null, $create_migration_file=true)
+    public function makeResourceSeeds($criteria, $server_type = 'master', $name = null, $create_migration_file = true)
     {
         $keys = [
             'web' => []
@@ -1104,7 +1104,7 @@ 
      *
      * @return array
      */
-    public function makeSnippetSeeds($criteria, $server_type='master', $name=null, $create_migration_file=true)
+    public function makeSnippetSeeds($criteria, $server_type = 'master', $name = null, $create_migration_file = true)
     {
         $keys = [];
         $collection = $this->modx->getCollection('modSnippet', $criteria);
@@ -1133,7 +1133,7 @@ 
      *
      * @return array
      */
-    public function makeSystemSettingSeeds($criteria, $server_type='master', $name=null, $create_migration_file=true)
+    public function makeSystemSettingSeeds($criteria, $server_type = 'master', $name = null, $create_migration_file = true)
     {
         $collection = $this->modx->getCollection('modSystemSetting', $criteria);
 
@@ -1166,7 +1166,7 @@ 
      *
      * @return array
      */
-    public function makeTemplateSeeds($criteria, $server_type='master', $name=null, $create_migration_file=true)
+    public function makeTemplateSeeds($criteria, $server_type = 'master', $name = null, $create_migration_file = true)
     {
         $keys = [];
         $collection = $this->modx->getCollection('modTemplate', $criteria);
@@ -1191,7 +1191,7 @@ 
      * @param string $server_type
      * @param null|string $name
      */
-    public function makeSiteSeed($server_type='master', $name=null)
+    public function makeSiteSeed($server_type = 'master', $name = null)
     {
         $site_data = [
             'mediaSources' => $this->makeMediaSourceSeeds(null, $server_type, $name, false),
@@ -1211,7 +1211,7 @@ 
      * @param string $method
      * @param bool $prompt
      */
-    public function install($method='up', $prompt=false)
+    public function install($method = 'up', $prompt = false)
     {
         $migration_name = 'install_blender';
         $custom_migration_dir = __DIR__.'/Migrations/Blend/';
@@ -1226,7 +1226,7 @@ 
      * @param string $method
      * @param bool $prompt
      */
-    protected function runInstallMigration($migration_name, $custom_migration_path=null, $seed_root_path=null, $method='up', $prompt=false)
+    protected function runInstallMigration($migration_name, $custom_migration_path = null, $seed_root_path = null, $method = 'up', $prompt = false)
     {
         // new blender for each instance
         $config = $this->config;
@@ -1261,10 +1261,10 @@ 
                 $migration->set('status', 'up_complete');
                 $migration->set('created_at', date('Y-m-d H:i:s'));
                 $migration->set('processed_at', date('Y-m-d H:i:s'));
-                if ($migration->save() ) {
+                if ($migration->save()) {
                     $this->outSuccess($migration_name.' ran and logged');
                 } else {
-                    $this->out($migration_name . ' did not log correctly', true);
+                    $this->out($migration_name.' did not log correctly', true);
                 }
 
                 // does the migration directory exist?
@@ -1279,12 +1279,12 @@ 
                     }
                     if ($create) {
                         mkdir($this->getMigrationPath(), 0700, true);
-                        $this->outSuccess('Created migration directory: '. $this->getMigrationPath());
+                        $this->outSuccess('Created migration directory: '.$this->getMigrationPath());
                     }
                 }
 
             } else {
-                $this->out($migration_name . ' did not log correctly', true);
+                $this->out($migration_name.' did not log correctly', true);
             }
 
         } elseif ($method == 'down') {
@@ -1307,7 +1307,7 @@ 
     /**
      * @param string $branch
      */
-    public function runModxInstallGitBranchMigration($branch, $config=[])
+    public function runModxInstallGitBranchMigration($branch, $config = [])
     {
         $version = '';
         switch ($branch) {
@@ -1324,7 +1324,7 @@ 
     /**
      * @param string $release
      */
-    public function runModxInstallGitReleaseMigration($release, $config=[])
+    public function runModxInstallGitReleaseMigration($release, $config = [])
     {
         $release = str_replace(['.', '-'], '_', $release);
 
@@ -1337,7 +1337,7 @@ 
      * @param string $method
      * @param bool $prompt
      */
-    protected function runModxInstallMigration($migration_name= 'v3_0_0_dev_install', $method='up', $prompt=false)
+    protected function runModxInstallMigration($migration_name = 'v3_0_0_dev_install', $method = 'up', $prompt = false)
     {
         $custom_migration_dir = __DIR__.'/database/modx/migration/';
         $seeds_root_path = __DIR__.'/database/modx/seeds/';
@@ -1348,16 +1348,16 @@ 
     /**
      * @param string $version_key
      */
-    protected function cacheUserInstallConfig($version_key, $config=[])
+    protected function cacheUserInstallConfig($version_key, $config = [])
     {
-        $simpleCache = new SimpleCache(BLEND_CACHE_DIR . 'modx/');
+        $simpleCache = new SimpleCache(BLEND_CACHE_DIR.'modx/');
         $simpleCache->set('install-config-'.$version_key, $config);
     }
 
     /**
      * @param string $method
      */
-    public function update($method='up')
+    public function update($method = 'up')
     {
         $current_vesion = $this->modx->getOption('blend.version');
 
@@ -1368,7 +1368,7 @@ 
         $blender = new Blender($this->modx, $this->getUserInteractionHandler(), $config);
 
         foreach ($this->update_migrations as $v => $migration_name) {
-            if (version_compare($v, $current_vesion) === 1 ) {
+            if (version_compare($v, $current_vesion) === 1) {
                 // can not use as xPDO get queries fill the SELECT with the DB fields and since we are adding one this is a SQL error
                 //$blender->runMigration($method, 'master', 0, 0, $migration_name);
 
@@ -1393,7 +1393,7 @@ 
                         $migration->set('status', 'up_complete');
                         $migration->set('created_at', date('Y-m-d H:i:s'));
                         $migration->set('processed_at', date('Y-m-d H:i:s'));
-                        if ($migration->save() ) {
+                        if ($migration->save()) {
                             $this->outSuccess('Blend updated to '.$v);
                         } else {
                             $this->out('Blend did not update to '.$v, true);
@@ -1433,7 +1433,7 @@ 
 
         $current_vesion = $this->modx->getOption('blend.version');
         //                                      FILE version,        DB Version
-        if ( $this->isBlendInstalledInModx() && ( !$current_vesion || version_compare($this->getVersion(), $current_vesion)) ) {
+        if ($this->isBlendInstalledInModx() && (!$current_vesion || version_compare($this->getVersion(), $current_vesion))) {
             $upgrade = true;
         }
 
@@ -1478,7 +1478,7 @@ 
      * @param int $id
      * @param string $name
      */
-    public function runMigration($method='up', $type='master', $count=0, $id=0, $name=null)
+    public function runMigration($method = 'up', $type = 'master', $count = 0, $id = 0, $name = null)
     {
         $dir = 'ASC';
         if ($method == 'down') {
@@ -1512,7 +1512,7 @@ 
             /** @var string $server_type */
             $server_type = $migration->get('type');
 
-            if ( ($server_type != $type) || ($method == 'up' && $status == 'up_complete') || ($method == 'down' && $status != 'up_complete') ) {
+            if (($server_type != $type) || ($method == 'up' && $status == 'up_complete') || ($method == 'down' && $status != 'up_complete')) {
                 continue;
             }
 
@@ -1610,7 +1610,7 @@ 
         if (file_exists($file)) {
             require_once $file;
 
-            if(class_exists($name)) {
+            if (class_exists($name)) {
                 /** @var Migrations $migrationProcessClass */
                 $migrationProcessClass = new $name($this->modx, $blender);
             }
@@ -1624,7 +1624,7 @@ 
      * @param null $name
      * @return string
      */
-    public function getMigrationName($type, $name=null)
+    public function getMigrationName($type, $name = null)
     {
         $dir_name = 'm'.$this->seeds_dir.'_';
         if (empty($name)) {
@@ -1648,7 +1648,7 @@ 
      *
      * @return bool
      */
-    protected function writeMigrationClassFile($type, $class_data=[], $server_type='master', $name=null, $log=true)
+    protected function writeMigrationClassFile($type, $class_data = [], $server_type = 'master', $name = null, $log = true)
     {
         $class_name = $this->getMigrationName($type, $name);
 
@@ -1743,19 +1743,19 @@ 
 
         $write = false;
         if (file_exists($this->getMigrationPath().$class_name.'.php')) {
-            $this->out($this->getMigrationPath() . $class_name . '.php migration file already exists', true);
+            $this->out($this->getMigrationPath().$class_name.'.php migration file already exists', true);
 
         } elseif (is_object($this->modx->getObject($this->blend_class_object, ['name' => $class_name]))) {
-            $this->out($class_name . ' migration already has been created in the blend_migrations table', true);
+            $this->out($class_name.' migration already has been created in the blend_migrations table', true);
 
         } else {
             try {
-                $write = file_put_contents($this->getMigrationPath() . $class_name . '.php', $file_contents);
+                $write = file_put_contents($this->getMigrationPath().$class_name.'.php', $file_contents);
                 $migration = $this->modx->newObject($this->blend_class_object);
                 if ($migration && $log) {
                     $migration->set('name', $class_name);
                     $migration->set('type', 'master');
-                    $migration->set('description', '');// @TODO
+                    $migration->set('description', ''); // @TODO
                     $migration->set('version', '');
                     $migration->set('status', 'seed export');
                     $migration->set('created_at', date('Y-m-d H:i:s'));
@@ -1765,7 +1765,7 @@ 
                 $this->out($exception->getMessage(), true);
             }
             if (!$write) {
-                $this->out($this->getMigrationPath() . $class_name . '.php Did not write to file', true);
+                $this->out($this->getMigrationPath().$class_name.'.php Did not write to file', true);
                 $this->out('Verify that the folders exists and are writable by PHP', true);
             }
         }
@@ -1785,21 +1785,21 @@ 
         $class_name = $this->getMigrationName($type, $name);
 
         $removed = false;
-        $migration_file = $this->getMigrationPath() . $class_name . '.php';
+        $migration_file = $this->getMigrationPath().$class_name.'.php';
         if (file_exists($migration_file)) {
             if (unlink($migration_file)) {
                 $removed = true;
                 $migration = $this->modx->getObject($this->blend_class_object, ['name' => $class_name]);
                 if (is_object($migration) && $migration->remove()) {
-                    $this->out($class_name . ' migration has been removed from the blend_migrations table');
+                    $this->out($class_name.' migration has been removed from the blend_migrations table');
 
                 }
             } else {
-                $this->out($class_name . ' migration has not been removed from the blend_migrations table', true);
+                $this->out($class_name.' migration has not been removed from the blend_migrations table', true);
             }
 
         } else {
-            $this->out($this->getMigrationPath() . $class_name . '.php migration could not be found to remove', true);
+            $this->out($this->getMigrationPath().$class_name.'.php migration could not be found to remove', true);
         }
 
         return $removed;
@@ -1837,7 +1837,7 @@ 
      *
      * @return bool|int
      */
-    public function getResourceIDFromSeedKey($seed_key, $context='web')
+    public function getResourceIDFromSeedKey($seed_key, $context = 'web')
     {
         if (!isset($this->resource_seek_key_map[$context])) {
             $this->resource_seek_key_map[$context] = [];
@@ -1916,9 +1916,9 @@ 
      *
      * @return string
      */
-    protected function prettyVarExport($data, $tabs=1)
+    protected function prettyVarExport($data, $tabs = 1)
     {
-        $spacing = str_repeat(' ', 4*$tabs);
+        $spacing = str_repeat(' ', 4 * $tabs);
 
         $string = '';
         $parts = preg_split('/\R/', var_export($data, true));

src/Console/BaseCommand.php

Spacing +3 added lines, -3 removed lines

@@ -62,8 +62,8 @@ 
     public function loadModxInstall()
     {
         /* to validate installation, instantiate the modX class and run a few tests */
-        if (include_once (M_CORE_PATH . 'model/modx/modx.class.php')) {
-            $modx = new modX(M_CORE_PATH . 'config/', [
+        if (include_once (M_CORE_PATH.'model/modx/modx.class.php')) {
+            $modx = new modX(M_CORE_PATH.'config/', [
                 \xPDO::OPT_SETUP => true,
             ]);
 
@@ -73,7 +73,7 @@ 
                 $modx->setLogTarget(array(
                     'target' => 'FILE',
                     'options' => array(
-                        'filename' => 'install.' . MODX_CONFIG_KEY . '.' . strftime('%Y%m%dT%H%M%S') . '.log'
+                        'filename' => 'install.'.MODX_CONFIG_KEY.'.'.strftime('%Y%m%dT%H%M%S').'.log'
                     )
                 ));
 

src/Console/ActivePackageCommands.php

Spacing +1 added lines, -1 removed lines

@@ -101,7 +101,7 @@
         foreach ($commands as $command) {
             $class = new $command();
 
-            if (is_object($class) ) {
+            if (is_object($class)) {
                 if (method_exists($class, 'addConsole')) {
                     $class->addConsole($this->console);
                 }

src/Application.php

Spacing +2 added lines, -2 removed lines

@@ -39,9 +39,9 @@
         return new InputDefinition(array(
             new InputArgument('command', InputArgument::REQUIRED, 'The command to execute'),
 
-            new InputOption('--help',           '-h', InputOption::VALUE_NONE, 'Display this help message.'),
+            new InputOption('--help', '-h', InputOption::VALUE_NONE, 'Display this help message.'),
             //new InputOption('--verbose',        '-v|vv|vvv', InputOption::VALUE_NONE, 'Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug.'),
-            new InputOption('--version',        '-V', InputOption::VALUE_NONE, 'Display the Blend version.'),
+            new InputOption('--version', '-V', InputOption::VALUE_NONE, 'Display the Blend version.'),
         ));
     }