Yapeal / yapeal-ng

lib/Sql/CommonSqlQueries.php

Doc Comments +1 added lines, -1 removed lines

@@ -372,7 +372,7 @@
     }
     /**
      * @param string $tableName
-     * @param array  $columnNameList
+     * @param string[]  $columnNameList
      * @param string $rowCount
      *
      * @return string

lib/Xsd/Creator.php

Indentation +12 added lines, -12 removed lines

@@ -154,18 +154,18 @@
         }
         $name = strtolower($name);
         foreach ([
-                     'descr' => 'xs:string',
-                     'name' => 'eveNameType',
-                     'balance' => 'eveISKType',
-                     'isk' => 'eveISKType',
-                     'tax' => 'eveISKType',
-                     'timeefficiency' => 'xs:unsignedByte',
-                     'date' => 'eveNEDTType',
-                     'time' => 'eveNEDTType',
-                     'until' => 'eveNEDTType',
-                     'errorcode' => 'xs:unsignedShort',
-                     'level' => 'xs:unsignedShort'
-                 ] as $search => $replace) {
+                        'descr' => 'xs:string',
+                        'name' => 'eveNameType',
+                        'balance' => 'eveISKType',
+                        'isk' => 'eveISKType',
+                        'tax' => 'eveISKType',
+                        'timeefficiency' => 'xs:unsignedByte',
+                        'date' => 'eveNEDTType',
+                        'time' => 'eveNEDTType',
+                        'until' => 'eveNEDTType',
+                        'errorcode' => 'xs:unsignedShort',
+                        'level' => 'xs:unsignedShort'
+                    ] as $search => $replace) {
             if (false !== strpos($name, $search)) {
                 return $replace;
             }

Spacing +4 added lines, -4 removed lines

@@ -103,7 +103,7 @@ 
             'className' => lcfirst($data->getEveApiName()),
             'tables' => $this->tables,
             'sectionName' => lcfirst($this->sectionName),
-            'version' => gmdate('YmdHis', $sec) . sprintf('.%0-3s', floor($mSec * 1000))
+            'version' => gmdate('YmdHis', $sec).sprintf('.%0-3s', floor($mSec * 1000))
         ];
         try {
             $contents = $this->getTwig()
@@ -200,7 +200,7 @@ 
             foreach ($colNames as $colName) {
                 $columns[$colName] = $this->inferTypeFromName($colName);
             }
-            uksort($columns, function ($a, $b) {
+            uksort($columns, function($a, $b) {
                 $a = strtolower($a);
                 $b = strtolower($b);
                 if ($a < $b) {
@@ -212,7 +212,7 @@ 
             });
             $tables[$tableName] = ['attributes' => $columns];
         }
-        uksort($tables, function ($a, $b) {
+        uksort($tables, function($a, $b) {
             $a = strtolower($a);
             $b = strtolower($b);
             if ($a < $b) {
@@ -249,7 +249,7 @@ 
             $name = (string)$ele->getName();
             $columns[$name] = $this->inferTypeFromName($name, true);
         }
-        uksort($columns, function ($a, $b) {
+        uksort($columns, function($a, $b) {
             $a = strtolower($a);
             $b = strtolower($b);
             if ($a < $b) {

lib/Console/Command/AbstractDatabaseCommon.php

Spacing +3 added lines, -3 removed lines

@@ -119,7 +119,7 @@ 
          */
         $statements = str_replace(array_keys($replacements), array_values($replacements), explode(';', $sqlStatements));
         // 5 is a 'magic' number that I think is shorter than any legal SQL statement.
