Yapeal / yapeal-ng

lib/Configuration/ErrorWiring.php

Spacing +2 added lines, -2 removed lines

@@ -53,7 +53,7 @@ 
         if (!empty($dic['Yapeal.Error.Logger'])) {
             return $this;
         }
-        $dic['Yapeal.Error.Logger'] = function ($dic) {
+        $dic['Yapeal.Error.Logger'] = function($dic) {
             /**
              * @var Logger $logger
              */
@@ -69,7 +69,7 @@ 
                 $handler = new $dic['Yapeal.Error.Handlers.stream']('php://stderr', 100);
                 $group[] = $handler->setFormatter($lineFormatter);
             }
-            $handler = new $dic['Yapeal.Error.Handlers.stream']($dic['Yapeal.Error.dir'] . $dic['Yapeal.Error.fileName'],
+            $handler = new $dic['Yapeal.Error.Handlers.stream']($dic['Yapeal.Error.dir'].$dic['Yapeal.Error.fileName'],
                 100);
             $group[] = $handler->setFormatter($lineFormatter);
             $logger->pushHandler(

lib/Console/Command/AbstractDatabaseCommon.php

Indentation +10 added lines, -10 removed lines

@@ -56,16 +56,16 @@
     protected function addOptions($help)
     {
         $this->addOption('configFile', 'c', InputOption::VALUE_REQUIRED, 'Configuration file to get settings from.')
-             ->addOption('database', 'd', InputOption::VALUE_REQUIRED, 'Name of the database.')
-             ->addOption('hostName', 'o', InputOption::VALUE_REQUIRED, 'Host name for database server.')
-             ->addOption('password', 'p', InputOption::VALUE_REQUIRED, 'Password used to access database.')
-             ->addOption('platform', null, InputOption::VALUE_REQUIRED,
-                 'Platform of database driver. Currently only "mysql" can be used.')
-             ->addOption('port', null, InputOption::VALUE_REQUIRED,
-                 'Port number for remote server. Only needed if using http connection.')
-             ->addOption('tablePrefix', 't', InputOption::VALUE_REQUIRED, 'Prefix for database table names.')
-             ->addOption('userName', 'u', InputOption::VALUE_REQUIRED, 'User name used to access database.')
-             ->setHelp($help);
+                ->addOption('database', 'd', InputOption::VALUE_REQUIRED, 'Name of the database.')
+                ->addOption('hostName', 'o', InputOption::VALUE_REQUIRED, 'Host name for database server.')
+                ->addOption('password', 'p', InputOption::VALUE_REQUIRED, 'Password used to access database.')
+                ->addOption('platform', null, InputOption::VALUE_REQUIRED,
+                    'Platform of database driver. Currently only "mysql" can be used.')
+                ->addOption('port', null, InputOption::VALUE_REQUIRED,
+                    'Port number for remote server. Only needed if using http connection.')
+                ->addOption('tablePrefix', 't', InputOption::VALUE_REQUIRED, 'Prefix for database table names.')
+                ->addOption('userName', 'u', InputOption::VALUE_REQUIRED, 'User name used to access database.')
+                ->setHelp($help);
     }
     /** @noinspection PhpMissingParentCallCommonInspection */
     /**

Spacing +3 added lines, -3 removed lines

@@ -123,7 +123,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;
@@ -151,7 +151,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,
@@ -182,7 +182,7 @@ 
         $dic = $this->getDic();
         foreach (['class', 'database', 'hostName', 'password', 'platform', 'tablePrefix', 'userName'] as $option) {
             if (!empty($options[$option])) {
-                $dic[$base . $option] = $options[$option];
+                $dic[$base.$option] = $options[$option];
             }
         }
         if (!empty($options['configFile'])) {

lib/Console/Command/DatabaseInitializer.php

Indentation +2 added lines, -2 removed lines

@@ -106,7 +106,7 @@ 
             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) {
                 // Add file path if it's a sql create file.
@@ -115,7 +115,7 @@ 
                     && 0 === strpos($fileInfo->getBasename(), 'Create')
                 ) {
                     $fileList[] = $this->getFpn()
-                                       ->normalizeFile($fileInfo->getPathname());
+                                        ->normalizeFile($fileInfo->getPathname());
                 }
             }
         }

Spacing +2 added lines, -2 removed lines

@@ -106,9 +106,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/Eve/ErrorList.php

Indentation +2 added lines, -2 removed lines

@@ -67,9 +67,9 @@
         $sql = $this->getCsq()
                     ->getDeleteFromTable($tableName);
         $this->getYem()
-             ->triggerLogEvent('Yapeal.Log.log', Logger::DEBUG, $sql);
+                ->triggerLogEvent('Yapeal.Log.log', Logger::DEBUG, $sql);
         $this->getPdo()
-             ->exec($sql);
+                ->exec($sql);
         $columnDefaults = [
             'errorCode' => null,
             'errorText' => null

lib/EveApi/ActiveTrait.php

Indentation +7 added lines, -7 removed lines

@@ -81,7 +81,7 @@ 
                 return [];
         }
         $this->getYem()
-             ->triggerLogEvent('Yapeal.Log.log', Logger::DEBUG, $sql);
+                ->triggerLogEvent('Yapeal.Log.log', Logger::DEBUG, $sql);
         try {
             return $this->getPdo()
                         ->query($sql)
@@ -89,12 +89,12 @@ 
         } catch (PDOException $exc) {
             $mess = 'Could NOT get a list of active owners for';
             $this->getYem()
-                 ->triggerLogEvent(
-                     'Yapeal.Log.log',
-                     Logger::WARNING,
-                     $this->createEveApiMessage($mess, $data),
-                     ['exception' => $exc]
-                 );
+                    ->triggerLogEvent(
+                        'Yapeal.Log.log',
+                        Logger::WARNING,
+                        $this->createEveApiMessage($mess, $data),
+                        ['exception' => $exc]
+                    );
             return [];
         }
     }

lib/EveApi/Account/APIKeyInfo.php

Indentation +16 added lines, -16 removed lines

@@ -66,30 +66,30 @@
         }
         $ownerID = $this->extractOwnerID($data->getEveApiArguments());
         $this->getYem()
-             ->triggerLogEvent(
-                 'Yapeal.Log.log',
-                 Logger::DEBUG,
-                 $this->getReceivedEventMessage($data, $eventName, __CLASS__)
-             );
+                ->triggerLogEvent(
+                    'Yapeal.Log.log',
+                    Logger::DEBUG,
+                    $this->getReceivedEventMessage($data, $eventName, __CLASS__)
+                );
         $this->getPdo()
-             ->beginTransaction();
+                ->beginTransaction();
         try {
             $this->preserveToAPIKeyInfo($xml, $ownerID)
-                 ->preserveToCharacters($xml)
-                 ->preserveToKeyBridge($xml, $ownerID);
+                    ->preserveToCharacters($xml)
+                    ->preserveToKeyBridge($xml, $ownerID);
             $this->getPdo()
-                 ->commit();
+                    ->commit();
         } catch (PDOException $exc) {
             $mess = 'Failed to upsert data of';
             $this->getYem()
-                 ->triggerLogEvent(
-                     'Yapeal.Log.log',
-                     Logger::WARNING,
-                     $this->createEveApiMessage($mess, $data),
-                     ['exception' => $exc]
-                 );
+                    ->triggerLogEvent(
+                        'Yapeal.Log.log',
+                        Logger::WARNING,
+                        $this->createEveApiMessage($mess, $data),
+                        ['exception' => $exc]
+                    );
             $this->getPdo()
-                 ->rollBack();
+                    ->rollBack();
             return $event;
         }
         return $event->setHandledSufficiently();

lib/EveApi/Account/AccountStatus.php

Indentation +22 added lines, -22 removed lines

@@ -74,30 +74,30 @@ 
         }
         $ownerID = $this->extractOwnerID($data->getEveApiArguments());
         $this->getYem()
-             ->triggerLogEvent(
-                 'Yapeal.Log.log',
-                 Logger::DEBUG,
-                 $this->getReceivedEventMessage($data, $eventName, __CLASS__)
-             );
+                ->triggerLogEvent(
+                    'Yapeal.Log.log',
+                    Logger::DEBUG,
+                    $this->getReceivedEventMessage($data, $eventName, __CLASS__)
+                );
         $this->getPdo()
-             ->beginTransaction();
+                ->beginTransaction();
         try {
             $this->preserveToAccountStatus($xml, $ownerID)
-                 ->preserveToMultiCharacterTraining($xml, $ownerID)
-                 ->preserveToOffers($xml, $ownerID);
+                    ->preserveToMultiCharacterTraining($xml, $ownerID)
+                    ->preserveToOffers($xml, $ownerID);
             $this->getPdo()
-                 ->commit();
+                    ->commit();
         } catch (PDOException $exc) {
             $mess = 'Failed to upsert data of';
             $this->getYem()
-                 ->triggerLogEvent(
-                     'Yapeal.Log.log',
-                     Logger::WARNING,
-                     $this->createEveApiMessage($mess, $data),
-                     ['exception' => $exc]
-                 );
+                    ->triggerLogEvent(
+                        'Yapeal.Log.log',
+                        Logger::WARNING,
+                        $this->createEveApiMessage($mess, $data),
+                        ['exception' => $exc]
+                    );
             $this->getPdo()
-                 ->rollBack();
+                    ->rollBack();
             return $event;
         }
         return $event->setHandledSufficiently();
@@ -115,9 +115,9 @@ 
         $sql = $this->getCsq()
                     ->getDeleteFromTableWithOwnerID($tableName, $ownerID);
         $this->getYem()
-             ->triggerLogEvent('Yapeal.Log.log', Logger::INFO, $sql);
+                ->triggerLogEvent('Yapeal.Log.log', Logger::INFO, $sql);
         $this->getPdo()
-             ->exec($sql);
+                ->exec($sql);
         $columnDefaults = [
             'createDate' => '1970-01-01 00:00:01',
             'logonCount' => null,
@@ -142,9 +142,9 @@ 
         $sql = $this->getCsq()
                     ->getDeleteFromTableWithOwnerID($tableName, $ownerID);
         $this->getYem()
-             ->triggerLogEvent('Yapeal.Log.log', Logger::INFO, $sql);
+                ->triggerLogEvent('Yapeal.Log.log', Logger::INFO, $sql);
         $this->getPdo()
-             ->exec($sql);
+                ->exec($sql);
         $columnDefaults = [
             'ownerID' => $ownerID,
             'trainingEnd' => null
@@ -165,9 +165,9 @@ 
         $sql = $this->getCsq()
                     ->getDeleteFromTableWithOwnerID($tableName, $ownerID);
         $this->getYem()
-             ->triggerLogEvent('Yapeal.Log.log', Logger::INFO, $sql);
+                ->triggerLogEvent('Yapeal.Log.log', Logger::INFO, $sql);
         $this->getPdo()
-             ->exec($sql);
+                ->exec($sql);
         $columnDefaults = [
             'from' => null,
             'ISK' => '0.0',

lib/EveApi/CommonEveApiTrait.php

Indentation +33 added lines, -33 removed lines

@@ -68,11 +68,11 @@ 
             }
             if (false === $data->getEveApiXml()) {
                 $this->getYem()
-                     ->triggerLogEvent(
-                         'Yapeal.Log.log',
-                         Logger::NOTICE,
-                         $this->getEmptyXmlDataMessage($data, $eventSuffix)
-                     );
+                        ->triggerLogEvent(
+                            'Yapeal.Log.log',
+                            Logger::NOTICE,
+                            $this->getEmptyXmlDataMessage($data, $eventSuffix)
+                        );
                 $result = false;
                 break;
             }
@@ -97,17 +97,17 @@ 
         $this->setYem($yem);
         $data = $event->getData();
         $this->getYem()
-             ->triggerLogEvent(
-                 'Yapeal.Log.log',
-                 Logger::DEBUG,
-                 $this->getReceivedEventMessage($data, $eventName, __CLASS__)
-             );
+                ->triggerLogEvent(
+                    'Yapeal.Log.log',
+                    Logger::DEBUG,
+                    $this->getReceivedEventMessage($data, $eventName, __CLASS__)
+                );
         // If method doesn't exist still needs array with member for count but return '0' from extractOwnerID().
         $active = method_exists($this, 'getActive') ? $this->getActive($data) : [[null]];
         if (0 === count($active)) {
             $mess = 'No active owners found for';
             $this->getYem()
-                 ->triggerLogEvent('Yapeal.Log.log', Logger::INFO, $this->createEveApiMessage($mess, $data));
+                    ->triggerLogEvent('Yapeal.Log.log', Logger::INFO, $this->createEveApiMessage($mess, $data));
             $this->emitEvents($data, 'end');
             return $event->setHandledSufficiently();
         }
@@ -115,8 +115,8 @@ 
         foreach ($active as $arguments) {
             // Set arguments, reset interval, and clear xml data.
             $data->setEveApiArguments($arguments)
-                 ->setCacheInterval($untilInterval)
-                 ->setEveApiXml();
+                    ->setCacheInterval($untilInterval)
+                    ->setEveApiXml();
             if ($this->cacheNotExpired($data)) {
                 $event->setHandledSufficiently();
                 continue;
@@ -139,7 +139,7 @@ 
                     ->getUtilCachedUntilExpires($data->getEveApiName(), $data->getEveApiSectionName(),
                         $this->extractOwnerID($data->getEveApiArguments()));
         $this->getYem()
-             ->triggerLogEvent('Yapeal.Log.log', Logger::DEBUG, $sql);
+                ->triggerLogEvent('Yapeal.Log.log', Logger::DEBUG, $sql);
         try {
             $expires = $this->getPdo()
                             ->query($sql)
@@ -147,30 +147,30 @@ 
         } catch (PDOException $exc) {
             $mess = 'Could NOT get cache expired for';
             $this->getYem()
-                 ->triggerLogEvent(
-                     'Yapeal.Log.log',
-                     Logger::WARNING,
-                     $this->createEveApiMessage($mess, $data),
-                     ['exception' => $exc]
-                 );
+                    ->triggerLogEvent(
+                        'Yapeal.Log.log',
+                        Logger::WARNING,
+                        $this->createEveApiMessage($mess, $data),
+                        ['exception' => $exc]
+                    );
             return false;
         }
         if (0 === count($expires)) {
             $mess = 'No UtilCachedUntil record found for';
             $this->getYem()
-                 ->triggerLogEvent('Yapeal.Log.log', Logger::DEBUG, $this->createEveApiMessage($mess, $data));
+                    ->triggerLogEvent('Yapeal.Log.log', Logger::DEBUG, $this->createEveApiMessage($mess, $data));
             return false;
         }
         if (1 < count($expires)) {
             $mess = 'Multiple UtilCachedUntil records found for';
             $this->getYem()
-                 ->triggerLogEvent('Yapeal.Log.log', Logger::WARNING, $this->createEveApiMessage($mess, $data));
+                    ->triggerLogEvent('Yapeal.Log.log', Logger::WARNING, $this->createEveApiMessage($mess, $data));
             return false;
         }
         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));
+                    ->triggerLogEvent('Yapeal.Log.log', Logger::DEBUG, $this->createEveApiMessage($mess, $data));
             return false;
         }
         return true;
@@ -208,19 +208,19 @@ 
         $sql = $this->getCsq()
                     ->getApiLock($data->getHash());
         $this->getYem()
-             ->triggerLogEvent('Yapeal.Log.log', Logger::DEBUG, $sql);
+                ->triggerLogEvent('Yapeal.Log.log', Logger::DEBUG, $sql);
         $context = [];
         $success = false;
         try {
             $success = (bool)$this->getPdo()
-                                  ->query($sql)
-                                  ->fetchColumn();
+                                    ->query($sql)
+                                    ->fetchColumn();
         } catch (PDOException $exc) {
             $context = ['exception' => $exc];
         }
         $mess = $success ? 'Got lock for' : 'Could NOT get lock for';
         $this->getYem()
-             ->triggerLogEvent('Yapeal.Log.log', Logger::INFO, $this->createEveApiMessage($mess, $data), $context);
+                ->triggerLogEvent('Yapeal.Log.log', Logger::INFO, $this->createEveApiMessage($mess, $data), $context);
         return $success;
     }
     /**
@@ -234,19 +234,19 @@ 
         $sql = $this->getCsq()
                     ->getApiLockRelease($data->getHash());
         $this->getYem()
-             ->triggerLogEvent('Yapeal.Log.log', Logger::DEBUG, $sql);
+                ->triggerLogEvent('Yapeal.Log.log', Logger::DEBUG, $sql);
         $context = [];
         $success = false;
         try {
             $success = (bool)$this->getPdo()
-                                  ->query($sql)
-                                  ->fetchColumn();
+                                    ->query($sql)
+                                    ->fetchColumn();
         } catch (PDOException $exc) {
             $context = ['exception' => $exc];
         }
         $mess = $success ? 'Released lock for' : 'Could NOT release lock for';
         $this->getYem()
-             ->triggerLogEvent('Yapeal.Log.log', Logger::INFO, $this->createEveApiMessage($mess, $data), $context);
+                ->triggerLogEvent('Yapeal.Log.log', Logger::INFO, $this->createEveApiMessage($mess, $data), $context);
         return $success;
     }
     /**
@@ -278,7 +278,7 @@ 
         $sql = $this->getCsq()
                     ->getUtilCachedUntilUpsert();
         $this->getYem()
-             ->triggerLogEvent('Yapeal.Log.log', Logger::DEBUG, $sql);
+                ->triggerLogEvent('Yapeal.Log.log', Logger::DEBUG, $sql);
         $pdo = $this->getPdo();
         $pdo->beginTransaction();
         $context = [];
@@ -294,7 +294,7 @@ 
         }
         $mess = $success ? 'Updated cached until date/time of' : 'Could NOT update cached until date/time of';
         $this->getYem()
-             ->triggerLogEvent('Yapeal.Log.log', Logger::INFO, $this->createEveApiMessage($mess, $data), $context);
+                ->triggerLogEvent('Yapeal.Log.log', Logger::INFO, $this->createEveApiMessage($mess, $data), $context);
         return $this;
     }
     /**

Spacing +2 added lines, -2 removed lines

@@ -167,7 +167,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));
@@ -267,7 +267,7 @@ 
         }
         $dateTime = gmdate(
             'Y-m-d H:i:s',
-            strtotime($currentTime . '+00:00') + $data->getCacheInterval()
+            strtotime($currentTime.'+00:00') + $data->getCacheInterval()
         );
         $row = [
             $data->getEveApiName(),

lib/Xml/EveApiXmlData.php

Spacing +7 added lines, -7 removed lines

@@ -57,7 +57,7 @@ 
             return $this;
         }
         if (!is_string($name)) {
-            $mess = 'Name MUST be string but was given ' . gettype($name);
+            $mess = 'Name MUST be string but was given '.gettype($name);
             throw new InvalidArgumentException($mess);
         }
         $this->eveApiArguments[$name] = (string)$value;
@@ -89,7 +89,7 @@ 
     {
         $name = (string)$name;
         if (!array_key_exists($name, $this->eveApiArguments)) {
-            $mess = 'Unknown argument ' . $name;
+            $mess = 'Unknown argument '.$name;
             throw new DomainException($mess);
         }
         return $this->eveApiArguments[$name];
@@ -151,14 +151,14 @@ 
      */
     public function getHash()
     {
-        $hash = $this->getEveApiName() . $this->getEveApiSectionName();
+        $hash = $this->getEveApiName().$this->getEveApiSectionName();
         $arguments = $this->getEveApiArguments();
         ksort($arguments);
         foreach ($arguments as $key => $value) {
             if ('mask' === $key) {
                 continue;
             }
-            $hash .= $key . $value;
+            $hash .= $key.$value;
         }
         return hash('md5', $hash);
     }
@@ -228,7 +228,7 @@ 
     public function setEveApiName($value)
     {
         if (!is_string($value)) {
-            $mess = 'Name MUST be string but was given ' . gettype($value);
+            $mess = 'Name MUST be string but was given '.gettype($value);
             throw new InvalidArgumentException($mess);
         }
         $this->eveApiName = $value;
@@ -245,7 +245,7 @@ 
     public function setEveApiSectionName($value)
     {
         if (!is_string($value)) {
-            $mess = 'Section name MUST be string but was given ' . gettype($value);
+            $mess = 'Section name MUST be string but was given '.gettype($value);
             throw new InvalidArgumentException($mess);
         }
         $this->eveApiSectionName = $value;
@@ -265,7 +265,7 @@ 
             $xml = '';
         }
         if (!is_string($xml)) {
-            $mess = 'Xml MUST be string but was given ' . gettype($xml);
+            $mess = 'Xml MUST be string but was given '.gettype($xml);
             throw new InvalidArgumentException($mess);
         }
         $this->eveApiXml = $xml;