Yapeal / yapeal-ng

lib/Console/Command/DatabaseUpdater.php

Spacing +4 added lines, -4 removed lines

@@ -79,7 +79,7 @@ 
         $output->writeln($name);
         $csq = $this->getCsq();
         $this->executeSqlStatements(
-            $csq->getDropAddOrModifyColumnProcedure() . PHP_EOL . $csq->getCreateAddOrModifyColumnProcedure(),
+            $csq->getDropAddOrModifyColumnProcedure().PHP_EOL.$csq->getCreateAddOrModifyColumnProcedure(),
             $name,
             $output
         );
@@ -169,7 +169,7 @@ 
     protected function getUpdateFileList(OutputInterface $output)
     {
         $fileNames = [];
-        $path = $this->getDic()['Yapeal.Sql.dir'] . 'updates/';
+        $path = $this->getDic()['Yapeal.Sql.dir'].'updates/';
         if (!is_readable($path) || !is_dir($path)) {
             $mess = sprintf(
                 '<info>Could NOT access update directory %1$s</info>',
@@ -257,8 +257,8 @@ 
             $stmt->execute([$updateVersion]);
             $pdo->commit();
         } catch (PDOException $exc) {
-            $mess = $sql . PHP_EOL;
-            $mess .= sprintf('Database error message was %s', $exc->getMessage()) . PHP_EOL;
+            $mess = $sql.PHP_EOL;
+            $mess .= sprintf('Database error message was %s', $exc->getMessage()).PHP_EOL;
             $mess .= sprintf(
                 'Database "version" update failed for %1$s',
                 $updateVersion

lib/Console/Command/AbstractDatabaseCommon.php

Spacing +2 added lines, -2 removed lines

@@ -180,7 +180,7 @@ 
             try {
                 $pdo->exec($sql);
             } catch (PDOException $exc) {
-                $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,
@@ -206,7 +206,7 @@ 
         $base = 'Yapeal.Sql.';
         foreach (['class', 'database', 'hostName', 'password', 'platform', 'tablePrefix', 'userName'] as $option) {
             if (!empty($options[$option])) {
-                $this->getDic()[$base . $option] = $options[$option];
+                $this->getDic()[$base.$option] = $options[$option];
             }
         }
         if (!empty($options['configFile'])) {

lib/Console/Command/DatabaseInitializer.php

Spacing +1 added lines, -1 removed lines

@@ -111,7 +111,7 @@
         }
         $fileList = [];
         foreach ($sections as $dir) {
-            foreach (new DirectoryIterator($path . $dir . '/') as $fileInfo) {
+            foreach (new DirectoryIterator($path.$dir.'/') as $fileInfo) {
                 if (!$fileInfo->isFile()
                     || 'sql' !== $fileInfo->getExtension()
                     || 'Create' !== substr($fileInfo->getBasename(), 0, 6)

lib/Configuration/Wiring.php

Spacing +42 added lines, -42 removed lines

@@ -108,7 +108,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']];
                     }
@@ -129,7 +129,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);
@@ -148,7 +148,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;
             }
@@ -198,7 +198,7 @@ 
             );
         } catch (ParseException $exc) {
             $mess = sprintf(
-                'Unable to parse the YAML configuration file %2$s.' . ' The error message was %1$s',
+                'Unable to parse the YAML configuration file %2$s.'.' The error message was %1$s',
                 $exc->getMessage(),
                 $configFile
             );
@@ -227,12 +227,12 @@ 
         $dic = $this->dic;
         if ('none' !== $dic['Yapeal.Cache.fileSystemMode']) {
             if (empty($dic['Yapeal.FileSystem.CachePreserver'])) {
-                $dic['Yapeal.FileSystem.CachePreserver'] = function () use ($dic) {
+                $dic['Yapeal.FileSystem.CachePreserver'] = function() use ($dic) {
                     return new $dic['Yapeal.Cache.Handlers.preserve']($dic['Yapeal.Cache.dir']);
                 };
             }
             if (empty($dic['Yapeal.FileSystem.CacheRetriever'])) {
-                $dic['Yapeal.FileSystem.CacheRetriever'] = function () use ($dic) {
+                $dic['Yapeal.FileSystem.CacheRetriever'] = function() use ($dic) {
                     return new $dic['Yapeal.Cache.Handlers.retrieve']($dic['Yapeal.Cache.dir']);
                 };
             }
@@ -266,11 +266,11 @@ 
             $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')
         ];
         if (empty($dic['Yapeal.vendorParentDir'])) {
             $vendorPos = strpos(
@@ -279,10 +279,10 @@ 
             );
             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');
             }
         } else {
-            $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
@@ -309,7 +309,7 @@ 
         if (!empty($this->dic['Yapeal.Error.Logger'])) {
             return $this;
         }
-        $this->dic['Yapeal.Error.Logger'] = function ($dic) {
+        $this->dic['Yapeal.Error.Logger'] = function($dic) {
             /**
              * @type Logger $logger
              */
@@ -321,7 +321,7 @@ 
                 );
             }
             $group[] = new $dic['Yapeal.Error.Handlers.stream'](
-                $dic['Yapeal.Error.dir'] . $dic['Yapeal.Error.fileName'], 100
+                $dic['Yapeal.Error.dir'].$dic['Yapeal.Error.fileName'], 100
             );
             $logger->pushHandler(
                 new $dic['Yapeal.Error.Handlers.fingersCrossed'](
@@ -374,8 +374,8 @@ 
                     basename($subscriber, '.php')
                 );
                 if (!array_key_exists($service, $dic)) {
-                    $dic[$service] = function () use ($dic, $service) {
-                        $class = '\\' . str_replace('.', '\\', $service);
+                    $dic[$service] = function() use ($dic, $service) {
+                        $class = '\\'.str_replace('.', '\\', $service);
                         /**
                          * @type \Yapeal\EveApi\EveApiToolsTrait $callable
                          */
@@ -384,27 +384,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);
                 }
                 );
@@ -434,20 +434,20 @@ 
         $dic = $this->dic;
         if (empty($dic['Yapeal.Event.EveApiEvent'])) {
             $dic['Yapeal.Event.EveApi'] = $dic->factory(
-                function ($dic) {
+                function($dic) {
                     return new $dic['Yapeal.Event.Factories.eveApi']();
                 }
             );
         }
         if (empty($this->dic['Yapeal.Event.LogEvent'])) {
             $this->dic['Yapeal.Event.LogEvent'] = $this->dic->factory(
-                function ($dic) {
+                function($dic) {
                     return new $dic['Yapeal.Event.Factories.log'];
                 }
             );
         }
         if (empty($dic['Yapeal.Event.Mediator'])) {
-            $dic['Yapeal.Event.Mediator'] = function ($dic) {
+            $dic['Yapeal.Event.Mediator'] = function($dic) {
                 return new $dic['Yapeal.Event.mediator']($dic);
             };
         }
@@ -460,7 +460,7 @@ 
     {
         $dic = $this->dic;
         if (empty($dic['Yapeal.Log.Logger'])) {
-            $dic['Yapeal.Log.Logger'] = function () use ($dic) {
+            $dic['Yapeal.Log.Logger'] = function() use ($dic) {
                 $group = [];
                 $lineFormatter = new LineFormatter;
                 $lineFormatter->includeStacktraces();
@@ -475,7 +475,7 @@ 
                     $group[] = $handler;
                 }
                 $handler = new $dic['Yapeal.Log.Handlers.stream'](
-                    $dic['Yapeal.Log.dir'] . $dic['Yapeal.Log.fileName'], 100
+                    $dic['Yapeal.Log.dir'].$dic['Yapeal.Log.fileName'], 100
                 );
                 $handler->setFormatter($lineFormatter);
                 $group[] = $handler;
@@ -507,7 +507,7 @@ 
     {
         $dic = $this->dic;
         if (empty($dic['Yapeal.Network.Client'])) {
-            $dic['Yapeal.Network.Client'] = function ($dic) {
+            $dic['Yapeal.Network.Client'] = function($dic) {
                 $appComment = $dic['Yapeal.Network.appComment'];
                 $appName = $dic['Yapeal.Network.appName'];
                 $appVersion = $dic['Yapeal.Network.appVersion'];
@@ -576,7 +576,7 @@ 
             };
         }
         if (empty($dic['Yapeal.Network.Retriever'])) {
-            $dic['Yapeal.Network.Retriever'] = function ($dic) {
+            $dic['Yapeal.Network.Retriever'] = function($dic) {
                 return new GuzzleNetworkRetriever($dic['Yapeal.Network.Client']);
             };
         }
@@ -599,7 +599,7 @@ 
     {
         $dic = $this->dic;
         if (empty($dic['Yapeal.Sql.CommonQueries'])) {
-            $dic['Yapeal.Sql.CommonQueries'] = function ($dic) {
+            $dic['Yapeal.Sql.CommonQueries'] = function($dic) {
                 return new $dic['Yapeal.Sql.sharedSql'](
                     $dic['Yapeal.Sql.database'], $dic['Yapeal.Sql.tablePrefix']
                 );
@@ -609,13 +609,13 @@ 
             return $this;
         }
         if ('mysql' !== $dic['Yapeal.Sql.platform']) {
-            $mess = 'Unknown platform, was given ' . $dic['Yapeal.Sql.platform'];
+            $mess = 'Unknown platform, was given '.$dic['Yapeal.Sql.platform'];
             throw new YapealDatabaseException($mess);
         }
-        $dic['Yapeal.Sql.Connection'] = function ($dic) {
-            $dsn = $dic['Yapeal.Sql.platform'] . ':host=' . $dic['Yapeal.Sql.hostName'] . ';charset=utf8';
+        $dic['Yapeal.Sql.Connection'] = function($dic) {
+            $dsn = $dic['Yapeal.Sql.platform'].':host='.$dic['Yapeal.Sql.hostName'].';charset=utf8';
             if (!empty($dic['Yapeal.Sql.port'])) {
-                $dsn .= ';port=' . $dic['Yapeal.Sql.port'];
+                $dsn .= ';port='.$dic['Yapeal.Sql.port'];
             }
             /**
              * @type PDO $database
@@ -632,24 +632,24 @@ 
             $database->exec('SET SESSION TIME_ZONE=\'+00:00\'');
             $database->exec('SET NAMES utf8mb4 COLLATE utf8mb4_unicode_520_ci');
             $database->exec('SET COLLATION_CONNECTION=utf8mb4_unicode_520_ci');
-            $database->exec('SET DEFAULT_STORAGE_ENGINE=' . $dic['Yapeal.Sql.engine']);
+            $database->exec('SET DEFAULT_STORAGE_ENGINE='.$dic['Yapeal.Sql.engine']);
             return $database;
         };
         if (empty($dic['Yapeal.Sql.Creator'])) {
             $dic['Yapeal.Sql.Creator'] = $dic->factory(
-                function ($dic) {
+                function($dic) {
                     $loader = new Twig_Loader_Filesystem($dic['Yapeal.Sql.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);
                     }
                     );
@@ -685,7 +685,7 @@ 
     {
         if (empty($this->dic['Yapeal.Xml.Data'])) {
             $this->dic['Yapeal.Xml.Data'] = $this->dic->factory(
-                function ($dic) {
+                function($dic) {
                     return new $dic['Yapeal.Xml.data']();
                 }
             );
@@ -703,19 +703,19 @@ 
         $dic = $this->dic;
         if (empty($dic['Yapeal.Xsd.Creator'])) {
             $dic['Yapeal.Xsd.Creator'] = $dic->factory(
-                function ($dic) {
+                function($dic) {
                     $loader = new Twig_Loader_Filesystem($dic['Yapeal.Xsd.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);
                     }
                     );
@@ -733,7 +733,7 @@ 
         }
         if (empty($dic['Yapeal.Xsd.Validator'])) {
             $dic['Yapeal.Xsd.Validator'] = $dic->factory(
-                function ($dic) {
+                function($dic) {
                     return new $dic['Yapeal.Xsd.validate']($dic['Yapeal.Xsd.dir']);
                 }
             );
@@ -763,7 +763,7 @@ 
         $dic = $this->dic;
         if (empty($dic['Yapeal.Xsl.Transformer'])) {
             $dic['Yapeal.Xsl.Transformer'] = $dic->factory(
-                function ($dic) {
+                function($dic) {
                     return new $dic['Yapeal.Xsl.transform']($dic['Yapeal.Xsl.dir']);
                 }
             );

lib/Event/LogEvent.php

Indentation +2 added lines, -2 removed lines

@@ -52,8 +52,8 @@
         array $context = []
     ) {
         $this->setLevel($level)
-             ->setMessage($message)
-             ->setContext($context);
+                ->setMessage($message)
+                ->setContext($context);
     }
     /**
      * @return array

lib/Event/Mediator.php

Indentation +2 added lines, -2 removed lines

@@ -86,8 +86,8 @@
             $event = new LogEvent();
         }
         $event->setLevel($level)
-              ->setMessage($message)
-              ->setContext($context);
+                ->setMessage($message)
+                ->setContext($context);
         return $this->trigger($eventName, $event);
     }
 }

lib/EveApi/Corp/CorpSection.php

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
             $mess = 'Could NOT get a list of active corporations';
             $this->getYem()
                 ->triggerLogEvent('Yapeal.Log.log', Logger::WARNING, $mess);
-            $mess = 'Database error message was ' . $exc->getMessage();
+            $mess = 'Database error message was '.$exc->getMessage();
             $this->getYem()
                 ->triggerLogEvent('Yapeal.Log.log', Logger::DEBUG, $mess);
             return [];

lib/EveApi/CommonEveApiTrait.php

Spacing +2 added lines, -2 removed lines

@@ -173,7 +173,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));
@@ -280,7 +280,7 @@ 
         /** @noinspection PhpUndefinedFieldInspection */
         $dateTime = gmdate(
             'Y-m-d H:i:s',
-            strtotime($simple->currentTime[0] . '+00:00') + $data->getCacheInterval()
+            strtotime($simple->currentTime[0].'+00:00') + $data->getCacheInterval()
         );
         $row = [$data->getEveApiName(), $dateTime, $ownerID, $data->getEveApiSectionName()];
         $sql = $this->getCsq()

lib/EveApi/Creator.php

Indentation +10 added lines, -10 removed lines

@@ -160,16 +160,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 +1 added lines, -1 removed lines

@@ -137,7 +137,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.