LippertComponents / Blend

src/Model/xPDO/metadata.mysql.php

Spacing +3 added lines, -3 removed lines

@@ -1,11 +1,11 @@
 <?php
-$xpdo_meta_map = array (
+$xpdo_meta_map = array(
     'version' => '3.0',
     'namespace' => 'LCI\\Blend\\Model\\xPDO',
     'class_map' => 
-    array (
+    array(
         'xPDO\\Om\\xPDOSimpleObject' => 
-        array (
+        array(
             0 => 'LCI\\Blend\\Model\\xPDO\\BlendMigrations',
         ),
     ),

src/Console/Modx/Install.php

Spacing +16 added lines, -16 removed lines

@@ -138,7 +138,7 @@ 
             }
         }
 
-        $output->writeln('Done! ' . $this->getRunStats());
+        $output->writeln('Done! '.$this->getRunStats());
 
         return 0;
     }
@@ -175,26 +175,26 @@ 
         $question = new Question('Database Prefix [modx_]: ', 'modx_');
         $dbPrefix = $helper->ask($this->input, $this->output, $question);
 
-        $question = new Question('Hostname (' . gethostname() . ') or IP address for local virtual boxes, default: [192.168.33.10]: ', '192.168.33.10');
+        $question = new Question('Hostname ('.gethostname().') or IP address for local virtual boxes, default: [192.168.33.10]: ', '192.168.33.10');
         $host = $helper->ask($this->input, $this->output, $question);
         $host = rtrim(trim($host), '/');
 
         $defaultBaseUrl = '/';
-        $question = new Question('Base URL [' . $defaultBaseUrl . ']: ', $defaultBaseUrl);
+        $question = new Question('Base URL ['.$defaultBaseUrl.']: ', $defaultBaseUrl);
         $baseUrl = $helper->ask($this->input, $this->output, $question);
-        $baseUrl = '/' . trim(trim($baseUrl), '/') . '/';
+        $baseUrl = '/'.trim(trim($baseUrl), '/').'/';
         $baseUrl = str_replace('//', '/', $baseUrl);
 
         $question = new Question('Manager Language [en]: ', 'en');
         $language = $helper->ask($this->input, $this->output, $question);
 
-        $defaultMgrUser = basename(MODX_PATH) . '_admin';
-        $question = new Question('Manager User [' . $defaultMgrUser . ']: ', $defaultMgrUser);
+        $defaultMgrUser = basename(MODX_PATH).'_admin';
+        $question = new Question('Manager User ['.$defaultMgrUser.']: ', $defaultMgrUser);
         $managerUser = $helper->ask($this->input, $this->output, $question);
 
         $question = new Question('Manager User Password [generated]: ', 'generate');
         $question->setHidden(true);
-        $question->setValidator(function ($value) {
+        $question->setValidator(function($value) {
             if (empty($value) || strlen($value) < 8) {
                 throw new \RuntimeException(
                     'Please specify a password of at least 8 characters to continue.'
@@ -235,11 +235,11 @@ 
             'admin_password' => $managerPass,
             'admin_email' => $managerEmail,
 
-            'core_path' => MODX_PATH . 'core/',
-            'mgr_path' => MODX_PATH . 'manager/',
-            'mgr_url' => $baseUrl . 'manager/',
-            'connectors_path' => MODX_PATH . 'connectors/',
-            'connectors_url' => $baseUrl . 'connectors/',
+            'core_path' => MODX_PATH.'core/',
+            'mgr_path' => MODX_PATH.'manager/',
+            'mgr_url' => $baseUrl.'manager/',
+            'connectors_path' => MODX_PATH.'connectors/',
+            'connectors_url' => $baseUrl.'connectors/',
             'web_path' => MODX_PATH,
             'web_url' => $baseUrl,
             'remove_setup_directory' => true,
@@ -261,7 +261,7 @@ 
      * @param mixed
      * @return bool|mixed
      */
-    protected function getUserInstallConfigValue($key, $default=false)
+    protected function getUserInstallConfigValue($key, $default = false)
     {
         if (isset($this->install_config[$key])) {
             return $this->install_config[$key];
@@ -275,8 +275,8 @@ 
         $modx = null;
 
         /* to validate installation, instantiate the modX class and run a few tests */
-        if (include_once (MODX_PATH . 'core/model/modx/modx.class.php')) {
-            $modx = new \modX(MODX_PATH . 'core/config/', array(
+        if (include_once (MODX_PATH.'core/model/modx/modx.class.php')) {
+            $modx = new \modX(MODX_PATH.'core/config/', array(
                 \xPDO::OPT_SETUP => true,
             ));
             if (!is_object($modx) || !($modx instanceof modX)) {
@@ -285,7 +285,7 @@ 
                 $modx->setLogTarget(array(
                     'target' => 'FILE',
                     'options' => array(
-                        'filename' => 'install.' . (defined('MODX_CONFIG_KEY') ? MODX_CONFIG_PATH : '') . '.' . strftime('%Y%m%dT%H%M%S') . '.log'
+                        'filename' => 'install.'.(defined('MODX_CONFIG_KEY') ? MODX_CONFIG_PATH : '').'.'.strftime('%Y%m%dT%H%M%S').'.log'
                     )
                 ));
 

src/Console/Modx/Upgrade.php

Spacing +1 added lines, -1 removed lines

@@ -113,7 +113,7 @@
 
         }
 
-        $output->writeln('Done! ' . $this->getRunStats());
+        $output->writeln('Done! '.$this->getRunStats());
 
         return 0;
     }

src/Console/Modx/InstallPackage.php

Spacing +13 added lines, -13 removed lines

@@ -74,13 +74,13 @@ 
                     );
 
                     // Try to look for a file with the API Key from a file within the gitify working directory
-                    if (!empty($provider_data['api_key']) && file_exists(MODX_PATH . '/' . $provider_data['api_key'])) {
-                        $credentials['api_key'] = trim(file_get_contents(MODX_PATH . '/' . $provider_data['api_key']));
+                    if (!empty($provider_data['api_key']) && file_exists(MODX_PATH.'/'.$provider_data['api_key'])) {
+                        $credentials['api_key'] = trim(file_get_contents(MODX_PATH.'/'.$provider_data['api_key']));
                     }
 
                     // load provider credentials from file
-                    if (!empty($provider_data['credential_file']) && file_exists(MODX_PATH . '/' . $provider_data['credential_file'])) {
-                        $credentials_content = trim(file_get_contents(MODX_PATH . '/' . $provider_data['credential_file']));
+                    if (!empty($provider_data['credential_file']) && file_exists(MODX_PATH.'/'.$provider_data['credential_file'])) {
+                        $credentials_content = trim(file_get_contents(MODX_PATH.'/'.$provider_data['credential_file']));
                         $credentials = Gitify::fromYAML($credentials_content);
                     }
 
@@ -122,7 +122,7 @@ 
      */
     private function install($package, $provider = 0, array $installOptions = array())
     {
-        $this->modx->addPackage('modx.transport', MODX_CORE_PATH . 'model/');
+        $this->modx->addPackage('modx.transport', MODX_CORE_PATH.'model/');
 
         if (!($provider instanceof \modTransportProvider) && is_numeric($provider) && $provider > 0)
         {
@@ -162,7 +162,7 @@ 
      */
     private function download($packageName, $provider, $options = array()) {
         $this->modx->getVersionData();
-        $product_version = $this->modx->version['code_name'] . '-' . $this->modx->version['full_version'];
+        $product_version = $this->modx->version['code_name'].'-'.$this->modx->version['full_version'];
 
         $response = $provider->verify();
         if ($response !== true) {
@@ -189,13 +189,13 @@ 
         // when we got a match (non 404), extract package information
         if (!$response->isError()) {
 
-            $foundPkg = simplexml_load_string ( $response->response );
+            $foundPkg = simplexml_load_string($response->response);
             
-            $packages [strtolower((string) $foundPkg->name)] = array (
-                'name' => (string) $foundPkg->name,
-                'version' => (string) $foundPkg->version,
-                'location' => (string) $foundPkg->location,
-                'signature' => (string) $foundPkg->signature
+            $packages [strtolower((string)$foundPkg->name)] = array(
+                'name' => (string)$foundPkg->name,
+                'version' => (string)$foundPkg->version,
+                'location' => (string)$foundPkg->location,
+                'signature' => (string)$foundPkg->signature
             );
         }
 
@@ -229,7 +229,7 @@ 
         // process found packages
         if (!empty($packages)) {
 
-            $this->output->writeln('Found ' . count($packages) . ' package(s).');
+            $this->output->writeln('Found '.count($packages).' package(s).');
 
             $helper = $this->getHelper('question');            
             

Braces +1 added lines, -2 removed lines

@@ -244,8 +244,7 @@
 
                     if ($this->interactive) {
                         continue;
-                    }
-                    else {
+                    } else {
                         return true;
                     }
                 }

src/Console/BaseCommand.php

Spacing +8 added lines, -8 removed lines

@@ -79,8 +79,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,
             ]);
 
@@ -90,7 +90,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'
                     )
                 ));
 
@@ -113,9 +113,9 @@ 
         $curTime = microtime(true);
         $duration = $curTime - $this->startTime;
 
-        $output = 'Time: ' . number_format($duration * 1000, 0) . 'ms | ';
-        $output .= 'Memory Usage: ' . $this->convertBytes(memory_get_usage(false)) . ' | ';
-        $output .= 'Peak Memory Usage: ' . $this->convertBytes(memory_get_peak_usage(false));
+        $output = 'Time: '.number_format($duration * 1000, 0).'ms | ';
+        $output .= 'Memory Usage: '.$this->convertBytes(memory_get_usage(false)).' | ';
+        $output .= 'Peak Memory Usage: '.$this->convertBytes(memory_get_peak_usage(false));
         return $output;
     }
 
@@ -125,7 +125,7 @@ 
      */
     protected function convertBytes($bytes)
     {
-        $unit = array('b','kb','mb','gb','tb','pb');
-        return @round($bytes/pow(1024,($i=floor(log($bytes,1024)))),2).' '.$unit[$i];
+        $unit = array('b', 'kb', 'mb', 'gb', 'tb', 'pb');
+        return @round($bytes / pow(1024, ($i = floor(log($bytes, 1024)))), 2).' '.$unit[$i];
     }
 }

src/Console/Seed.php

Spacing +9 added lines, -9 removed lines

@@ -72,25 +72,25 @@ 
         $id = $input->getOption('id');
         $date = $input->getOption('date');
 
-        if ( $object == 'c' || $object == 'chunk' ) {
+        if ($object == 'c' || $object == 'chunk') {
             $this->seedChunks($type, $name, $id);
 
-        } elseif ( $object == 'p' || $object == 'plugin' ) {
+        } elseif ($object == 'p' || $object == 'plugin') {
             $this->seedPlugins($type, $name, $id);
 
-        } elseif ( $object == 'r' || $object == 'resource' ) {
+        } elseif ($object == 'r' || $object == 'resource') {
             $this->seedResources($type, $name, $id, $date);
 
-        }  elseif ( $object == 's' || $object == 'snippet' ) {
+        }  elseif ($object == 's' || $object == 'snippet') {
             $this->seedSnippets($type, $name, $id);
 
-        } elseif ( $object == 'x' || $object == 'systemSettings'  ) {
+        } elseif ($object == 'x' || $object == 'systemSettings') {
             $this->seedSystemSettings($type, $name, $id, $date);
 
-        } elseif ( $object == 't' || $object == 'template'  ) {
+        } elseif ($object == 't' || $object == 'template') {
             $this->seedTemplates($type, $name, $id);
 
-        } elseif ( $object == 'a' || $object == 'site'  ) {
+        } elseif ($object == 'a' || $object == 'site') {
             $this->blender->makeSiteSeed($type, $name);
 
         }
@@ -199,7 +199,7 @@ 
                 $query = $this->modx->newQuery('modResource', ['id:IN' => $ids]);
                 $query->select(['modResource.parent']);
                 $query->prepare();
-                $criteria->orCondition('`modResource`.`id` IN(' . $query->toSQL() . ')');
+                $criteria->orCondition('`modResource`.`id` IN('.$query->toSQL().')');
             }
 
             if ($this->consoleUserInteractionHandler->promptConfirm('Would you like to include direct children?')) {
@@ -208,7 +208,7 @@ 
                 $query->select(['modResource.id']);
                 $query->prepare();
                 $children_sql = $query->toSQL();
-                $criteria->orCondition('`modResource`.`id` IN(' . $children_sql . ')');
+                $criteria->orCondition('`modResource`.`id` IN('.$children_sql.')');
 
                 if ($this->consoleUserInteractionHandler->promptConfirm('Would you like to include direct grand children?')) {
                     // get grand children

Braces +1 added lines, -1 removed lines

@@ -81,7 +81,7 @@
         } elseif ( $object == 'r' || $object == 'resource' ) {
             $this->seedResources($type, $name, $id, $date);
 
-        }  elseif ( $object == 's' || $object == 'snippet' ) {
+        } elseif ( $object == 's' || $object == 'snippet' ) {
             $this->seedSnippets($type, $name, $id);
 
         } elseif ( $object == 'x' || $object == 'systemSettings'  ) {

src/Console/Migrate.php

Spacing +1 added lines, -1 removed lines

@@ -75,7 +75,7 @@
         $id = $input->getOption('id');
         $count = $input->getOption('count');
 
-        if ( $input->getOption('generate') ) {
+        if ($input->getOption('generate')) {
             $output->writeln('Generate name: '.$name);
             // create a blank migration class
             $this->blender->createBlankMigrationClassFile($name, $type);

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->getName().' 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/database/modx/migration/v3_0_0_dev_install.php

Spacing +40 added lines, -40 removed lines

@@ -18,10 +18,10 @@ 
 
         if (!$connected) {
             // connect with xPDO:
-            $dsnArray= \xPDO\xPDO :: parseDSN($this->modx->getOption('dsn'));
+            $dsnArray = \xPDO\xPDO :: parseDSN($this->modx->getOption('dsn'));
 
             // Create the MODX database:
-            $created= $this->modx->manager->createSourceContainer($dsnArray, $this->modx->config['username'], $this->modx->config['password']);
+            $created = $this->modx->manager->createSourceContainer($dsnArray, $this->modx->config['username'], $this->modx->config['password']);
             if (!$created) {
                 $this->addResultMessage([xPDO::LOG_LEVEL_ERROR => $this->modx->lexicon('db_err_create')]);
             } else {
@@ -44,7 +44,7 @@ 
 
             // create MODX tables
             foreach ($this->modx_tables as $class) {
-                if (!$dbcreated= $this->modx->manager->createObjectContainer($class)) {
+                if (!$dbcreated = $this->modx->manager->createObjectContainer($class)) {
                     $this->addResultMessage([xPDO::LOG_LEVEL_ERROR => $this->modx->lexicon('table_err_create', ['class' => $class])]);
                 } else {
                     $this->addResultMessage([xPDO::LOG_LEVEL_DEBUG + 1 => $this->modx->lexicon('table_created', ['class' => $class])]);
@@ -143,10 +143,10 @@ 
 
         // drop tables
         foreach ($this->modx_tables as $class) {
-            if (!$dbcreated= $this->modx->manager->removeObjectContainer($class)) {
-                $this->results[]= [xPDO::LOG_LEVEL_ERROR => $this->modx->lexicon('table_err_remove', ['class' => $class])];
+            if (!$dbcreated = $this->modx->manager->removeObjectContainer($class)) {
+                $this->results[] = [xPDO::LOG_LEVEL_ERROR => $this->modx->lexicon('table_err_remove', ['class' => $class])];
             } else {
-                $this->results[]= [xPDO::LOG_LEVEL_DEBUG + 1 => $this->modx->lexicon('table_removed', ['class' => $class])];
+                $this->results[] = [xPDO::LOG_LEVEL_DEBUG + 1 => $this->modx->lexicon('table_removed', ['class' => $class])];
             }
         }
 
@@ -241,7 +241,7 @@ 
         }
 
         /* if language != en, set cultureKey, manager_language, manager_lang_attribute to it */
-        $language = $this->getUserInstallConfigValue('language','en');
+        $language = $this->getUserInstallConfigValue('language', 'en');
         if ($language != 'en') {
             /** @var \LCI\Blend\Blendable\SystemSetting $systemSetting */
             $systemSetting = $this->blender->getBlendableSystemSetting();
@@ -280,7 +280,7 @@ 
 
         $maxFileSize = ini_get('upload_max_filesize');
         $maxFileSize = trim($maxFileSize);
-        $last = strtolower($maxFileSize[strlen($maxFileSize)-1]);
+        $last = strtolower($maxFileSize[strlen($maxFileSize) - 1]);
         switch ($last) {
             // The 'G' modifier is available since PHP 5.1.0
             case 'g':
@@ -305,15 +305,15 @@ 
     {
         /** @var \modNamespace $namespace */
         $namespace = $this->modx->newObject('modNamespace');
-        $namespace->set('name','core');
-        $namespace->set('path','{core_path}');
-        $namespace->set('assets_path','{assets_path}');
+        $namespace->set('name', 'core');
+        $namespace->set('path', '{core_path}');
+        $namespace->set('assets_path', '{assets_path}');
 
         $namespace->save();
 
         /** @var \modWorkspace $workspace */
         $workspace = $this->modx->newObject('modWorkspace');
-        $workspace->fromArray(array (
+        $workspace->fromArray(array(
             'id' => 1,
             'name' => 'Default MODX workspace',
             'path' => '{core_path}',
@@ -323,7 +323,7 @@ 
 
         /* modx.com extras provisioner */
         $transportProvider = $this->modx->newObject('transport.modTransportProvider');
-        $transportProvider->fromArray(array (
+        $transportProvider->fromArray(array(
             'id' => 1,
             'name' => 'modx.com',
             'description' => 'The official MODX transport provider for 3rd party components.',
@@ -340,12 +340,12 @@ 
 
         /* setup load only anonymous ACL */
         /** @var modAccessPolicy $loadOnly */
-        $loadOnly = $this->modx->getObject('modAccessPolicy',array(
+        $loadOnly = $this->modx->getObject('modAccessPolicy', array(
             'name' => 'Load Only',
         ));
         if ($loadOnly) {
             /** @var modAccessContext $access */
-            $access= $this->modx->newObject('modAccessContext');
+            $access = $this->modx->newObject('modAccessContext');
             $access->fromArray(array(
                 'target' => 'web',
                 'principal_class' => 'modUserGroup',
@@ -361,16 +361,16 @@ 
 
         /* setup default admin ACLs */
         /** @var modAccessPolicy $adminPolicy */
-        $adminPolicy = $this->modx->getObject('modAccessPolicy',array(
+        $adminPolicy = $this->modx->getObject('modAccessPolicy', array(
             'name' => 'Administrator',
         ));
         /** @var modUserGroup $adminGroup */
-        $adminGroup = $this->modx->getObject('modUserGroup',array(
+        $adminGroup = $this->modx->getObject('modUserGroup', array(
             'name' => 'Administrator',
         ));
         if ($adminPolicy && $adminGroup) {
             /** @var modAccessContext $access */
-            $access= $this->modx->newObject('modAccessContext');
+            $access = $this->modx->newObject('modAccessContext');
             $access->fromArray(array(
                 'target' => 'mgr',
                 'principal_class' => 'modUserGroup',
@@ -381,7 +381,7 @@ 
             $access->save();
             unset($access);
 
-            $access= $this->modx->newObject('modAccessContext');
+            $access = $this->modx->newObject('modAccessContext');
             $access->fromArray(array(
                 'target' => 'web',
                 'principal_class' => 'modUserGroup',
@@ -392,7 +392,7 @@ 
             $access->save();
             unset($access);
         }
-        unset($adminPolicy,$adminGroup);
+        unset($adminPolicy, $adminGroup);
     }
 
     /**
@@ -423,7 +423,7 @@ 
                 $userGroupMembership->set('role', 2);
                 $saved = $userGroupMembership->save();
 
-                $user->set('primary_group',1);
+                $user->set('primary_group', 1);
                 $user->save();
             }
             if ($saved) {
@@ -436,7 +436,7 @@ 
             }
         }
         if (!$saved) {
-            $this->addResultMessage([xPDO::LOG_LEVEL_ERROR => $this->modx->lexicon('dau_err_save').'<br />' . print_r($this->modx->errorInfo(), true)]);
+            $this->addResultMessage([xPDO::LOG_LEVEL_ERROR => $this->modx->lexicon('dau_err_save').'<br />'.print_r($this->modx->errorInfo(), true)]);
         } else {
             $this->addResultMessage([xPDO::LOG_LEVEL_DEBUG + 1 => $this->modx->lexicon('dau_saved')]);
         }
@@ -447,7 +447,7 @@ 
     protected function upAttachPolicyTemplates()
     {
         // replaces: _build/resolvers/resolve.policytemplates.php
-        $success= false;
+        $success = false;
 
         /* map of Template -> TemplateGroup */
         $map = [
@@ -463,9 +463,9 @@ 
         $templates = $this->modx->getCollection('modAccessPolicyTemplate');
         foreach ($templates as $template) {
             if (isset($map[$template->get('name')])) {
-                $templateGroup = $this->modx->getObject('modAccessPolicyTemplateGroup',array('name' => $map[$template->get('name')]));
+                $templateGroup = $this->modx->getObject('modAccessPolicyTemplateGroup', array('name' => $map[$template->get('name')]));
                 if ($templateGroup) {
-                    $template->set('template_group',$templateGroup->get('id'));
+                    $template->set('template_group', $templateGroup->get('id'));
                     $success = $template->save();
                 } else {
                     $this->modx->log(xPDO::LOG_LEVEL_ERROR, "Core AccessPolicyTemplateGroup {$map[$template->get('name')]} is missing!");
@@ -481,7 +481,7 @@ 
     {
         // replaces: _build/resolvers/resolve.policies.php
 
-        $success= false;
+        $success = false;
 
         /* map of Policy -> Template */
         $map = [
@@ -501,9 +501,9 @@ 
         $policies = $this->modx->getCollection('modAccessPolicy');
         foreach ($policies as $policy) {
             if (isset($map[$policy->get('name')])) {
-                $template = $this->modx->getObject('modAccessPolicyTemplate',array('name' => $map[$policy->get('name')]));
+                $template = $this->modx->getObject('modAccessPolicyTemplate', array('name' => $map[$policy->get('name')]));
                 if ($template) {
-                    $policy->set('template',$template->get('id'));
+                    $policy->set('template', $template->get('id'));
                     $success = $policy->save();
                 } else {
                     $this->modx->log(xPDO::LOG_LEVEL_ERROR, "Core AccessPolicyTemplate {$map[$policy->get('name')]} is missing! Could not resolve AccessPolicy {$policy->get('name')}.");
@@ -542,20 +542,20 @@ 
         //$widgets = $this->modx->getCollection('modDashboardWidget');
         foreach ($map as $widgetName) {
             /** @var \modDashboardWidget $widget */
-            $widget = $this->modx->getObject('modDashboardWidget',array(
+            $widget = $this->modx->getObject('modDashboardWidget', array(
                 'name' => $widgetName,
             ));
             if ($widget) {
                 /** @var \modDashboardWidgetPlacement $placement */
-                $placement = $this->modx->getObject('modDashboardWidgetPlacement',array(
+                $placement = $this->modx->getObject('modDashboardWidgetPlacement', array(
                     'widget' => $widget->get('id'),
                     'dashboard' => $dashboard->get('id'),
                 ));
                 if (!$placement) {
                     $placement = $this->modx->newObject('modDashboardWidgetPlacement');
-                    $placement->set('widget',$widget->get('id'));
-                    $placement->set('dashboard',$dashboard->get('id'));
-                    $placement->set('rank',$idx);
+                    $placement->set('widget', $widget->get('id'));
+                    $placement->set('dashboard', $dashboard->get('id'));
+                    $placement->set('rank', $idx);
                     $success = $placement->save();
                 } else {
                     $success = true;
@@ -569,7 +569,7 @@ 
     protected function upAttachActionFields()
     {
         // replaces: _build/resolvers/resolve.actionfields.php
-        $success= true;
+        $success = true;
 
         $xmlFile = MODX_CORE_PATH.'model/schema/modx.action.fields.schema.xml';
         if (!file_exists($xmlFile)) return false;
@@ -590,7 +590,7 @@ 
             foreach ($action->tab as $tab) {
                 $tabName = (string)$tab['name'];
                 if ($tabName != 'modx-resource-content') {
-                    $tabObj = $this->modx->getObject('modActionField',array(
+                    $tabObj = $this->modx->getObject('modActionField', array(
                         'action' => (string)$action['controller'],
                         'name' => $tabName,
                         'type' => 'tab',
@@ -612,7 +612,7 @@ 
 
                 $fieldIdx = 0;
                 foreach ($tab->field as $field) {
-                    $fieldObj = $this->modx->getObject('modActionField',array(
+                    $fieldObj = $this->modx->getObject('modActionField', array(
                         'action' => (string)$action['controller'],
                         'name' => (string)$field['name'],
                         'type' => 'field',
@@ -644,7 +644,7 @@ 
     {
         /** @var \modContext $webContext */
         $webContext = $this->modx->newObject('modContext');
-        $webContext->fromArray(array (
+        $webContext->fromArray(array(
             'key' => 'web',
             'name' => 'Website',
             'description' => 'The default front-end context for your web site.',
@@ -654,7 +654,7 @@ 
 
         /** @var \modContext $managerContext */
         $managerContext = $this->modx->newObject('modContext');
-        $managerContext->fromArray(array (
+        $managerContext->fromArray(array(
             'key' => 'mgr',
             'name' => 'Manager',
             'description' => 'The default manager or administration context for content management activity.',
@@ -665,7 +665,7 @@ 
     protected function upInitSiteContent()
     {
         /* add base template and home resource */
-        $templateContent = file_get_contents($this->blender->getSeedsPath($this->getSeedsDir()) . 'base_template.tpl');
+        $templateContent = file_get_contents($this->blender->getSeedsPath($this->getSeedsDir()).'base_template.tpl');
 
         $template_name = ($this->modx->lexicon('base_template') ? $this->modx->lexicon('base_template') : 'Base Template');
         /** @var \LCI\Blend\Blendable\Template $baseTemplate */
@@ -693,7 +693,7 @@ 
                 /** @var modResource $resource */
                 $resource = $blendResource->getResourceFromSeedKey('index');
                 $resource->set('pagetitle', (!empty($this->modx->lexicon('home')) ? $this->modx->lexicon('home') : 'Home'));
-                $resource->set('longtitle', ( !empty($this->modx->lexicon('congratulations')) ? $this->modx->lexicon('congratulations') : 'Congratulations'));
+                $resource->set('longtitle', (!empty($this->modx->lexicon('congratulations')) ? $this->modx->lexicon('congratulations') : 'Congratulations'));
                 $resource->set('template', $template->get('id'));
 
                 if ($resource->save()) {

Braces +6 added lines, -2 removed lines

@@ -572,10 +572,14 @@
         $success= true;
 
         $xmlFile = MODX_CORE_PATH.'model/schema/modx.action.fields.schema.xml';
-        if (!file_exists($xmlFile)) return false;
+        if (!file_exists($xmlFile)) {
+            return false;
+        }
 
         $xml = @file_get_contents($xmlFile);
-        if (empty($xml)) return false;
+        if (empty($xml)) {
+            return false;
+        }
 
         $xml = @simplexml_load_string($xml);