-        $statements = array_filter($statements, function ($value) {
+        $statements = array_filter($statements, function($value) {
             return 5 <= strlen(trim($value));
         });
         $progress = null;
@@ -147,7 +147,7 @@ 
                     $progress->finish();
                     $output->writeln('');
                 }
-                $mess = $sql . PHP_EOL;
+                $mess = $sql.PHP_EOL;
                 $mess .= sprintf(
                     'Sql failed in %1$s on statement %2$s with (%3$s) %4$s',
                     $fileName,
@@ -178,7 +178,7 @@ 
         $dic = $this->getDic();
         foreach (['class', 'database', 'hostName', 'password', 'platform', 'tablePrefix', 'userName'] as $option) {
             if ($input->hasOption($option)) {
-                $dic[$base . $option] = $input->getOption($option);
+                $dic[$base.$option] = $input->getOption($option);
             }
         }
         if ($input->hasOption('configFile')) {

lib/Console/Command/DatabaseInitializer.php

Spacing +2 added lines, -2 removed lines

@@ -151,9 +151,9 @@
             if ('Database' === $dir && $this->dropDatabase) {
                 // Add drop database file if requested.
                 $fileList[] = $this->getFpn()
-                    ->normalizeFile($path . $dir . '/DropDatabase.sql');
+                    ->normalizeFile($path.$dir.'/DropDatabase.sql');
             }
-            foreach (new \DirectoryIterator($path . $dir . '/') as $fileInfo) {
+            foreach (new \DirectoryIterator($path.$dir.'/') as $fileInfo) {
                 // Add file path if it's a sql create file.
                 if ($fileInfo->isFile()
                     && 'sql' === $fileInfo->getExtension()

lib/EveApi/CommonEveApiTrait.php

Spacing +2 added lines, -2 removed lines

@@ -181,7 +181,7 @@ 
                 ->triggerLogEvent('Yapeal.Log.log', Logger::WARNING, $this->createEveApiMessage($mess, $data));
             return false;
         }
-        if (strtotime($expires[0]['expires'] . '+00:00') < time()) {
+        if (strtotime($expires[0]['expires'].'+00:00') < time()) {
             $mess = 'Expired UtilCachedUntil record found for';
             $this->getYem()
                 ->triggerLogEvent('Yapeal.Log.log', Logger::DEBUG, $this->createEveApiMessage($mess, $data));
@@ -288,7 +288,7 @@ 
         if ('' === $currentTime) {
             return $this;
         }
-        $dateTime = gmdate('Y-m-d H:i:s', strtotime($currentTime . '+00:00') + $data->getCacheInterval());
+        $dateTime = gmdate('Y-m-d H:i:s', strtotime($currentTime.'+00:00') + $data->getCacheInterval());
         $row = [
             'accountKey' => $data->hasEveApiArgument('accountKey') ? $data->getEveApiArgument('accountKey') : '0',
             'apiName' => $data->getEveApiName(),

lib/EveApi/Creator.php

Indentation +10 added lines, -10 removed lines

@@ -166,16 +166,16 @@
         $name = strtolower($name);
         $column = 'null';
         foreach ([
-                     'descr' => '\'\'',
-                     'name' => '\'\'',
-                     'balance' => '\'0.0\'',
-                     'isk' => '\'0.0\'',
-                     'tax' => '\'0.0\'',
-                     'timeefficiency' => 'null',
-                     'date' => '\'1970-01-01 00:00:01\'',
-                     'time' => '\'1970-01-01 00:00:01\'',
-                     'until' => '\'1970-01-01 00:00:01\''
-                 ] as $search => $replace) {
+                        'descr' => '\'\'',
+                        'name' => '\'\'',
+                        'balance' => '\'0.0\'',
+                        'isk' => '\'0.0\'',
+                        'tax' => '\'0.0\'',
+                        'timeefficiency' => 'null',
+                        'date' => '\'1970-01-01 00:00:01\'',
+                        'time' => '\'1970-01-01 00:00:01\'',
+                        'until' => '\'1970-01-01 00:00:01\''
+                    ] as $search => $replace) {
             if (false !== strpos($name, $search)) {
                 return $replace;
             }

Spacing +3 added lines, -3 removed lines

@@ -143,7 +143,7 @@ 
      */
     protected function getNamespace()
     {
-        return 'Yapeal\EveApi\\' . ucfirst($this->sectionName);
+        return 'Yapeal\EveApi\\'.ucfirst($this->sectionName);
     }
     /**
      * Used to determine if API is in section that has an owner.
@@ -209,7 +209,7 @@ 
             if ($this->hasOwner()) {
                 $attributes['ownerID'] = '$ownerID';
             }
-            uksort($attributes, function ($a, $b) {
+            uksort($attributes, function($a, $b) {
                 $a = strtolower($a);
                 $b = strtolower($b);
                 if ($a < $b) {
@@ -251,7 +251,7 @@ 
         if ($this->hasOwner()) {
             $values['ownerID'] = '$ownerID';
         }
-        uksort($values, function ($a, $b) {
+        uksort($values, function($a, $b) {
             $a = strtolower($a);
             $b = strtolower($b);
             if ($a < $b) {

lib/Sql/Creator.php

Indentation +18 added lines, -18 removed lines

@@ -228,24 +228,24 @@
         }
         $name = strtolower($name);
         foreach ([
-                     'descr' => 'TEXT NOT NULL',
-                     'name' => 'CHAR(100) NOT NULL',
-                     'balance' => 'DECIMAL(17, 2) NOT NULL',
-                     'isk' => 'DECIMAL(17, 2) NOT NULL',
-                     'tax' => 'DECIMAL(17, 2) NOT NULL',
-                     'timeefficiency' => 'TINYINT(3) UNSIGNED NOT NULL',
-                     'date' => 'DATETIME NOT NULL DEFAULT \'1970-01-01 00:00:01\'',
-                     'time' => 'DATETIME NOT NULL DEFAULT \'1970-01-01 00:00:01\'',
-                     'until' => 'DATETIME NOT NULL DEFAULT \'1970-01-01 00:00:01\'',
-                     'errorcode' => 'SMALLINT(4) UNSIGNED NOT NULL',
-                     'level' => 'SMALLINT(4) UNSIGNED NOT NULL',
-                     'logoncount' => 'BIGINT(20) UNSIGNED NOT NULL',
-                     'logonminutes' => 'BIGINT(20) UNSIGNED NOT NULL',
-                     'trainingend' => 'DATETIME NOT NULL DEFAULT \'1970-01-01 00:00:01\'',
-                     'skillintraining' => 'BIGINT(20) UNSIGNED NOT NULL',
-                     'trainingdestinationsp' => 'BIGINT(20) UNSIGNED NOT NULL',
-                     'trainingstartsp' => 'BIGINT(20) UNSIGNED NOT NULL'
-                 ] as $search => $replace) {
+                        'descr' => 'TEXT NOT NULL',
+                        'name' => 'CHAR(100) NOT NULL',
+                        'balance' => 'DECIMAL(17, 2) NOT NULL',
+                        'isk' => 'DECIMAL(17, 2) NOT NULL',
+                        'tax' => 'DECIMAL(17, 2) NOT NULL',
+                        'timeefficiency' => 'TINYINT(3) UNSIGNED NOT NULL',
+                        'date' => 'DATETIME NOT NULL DEFAULT \'1970-01-01 00:00:01\'',
+                        'time' => 'DATETIME NOT NULL DEFAULT \'1970-01-01 00:00:01\'',
+                        'until' => 'DATETIME NOT NULL DEFAULT \'1970-01-01 00:00:01\'',
+                        'errorcode' => 'SMALLINT(4) UNSIGNED NOT NULL',
+                        'level' => 'SMALLINT(4) UNSIGNED NOT NULL',
+                        'logoncount' => 'BIGINT(20) UNSIGNED NOT NULL',
+                        'logonminutes' => 'BIGINT(20) UNSIGNED NOT NULL',
+                        'trainingend' => 'DATETIME NOT NULL DEFAULT \'1970-01-01 00:00:01\'',
+                        'skillintraining' => 'BIGINT(20) UNSIGNED NOT NULL',
+                        'trainingdestinationsp' => 'BIGINT(20) UNSIGNED NOT NULL',
+                        'trainingstartsp' => 'BIGINT(20) UNSIGNED NOT NULL'
+                    ] as $search => $replace) {
             if (false !== strpos($name, $search)) {
                 return $replace;
             }

Spacing +5 added lines, -5 removed lines

@@ -112,7 +112,7 @@ 
             'className' => lcfirst($this->apiName),
             'tables' => $this->tables,
             'sectionName' => lcfirst($this->sectionName),
-            'version' => gmdate('YmdHis', $sec) . substr($mSec, 1, 4)
+            'version' => gmdate('YmdHis', $sec).substr($mSec, 1, 4)
         ];
         try {
             $contents = $this->getTwig()
@@ -184,7 +184,7 @@ 
         $names = explode(
             ',',
             sprintf(
-                '%1$s/%2$s.%3$s.%4$s,%1$s/%2$s.%4$s,%1$s/%3$s.%4$s,' . '%2$s.%3$s.%4$s,%2$s.%4$s,%3$s.%4$s,sql.%4$s',
+                '%1$s/%2$s.%3$s.%4$s,%1$s/%2$s.%4$s,%1$s/%3$s.%4$s,'.'%2$s.%3$s.%4$s,%2$s.%4$s,%3$s.%4$s,sql.%4$s',
                 ucfirst($data->getEveApiSectionName()),
                 $data->getEveApiName(),
                 $platform,
@@ -192,7 +192,7 @@ 
             )
         );
         foreach ($names as $fileName) {
-            if (is_file($this->getDir() . $fileName)) {
+            if (is_file($this->getDir().$fileName)) {
                 return $fileName;
             }
         }
@@ -277,7 +277,7 @@ 
             if ($this->hasOwner()) {
                 $columns['ownerID'] = 'BIGINT(20) UNSIGNED NOT NULL';
             }
-            uksort($columns, function ($a, $b) {
+            uksort($columns, function($a, $b) {
                 $a = strtolower($a);
                 $b = strtolower($b);
                 if ($a < $b) {
@@ -319,7 +319,7 @@ 
         if ($this->hasOwner()) {
             $columns['ownerID'] = 'BIGINT(20) UNSIGNED NOT NULL';
         }
-        uksort($columns, function ($a, $b) {
+        uksort($columns, function($a, $b) {
             $a = strtolower($a);
             $b = strtolower($b);
             if ($a < $b) {

lib/Sql/PreserverTrait.php

Spacing +1 added lines, -1 removed lines

@@ -156,7 +156,7 @@
             ->triggerLogEvent('Yapeal.Log.log', Logger::INFO, $mess);
         $mess = implode(',', $columns);
         if (512 < strlen($mess)) {
-            $mess = substr($mess, 0, 512) . '...';
+            $mess = substr($mess, 0, 512).'...';
         }
         $this->getYem()
             ->triggerLogEvent('Yapeal.Log.log', Logger::DEBUG, $mess);

lib/Configuration/Wiring.php

Spacing +17 added lines, -17 removed lines

@@ -106,7 +106,7 @@ 
     {
         $names = ['Config', 'Error', 'Event', 'Log', 'Sql', 'Xml', 'Xsd', 'Xsl', 'Cache', 'Network', 'EveApi'];
         foreach ($names as $name) {
-            $className = __NAMESPACE__ . '\\' . $name . 'Wiring';
+            $className = __NAMESPACE__.'\\'.$name.'Wiring';
             if (class_exists($className, true)) {
                 /**
                  * @var WiringInterface $class
@@ -115,11 +115,11 @@ 
                 $class->wire($this->dic);
                 continue;
             }
-            $methodName = 'wire' . $name;
+            $methodName = 'wire'.$name;
             if (method_exists($this, $methodName)) {
                 $this->$methodName();
             } else {
-                $mess = 'Could NOT find class or method for ' . $name;
+                $mess = 'Could NOT find class or method for '.$name;
                 throw new \LogicException($mess);
             }
         }
@@ -143,7 +143,7 @@ 
         do {
             $settings = preg_replace_callback(
                 $regEx,
-                function ($match) use ($settings, $dic) {
+                function($match) use ($settings, $dic) {
                     if (!empty($settings[$match['name']])) {
                         return $settings[$match['name']];
                     }
@@ -164,7 +164,7 @@ 
             if (PREG_NO_ERROR !== $lastError) {
                 $constants = array_flip(get_defined_constants(true)['pcre']);
                 $lastError = $constants[$lastError];
-                $mess = 'Received preg error ' . $lastError;
+                $mess = 'Received preg error '.$lastError;
                 throw new \DomainException($mess);
             }
         } while ($count > 0);
@@ -183,7 +183,7 @@ 
         $rdi->setFlags($flags);
         /** @noinspection SpellCheckingInspection */
         $rcfi = new \RecursiveCallbackFilterIterator(
-            $rdi, function (\SplFileInfo $current, $key, \RecursiveDirectoryIterator $rdi) {
+            $rdi, function(\SplFileInfo $current, $key, \RecursiveDirectoryIterator $rdi) {
             if ($rdi->hasChildren()) {
                 return true;
             }
@@ -218,16 +218,16 @@ 
             $dic['Yapeal.baseDir'] = $path;
         }
         if (empty($dic['Yapeal.libDir'])) {
-            $dic['Yapeal.libDir'] = $path . 'lib/';
+            $dic['Yapeal.libDir'] = $path.'lib/';
         }
         $configFiles = [
-            $fpn->normalizeFile(__DIR__ . '/yapeal_defaults.yaml'),
-            $fpn->normalizeFile($dic['Yapeal.baseDir'] . 'config/yapeal.yaml')
+            $fpn->normalizeFile(__DIR__.'/yapeal_defaults.yaml'),
+            $fpn->normalizeFile($dic['Yapeal.baseDir'].'config/yapeal.yaml')
         ];
         $vendorPos = strpos($path, 'vendor/');
         if (false !== $vendorPos) {
             $dic['Yapeal.vendorParentDir'] = substr($path, 0, $vendorPos);
-            $configFiles[] = $fpn->normalizeFile($dic['Yapeal.vendorParentDir'] . 'config/yapeal.yaml');
+            $configFiles[] = $fpn->normalizeFile($dic['Yapeal.vendorParentDir'].'config/yapeal.yaml');
         }
         $settings = [];
         // Process each file in turn so any substitutions are done in a more
@@ -270,8 +270,8 @@ 
                     basename($subscriber, '.php')
                 );
                 if (!isset($dic[$service])) {
-                    $dic[$service] = function () use ($dic, $service) {
-                        $class = '\\' . str_replace('.', '\\', $service);
+                    $dic[$service] = function() use ($dic, $service) {
+                        $class = '\\'.str_replace('.', '\\', $service);
                         /**
                          * @var \Yapeal\CommonToolsTrait $callable
                          */
@@ -280,27 +280,27 @@ 
                             ->setPdo($dic['Yapeal.Sql.Connection']);
                     };
                 }
-                $events = [$service . '.start' => ['startEveApi', 'last']];
+                $events = [$service.'.start' => ['startEveApi', 'last']];
                 if (false === strpos($subscriber, 'Section')) {
-                    $events[$service . '.preserve'] = ['preserveEveApi', 'last'];
+                    $events[$service.'.preserve'] = ['preserveEveApi', 'last'];
                 }
                 $mediator->addServiceSubscriberByEventList($service, $events);
             }
         }
         if (empty($dic['Yapeal.EveApi.Creator'])) {
-            $dic['Yapeal.EveApi.Creator'] = function () use ($dic) {
+            $dic['Yapeal.EveApi.Creator'] = function() use ($dic) {
                 $loader = new \Twig_Loader_Filesystem($dic['Yapeal.EveApi.dir']);
                 $twig = new \Twig_Environment(
                     $loader, ['debug' => true, 'strict_variables' => true, 'autoescape' => false]
                 );
                 $filter = new \Twig_SimpleFilter(
-                    'ucFirst', function ($value) {
+                    'ucFirst', function($value) {
                     return ucfirst($value);
                 }
                 );
                 $twig->addFilter($filter);
                 $filter = new \Twig_SimpleFilter(
-                    'lcFirst', function ($value) {
+                    'lcFirst', function($value) {
                     return lcfirst($value);
                 }
                 );