XOOPS / XoopsCore

xoops_lib/Xoops/Core/Database/Connection.php

Spacing +6 added lines, -6 removed lines

@@ -80,7 +80,7 @@ 
      */
     public function setForce($force = false)
     {
-        $this->force = (bool) $force;
+        $this->force = (bool)$force;
     }
 
     /**
@@ -135,7 +135,7 @@ 
     {
         $prefix = \XoopsBaseConfig::get('db-prefix');
         if ($tablename != '') {
-            return $prefix . '_' . $tablename;
+            return $prefix.'_'.$tablename;
         } else {
             return $prefix;
         }
@@ -257,14 +257,14 @@ 
             $events->triggerEvent('core.database.query.end');
         } else {
             //$events->triggerEvent('core.database.query.failure', (array('Not safe:')));
-            return (int) 0;
+            return (int)0;
         }
         if ($result != 0) {
             //$events->triggerEvent('core.database.query.success', (array($query)));
-            return (int) $result;
+            return (int)$result;
         } else {
             //$events->triggerEvent('core.database.query.failure', (array($query)));
-            return (int) 0;
+            return (int)0;
         }
     }
 
@@ -331,7 +331,7 @@ 
             $result = call_user_func_array(array('parent', 'query'), func_get_args());
         } catch (\Exception $e) {
             $events->triggerEvent('core.exception', $e);
-            $result=null;
+            $result = null;
         }
         $events->triggerEvent('core.database.query.end');
         if ($result) {

xoops_lib/Xoops/Core/Database/Schema/ExportVisitor.php

Spacing +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
     public function acceptForeignKey(Table $localTable, ForeignKeyConstraint $fkConstraint)
     {
         if (!isset($this->schemaArray['tables'][$localTable->getName()]['constraint'])) {
-            $this->schemaArray['tables'][$localTable->getName()]['constraint']=array();
+            $this->schemaArray['tables'][$localTable->getName()]['constraint'] = array();
         }
         $this->schemaArray['tables'][$localTable->getName()]['constraint'][] = array(
                 'name' => $fkConstraint->getName(),

xoops_lib/Xoops/Core/Database/Schema/PrefixStripper.php

Spacing +3 added lines, -3 removed lines

@@ -41,9 +41,9 @@ 
     /**
      * constructor
      */
-    public function __construct(array $tables=array(), array $sequences=array(), SchemaConfig $schemaConfig=null)
+    public function __construct(array $tables = array(), array $sequences = array(), SchemaConfig $schemaConfig = null)
     {
-        $this->xPrefix = strtolower(\XoopsBaseConfig::get('db-prefix') . '_');
+        $this->xPrefix = strtolower(\XoopsBaseConfig::get('db-prefix').'_');
         $this->xDbName = strtolower(\XoopsBaseConfig::get('db-name'));
         parent::__construct($tables, $sequences, $schemaConfig);
     }
@@ -75,7 +75,7 @@ 
         try {
             $name = $table->getName();
             $len = strlen($this->xPrefix);
-            if (substr_compare($name, $this->xPrefix, 0, $len)===0) {
+            if (substr_compare($name, $this->xPrefix, 0, $len) === 0) {
                 $name = substr($name, $len);
                 if (empty($this->tableList) || in_array($name, $this->tableList)) {
                     $idGeneratorType = 0; // how should we handle this?

xoops_lib/Xoops/Core/Database/Schema/ImportSchema.php

Indentation +2 added lines, -2 removed lines

@@ -120,8 +120,8 @@
                 }
             }
 
-			if (isset($tabledef['options']))
-				$options = $tabledef['options'];
+            if (isset($tabledef['options']))
+                $options = $tabledef['options'];
             $tables[] = new Table(
                 $tableName,
                 $columns,

Spacing +3 added lines, -3 removed lines

@@ -43,7 +43,7 @@ 
      */
     public function __construct()
     {
-        $this->xPrefix = strtolower(\XoopsBaseConfig::get('db-prefix') . '_');
+        $this->xPrefix = strtolower(\XoopsBaseConfig::get('db-prefix').'_');
         $this->xDbName = strtolower(\XoopsBaseConfig::get('db-name'));
     }
 
@@ -81,11 +81,11 @@ 
      */
     public function importTables(array $tableArray)
     {
-        $tables=array();
+        $tables = array();
         foreach ($tableArray as $name => $tabledef) {
             //echo '<h2>Table: ' . $name . '</h2>';
             //Debug::dump($tabledef);
-            $tableName = $this->xPrefix . $name;
+            $tableName = $this->xPrefix.$name;
             $columns = array();
             $indexes = array();
             $fkConstraints = array();

Braces +3 added lines, -2 removed lines

@@ -120,8 +120,9 @@
                 }
             }
 
-			if (isset($tabledef['options']))
-				$options = $tabledef['options'];
+			if (isset($tabledef['options'])) {
+							$options = $tabledef['options'];
+			}
             $tables[] = new Table(
                 $tableName,
                 $columns,

xoops_lib/Xoops/Core/Database/Factory.php

Indentation +3 added lines, -3 removed lines

@@ -51,7 +51,7 @@ 
     {
         static $instance;
         if (!isset($instance)) {
-			$xoops = \Xoops::getInstance();
+            $xoops = \Xoops::getInstance();
             $config = new \Doctrine\DBAL\Configuration();
             $config->setSQLLogger(new XoopsDebugStack());
             $parameters = \XoopsBaseConfig::get('db-parameters');
@@ -70,11 +70,11 @@ 
                     'wrapperClass' => '\Xoops\Core\Database\Connection',
                 );
                 // Support for other doctrine databases
-				$xoops_db_port = \XoopsBaseConfig::get('db-port');
+                $xoops_db_port = \XoopsBaseConfig::get('db-port');
                 if (!empty($xoops_db_port)) {
                     $connectionParams['port'] = $xoops_db_port;
                 }
-				$xoops_db_socket = \XoopsBaseConfig::get('db-socket');
+                $xoops_db_socket = \XoopsBaseConfig::get('db-socket');
                 if (!empty($xoops_db_socket)) {
                     $connectionParams['unix_socket'] = $xoops_db_socket;
                 }

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
                 $connectionParams = $parameters;
                 $connectionParams['wrapperClass'] = '\Xoops\Core\Database\Connection';
             } else {
-                $driver = 'pdo_' . \XoopsBaseConfig::get('db-type');
+                $driver = 'pdo_'.\XoopsBaseConfig::get('db-type');
                 $connectionParams = array(
                     'dbname' => \XoopsBaseConfig::get('db-name'),
                     'user' => \XoopsBaseConfig::get('db-user'),

xoops_lib/Xoops/Core/Assets.php

Spacing +15 added lines, -15 removed lines

@@ -131,15 +131,15 @@ 
             $assetsPrefs = $xoops->cache()->read($this->assetsPrefsCacheKey);
             $file = $xoops->path($this->assetsPrefsFilename);
             $mtime = filemtime($file);
-            if ($assetsPrefs===false || !isset($assetsPrefs['mtime']) || !$mtime
-                || (isset($assetsPrefs['mtime']) && $assetsPrefs['mtime']<$mtime)) {
+            if ($assetsPrefs === false || !isset($assetsPrefs['mtime']) || !$mtime
+                || (isset($assetsPrefs['mtime']) && $assetsPrefs['mtime'] < $mtime)) {
                 if ($mtime) {
                     $assetsPrefs = Yaml::read($file);
                     if (!is_array($assetsPrefs)) {
                         $xoops->logger()->error("Invalid config in system_assets_prefs.yml");
                         $assetsPrefs = array();
                     } else {
-                        $assetsPrefs['mtime']=$mtime;
+                        $assetsPrefs['mtime'] = $mtime;
                         $xoops->cache()->write($this->assetsPrefsCacheKey, $assetsPrefs);
                         $this->copyBaseFileAssets();
                     }
@@ -212,7 +212,7 @@ 
             $assets = array($assets); // just a single path name
         }
 
-        if ($filters==='default') {
+        if ($filters === 'default') {
             if (isset($this->default_filters[$type])) {
                 $filters = $this->default_filters[$type];
             } else {
@@ -311,7 +311,7 @@ 
                 $filters
             );
             $asset_path = $asset->getTargetPath();
-            if (!is_readable($target_path . $asset_path)) {
+            if (!is_readable($target_path.$asset_path)) {
                 $assetKey = 'Asset '.$asset_path;
                 $xoops->events()->triggerEvent('debug.timer.start', $assetKey);
                 $oldumask = umask(0002);
@@ -320,7 +320,7 @@ 
                 $xoops->events()->triggerEvent('debug.timer.stop', $assetKey);
             }
 
-            return $xoops->url('assets/' . $asset_path);
+            return $xoops->url('assets/'.$asset_path);
 
         } catch (\Exception $e) {
             $xoops->events()->triggerEvent('core.exception', $e);
@@ -360,7 +360,7 @@ 
 
         try {
             if (is_scalar($assets)) {
-                $assets = array($assets);  // just a single path name
+                $assets = array($assets); // just a single path name
             }
             foreach ($assets as $a) {
                 // translate path if not a reference or absolute path
@@ -368,10 +368,10 @@ 
                     && (substr_compare($a, '/', 0, 1) != 0)) {
                     $a = $xoops->path($a);
                 }
-                if (false===strpos($a, '*')) {
+                if (false === strpos($a, '*')) {
                     $assetArray[] = new FileAsset($a); // single file
                 } else {
-                    $assetArray[] = new GlobAsset($a);  // wild card match
+                    $assetArray[] = new GlobAsset($a); // wild card match
                 }
             }
 
@@ -452,9 +452,9 @@ 
     {
         $xoops = \Xoops::getInstance();
 
-        $fromPath = $xoops->path($fromPath) . '/';
-        $toPath = $xoops->path('assets') . '/' . $output . '/';
-        $from = glob($fromPath . '/' . $pattern);
+        $fromPath = $xoops->path($fromPath).'/';
+        $toPath = $xoops->path('assets').'/'.$output.'/';
+        $from = glob($fromPath.'/'.$pattern);
 
         if (!is_dir($toPath)) {
             $oldUmask = umask(0);
@@ -468,8 +468,8 @@ 
             foreach ($from as $filepath) {
                 $xoops->events()->triggerEvent('debug.timer.start', $filepath);
                 $filename = basename($filepath);
-                $status=copy($filepath, $toPath.$filename);
-                if (false===$status) {
+                $status = copy($filepath, $toPath.$filename);
+                if (false === $status) {
                     $xoops->logger()->warning('Failed to copy asset '.$filename);
                 } else {
                     //$xoops->logger()->debug('Copied asset '.$filename);
@@ -480,7 +480,7 @@ 
             umask($oldUmask);
             return $count;
         } else {
-            $xoops->logger()->warning('Asset directory is not writable. ' . $output);
+            $xoops->logger()->warning('Asset directory is not writable. '.$output);
             return false;
         }
     }

xoops_lib/Xoops/Core/Locale/Punic/Calendar.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
     {
         switch ($count) {
             case 1:
-                return (string) ((int) $value->format('Y'));
+                return (string)((int)$value->format('Y'));
             case 2:
                 //return $value->format('y');
             default:

xoops_lib/Xoops/Core/Locale/LegacyCodes.php

Spacing +28 added lines, -28 removed lines

@@ -39,34 +39,34 @@
 class LegacyCodes
 {
     private static $rawCodes = array(
-        ['ar_SA', 'ar',      'ar-Arab-SA', ['arabic']],
-        ['bg_BG', 'bg',      'bg-Cyrl-BG', ['bulgarian']],
-        ['cs_CZ', 'cs',      'cs-Latn-CZ', ['czech']],
-        ['da_DK', 'da',      'da-Latn-DK', ['danish']],
-        ['de_DE', 'de',      'de-Latn-DE', ['german']],
-        ['el_GR', 'el',      'el-Grek-GR', ['greek']],
-        ['en_US', 'en',      'en-Latn-US', ['english']],
-        ['es_ES', 'es',      'es-Latn-ES', ['spanish']],
-        ['fa_IR', 'fa',      'fa-Arab-IR', ['persian']],
-        ['fr_FR', 'fr',      'fr-Latn-FR', ['french']],
-        ['hr_HR', 'hr',      'hr-Latn-HR', ['croatian']],
-        ['hu_HU', 'hu',      'hu-Latn-HU', ['hungarian']],
-        ['it_IT', 'it',      'it-Latn-IT', ['italian']],
-        ['ja_JP', 'ja',      'ja-Jpan-JP', ['japanese']],
-        ['ko_KR', 'ko',      'ko-Kore-KR', ['korean']],
-        ['ms_MY', 'ms',      'ms-Latn-MY', ['malaysian']],
-        ['nl_NL', 'nl',      'nl-Latn-NL', ['dutch']],
-        ['no_NO', 'no',      'no-Latn-NO', ['norwegian']],
-        ['pl_PL', 'pl',      'pl-Latn-PL', ['polish']],
-        ['pt_BR', 'pt',      'pt-Latn-BR', ['portuguesebr', 'brazilian']],
-        ['pt_PT', 'pt_PT',   'pt-Latn-PT', ['portuguese']],
-        ['ru_RU', 'ru',      'ru-Cyrl-RU', ['russian']],
-        ['sk_SK', 'sk',      'sk-Latn-SK', ['slovak']],
-        ['sl_SI', 'sl',      'sl-Latn-SI', ['slovenian']],
-        ['sv_SE', 'sv',      'sv-Latn-SE', ['swedish']],
-        ['th_TH', 'th',      'th-Thai-TH', ['thai']],
-        ['tr_TR', 'tr',      'tr-Latn-TR', ['turkish']],
-        ['vi_VN', 'vi',      'vi-Latn-VN', ['vietnamese']],
+        ['ar_SA', 'ar', 'ar-Arab-SA', ['arabic']],
+        ['bg_BG', 'bg', 'bg-Cyrl-BG', ['bulgarian']],
+        ['cs_CZ', 'cs', 'cs-Latn-CZ', ['czech']],
+        ['da_DK', 'da', 'da-Latn-DK', ['danish']],
+        ['de_DE', 'de', 'de-Latn-DE', ['german']],
+        ['el_GR', 'el', 'el-Grek-GR', ['greek']],
+        ['en_US', 'en', 'en-Latn-US', ['english']],
+        ['es_ES', 'es', 'es-Latn-ES', ['spanish']],
+        ['fa_IR', 'fa', 'fa-Arab-IR', ['persian']],
+        ['fr_FR', 'fr', 'fr-Latn-FR', ['french']],
+        ['hr_HR', 'hr', 'hr-Latn-HR', ['croatian']],
+        ['hu_HU', 'hu', 'hu-Latn-HU', ['hungarian']],
+        ['it_IT', 'it', 'it-Latn-IT', ['italian']],
+        ['ja_JP', 'ja', 'ja-Jpan-JP', ['japanese']],
+        ['ko_KR', 'ko', 'ko-Kore-KR', ['korean']],
+        ['ms_MY', 'ms', 'ms-Latn-MY', ['malaysian']],
+        ['nl_NL', 'nl', 'nl-Latn-NL', ['dutch']],
+        ['no_NO', 'no', 'no-Latn-NO', ['norwegian']],
+        ['pl_PL', 'pl', 'pl-Latn-PL', ['polish']],
+        ['pt_BR', 'pt', 'pt-Latn-BR', ['portuguesebr', 'brazilian']],
+        ['pt_PT', 'pt_PT', 'pt-Latn-PT', ['portuguese']],
+        ['ru_RU', 'ru', 'ru-Cyrl-RU', ['russian']],
+        ['sk_SK', 'sk', 'sk-Latn-SK', ['slovak']],
+        ['sl_SI', 'sl', 'sl-Latn-SI', ['slovenian']],
+        ['sv_SE', 'sv', 'sv-Latn-SE', ['swedish']],
+        ['th_TH', 'th', 'th-Thai-TH', ['thai']],
+        ['tr_TR', 'tr', 'tr-Latn-TR', ['turkish']],
+        ['vi_VN', 'vi', 'vi-Latn-VN', ['vietnamese']],
         ['zh_CN', 'zh_Hans', 'zh-Hans-CN', ['schinese']],
         ['zh_TW', 'zh_Hant', 'zh-Hant-TW', ['tchinese', 'chinese_zh']],
     );

xoops_lib/Xoops/Core/ComposerUtility.php

Spacing +6 added lines, -6 removed lines

@@ -54,13 +54,13 @@ 
         $this->output = array();
         $this->errors = array();
 
-        $options = ' ' . trim($this->exeOptions) . ' ';
+        $options = ' '.trim($this->exeOptions).' ';
 
         if (empty($this->exe)) {
             $exeFinder = new PhpExecutableFinder();
             $foundExe = $exeFinder->find();
             if ($foundExe) {
-                $this->exe = $foundExe . ' composer.phar';
+                $this->exe = $foundExe.' composer.phar';
             } else {
                 $this->errors[] = 'Cannot find PHP executable';
                 return false;
@@ -73,14 +73,14 @@ 
         }
 
         set_time_limit(300); // don't want this script to timeout;
-        $command = $this->exe . $options . $command_line;
-        putenv('COMPOSER_HOME=' . \XoopsBaseConfig::get('var-path').'/composer');
+        $command = $this->exe.$options.$command_line;
+        putenv('COMPOSER_HOME='.\XoopsBaseConfig::get('var-path').'/composer');
         $process = new Process($command);
         //$process->setEnv(array('COMPOSER_HOME' => \XoopsBaseConfig::get('var-path').'/composer'));
         $process->setTimeout(120);
         try {
             $process->run(
-                function ($type, $buffer) use (&$errors, &$output) {
+                function($type, $buffer) use (&$errors, &$output) {
                     if (Process::ERR === $type) {
                         $errors[] = $buffer;
                     } else {
@@ -96,7 +96,7 @@ 
             array_unshift($this->output, $process->getErrorOutput());
             return true;
         } else {
-            $this->errors[] = 'Failed: ' . $command;
+            $this->errors[] = 'Failed: '.$command;
             $this->errors[] = sprintf(
                 "Process exit code: %s, '%s'",
                 $process->getExitCode(),