Yapeal / yapeal-ng

lib/Sql/PreserverTrait.php

Spacing +5 added lines, -5 removed lines

@@ -232,7 +232,7 @@ 
             if (PREG_NO_ERROR !== $lastError = preg_last_error()) {
                 $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);
             }
             $this->getYem()
@@ -244,12 +244,12 @@ 
         }
         $mess = '';
         foreach ($columns as $column) {
-            $mess .= $column . ',';
+            $mess .= $column.',';
             if (256 <= strlen($mess)) {
                 break;
             }
         }
-        $mess = substr($mess, 0, 256) . '...';
+        $mess = substr($mess, 0, 256).'...';
         $this->getYem()
             ->triggerLogEvent('Yapeal.Log.log', Logger::DEBUG, $mess);
         $this->pdoStatement->execute($columns);
@@ -266,7 +266,7 @@ 
      */
     protected function processXmlRows(array $rows, array $columnDefaults): array
     {
-        $callback = function (array $carry, \SimpleXMLElement $row) use ($columnDefaults): array {
+        $callback = function(array $carry, \SimpleXMLElement $row) use ($columnDefaults): array {
             foreach ($columnDefaults as $key => $value) {
                 $attribute = (string)$row[$key];
                 $carry[] = '' !== $attribute ? $attribute : (string)$value;
@@ -296,7 +296,7 @@ 
             return $this;
         }
         $defaultNames = array_keys($columnDefaults);
-        $callback = function (array $carry, \SimpleXMLElement $element) use ($defaultNames): array {
+        $callback = function(array $carry, \SimpleXMLElement $element) use ($defaultNames): array {
             if (in_array($name = $element->getName(), $defaultNames, true)) {
                 $carry[$name] = (string)$element;
             }

lib/Cli/Schema/SchemaUpdater.php

Spacing +3 added lines, -3 removed lines

@@ -140,7 +140,7 @@ 
         $sql = $this->getCsq()
             ->getLatestYapealSchemaVersion();
         $this->getYem()
-            ->triggerLogEvent('Yapeal.Log.log', Logger::DEBUG, 'sql - ' . $sql);
+            ->triggerLogEvent('Yapeal.Log.log', Logger::DEBUG, 'sql - '.$sql);
         $version = '19700101000001.000';
         try {
             $result = $this->getPdo()
@@ -148,7 +148,7 @@ 
             $version = (string)$result->fetchColumn();
             $result->closeCursor();
         } catch (\PDOException $exc) {
-            $sql = '<comment>' . $sql . '</comment>';
+            $sql = '<comment>'.$sql.'</comment>';
             $mess = sprintf('<error>Could NOT query latest database version. Aborting ...</error>', $version);
             if ($output::VERBOSITY_QUIET !== $output->getVerbosity()) {
                 $output->writeln([$sql, $mess]);
@@ -170,7 +170,7 @@ 
             $fileExt);
         $regex = '%^.+?/\d{14}\.\d{3}\..+$%';
         $filteredNames = array_filter(preg_grep($regex, glob($globPath, GLOB_BRACE | GLOB_NOESCAPE)),
-            function (string $fileName) use ($fileExt, $latestVersion) {
+            function(string $fileName) use ($fileExt, $latestVersion) {
                 return $latestVersion < basename($fileName, $fileExt);
             });
         return $filteredNames;

lib/Cli/Schema/AbstractSchemaCommon.php

Spacing +4 added lines, -4 removed lines

@@ -130,7 +130,7 @@ 
         $yem = $this->getYem();
         $statements = explode(';', $this->getCleanedUpSql($sqlStatements, $this->getReplacements()));
         $statements = array_filter($statements,
-            function ($statement) {
+            function($statement) {
                 return '' !== trim($statement);
             });
         $progress = null;
@@ -152,7 +152,7 @@ 
                 // here so as not to break statements.
                 $sql = str_replace('{semiColon}', ';', trim($sql));
                 null !== $progress && $progress->clear();
-                $yem->triggerLogEvent('Yapeal.Log.log', Logger::DEBUG, 'sql - ' . $sql);
+                $yem->triggerLogEvent('Yapeal.Log.log', Logger::DEBUG, 'sql - '.$sql);
                 $pdo->exec($sql);
                 if (null !== $progress) {
                     $progress->display();
@@ -165,7 +165,7 @@ 
                     $progress->advance();
                     $output->writeln('');
                 }
-                $mess = '<error>SQL error in statement ' . $statement . '</error>';
+                $mess = '<error>SQL error in statement '.$statement.'</error>';
                 $output->writeln($mess);
                 throw new YapealDatabaseException(strip_tags($mess), 2, $exc);
             }
@@ -205,7 +205,7 @@ 
         $base = 'Yapeal.Sql.';
         foreach (['class', 'database', 'hostName', 'password', 'platform', 'tablePrefix', 'userName'] as $option) {
             if (array_key_exists($option, $options) && null !== $options[$option]) {
-                $dic[$base . $option] = $options[$option];
+                $dic[$base.$option] = $options[$option];
             }
         }
         return $this;

lib/Cli/Schema/SchemaCreator.php

Spacing +1 added lines, -1 removed lines

@@ -187,7 +187,7 @@
         $regex = '%^.+?/\w*\..+$%';
         $drop = $this->dropSchema;
         $filteredNames = array_filter(preg_grep($regex, glob($globPath, GLOB_BRACE | GLOB_NOESCAPE)),
-            function (string $fileName) use ($drop) {
+            function(string $fileName) use ($drop) {
                 return $drop || 0 !== strpos(basename($fileName), 'DropSchema');
             });
         return $filteredNames;

lib/Configuration/ConfigFileProcessingTrait.php

Spacing +4 added lines, -4 removed lines

@@ -86,14 +86,14 @@ 
         }
         $depth = 0;
         $maxDepth = 25;
-        $callback = function ($subject) use ($dic, $settings, &$miss) {
+        $callback = function($subject) use ($dic, $settings, &$miss) {
             $regEx = '%(.*)\{(?<name>(?:\w+)(?:\.\w+)+)\}(.*)%';
             if (is_string($subject) && preg_match($regEx, $subject, $matches)) {
                 $name = $matches['name'];
                 if ($dic->offsetExists($name)) {
-                    $subject = $matches[1] . $dic[$name] . $matches[3];
+                    $subject = $matches[1].$dic[$name].$matches[3];
                 } elseif (array_key_exists($name, $settings)) {
-                    $subject = $matches[1] . $settings[$name] . $matches[3];
+                    $subject = $matches[1].$settings[$name].$matches[3];
                 }
                 if (false !== strpos($subject, '{') && false !== strpos($subject, '}')) {
                     ++$miss;
@@ -112,7 +112,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 (0 < $miss);

lib/Configuration/ConfigWiring.php

Spacing +9 added lines, -9 removed lines

@@ -57,15 +57,15 @@ 
     {
         $this->setDic($dic);
         if (empty($dic['Yapeal.Config.Yaml'])) {
-            $dic['Yapeal.Config.Yaml'] = $dic->factory(function () {
+            $dic['Yapeal.Config.Yaml'] = $dic->factory(function() {
                 return new YamlConfigFile();
             });
         }
-        $path = dirname(str_replace('\\', '/', __DIR__), 2) . '/';
+        $path = dirname(str_replace('\\', '/', __DIR__), 2).'/';
         // These two paths are critical to Yapeal-ng working and can't be overridden.
         $dic['Yapeal.baseDir'] = $path;
-        $dic['Yapeal.libDir'] = $path . 'lib/';
-        $configFiles = [str_replace('\\', '/', __DIR__) . '/yapealDefaults.yaml'];
+        $dic['Yapeal.libDir'] = $path.'lib/';
+        $configFiles = [str_replace('\\', '/', __DIR__).'/yapealDefaults.yaml'];
         $settings = [];
         /**
          * Do to the importance that the cache/ and log/ directories and the main configuration file _not_ point to
@@ -83,13 +83,13 @@ 
          */
         if (false !== $vendorPos = strpos($path, 'vendor/')) {
             $dic['Yapeal.vendorParentDir'] = substr($path, 0, $vendorPos);
-            $configFiles[] = $dic['Yapeal.vendorParentDir'] . 'config/yapeal.yaml';
+            $configFiles[] = $dic['Yapeal.vendorParentDir'].'config/yapeal.yaml';
             $settings['Yapeal.FileSystem.Cache.dir'] = '{Yapeal.vendorParentDir}cache/';
             $settings['Yapeal.Log.dir'] = '{Yapeal.vendorParentDir}log/';
         } else {
-            $configFiles[] = $path . 'config/yapeal.yaml';
-            $settings['Yapeal.FileSystem.Cache.dir'] = $path . 'cache/';
-            $settings['Yapeal.Log.dir'] = $path . 'log/';
+            $configFiles[] = $path.'config/yapeal.yaml';
+            $settings['Yapeal.FileSystem.Cache.dir'] = $path.'cache/';
+            $settings['Yapeal.Log.dir'] = $path.'log/';
         }
         if (!empty($dic['Yapeal.Config.configFile'])) {
             $configFiles[] = $dic['Yapeal.Config.configFile'];
@@ -117,7 +117,7 @@ 
         $version = $settings['Yapeal.version'] ?? '0.0.0-0-dev+noGit-unknown';
         $gitVersion = trim(exec('git describe --always --long 2>&1', $junk, $status));
         if (0 === $status && '' !== $gitVersion && $gitVersion !== $version) {
-            $settings['Yapeal.version'] = $gitVersion . '-dev';
+            $settings['Yapeal.version'] = $gitVersion.'-dev';
         }
         return $settings;
     }

lib/Configuration/LogWiring.php

Spacing +7 added lines, -7 removed lines

@@ -293,7 +293,7 @@ 
     private function wireCli(ContainerInterface $dic): self
     {
         if (empty($dic['Yapeal.Log.Callable.Cli'])) {
-            $dic['Yapeal.Log.Callable.Cli'] = function () use ($dic) {
+            $dic['Yapeal.Log.Callable.Cli'] = function() use ($dic) {
                 $parameters = [
                     $dic['Yapeal.Log.Parameters.Cli.stream'],
                     $dic['Yapeal.Log.Parameters.Cli.level'],
@@ -321,7 +321,7 @@ 
     private function wireFileSystem(ContainerInterface $dic): self
     {
         if (empty($dic['Yapeal.Log.Callable.FileSystem'])) {
-            $dic['Yapeal.Log.Callable.FileSystem'] = function () use ($dic) {
+            $dic['Yapeal.Log.Callable.FileSystem'] = function() use ($dic) {
                 $parameters = [
                     $dic['Yapeal.Log.Parameters.FileSystem.stream'],
                     $dic['Yapeal.Log.Parameters.FileSystem.level'],
@@ -349,7 +349,7 @@ 
     private function wireFingersCrossed(ContainerInterface $dic): self
     {
         if (empty($dic['Yapeal.Log.Callable.FingersCrossed'])) {
-            $dic['Yapeal.Log.Callable.FingersCrossed'] = function () use ($dic) {
+            $dic['Yapeal.Log.Callable.FingersCrossed'] = function() use ($dic) {
                 /**
                  * @var string $activationStrategy
                  * @var string $handler
@@ -378,7 +378,7 @@ 
     private function wireGroup(ContainerInterface $dic): self
     {
         if (empty($dic['Yapeal.Log.Callable.Group'])) {
-            $dic['Yapeal.Log.Callable.Group'] = function () use ($dic) {
+            $dic['Yapeal.Log.Callable.Group'] = function() use ($dic) {
                 $handlers = [];
                 foreach (explode(',', $dic['Yapeal.Log.Parameters.Group.handlers']) as $handler) {
                     if ('' === $handler) {
@@ -403,7 +403,7 @@ 
     private function wireLineFormatter(ContainerInterface $dic): self
     {
         if (empty($dic['Yapeal.Log.Callable.LFFactory'])) {
-            $dic['Yapeal.Log.Callable.LFFactory'] = $dic->factory(function () use ($dic) {
+            $dic['Yapeal.Log.Callable.LFFactory'] = $dic->factory(function() use ($dic) {
                 $parameters = [
                     $dic['Yapeal.Log.Parameters.LineFormatter.format'],
                     $dic['Yapeal.Log.Parameters.LineFormatter.dateFormat'],
@@ -435,7 +435,7 @@ 
     private function wireLogger(ContainerInterface $dic)
     {
         if (empty($dic['Yapeal.Log.Callable.Logger'])) {
-            $dic['Yapeal.Log.Callable.Logger'] = function () use ($dic) {
+            $dic['Yapeal.Log.Callable.Logger'] = function() use ($dic) {
                 /**
                  * @var \Yapeal\Log\Logger $logger
                  */
@@ -472,7 +472,7 @@ 
     private function wireStrategy(ContainerInterface $dic): self
     {
         if (empty($dic['Yapeal.Log.Callable.Strategy'])) {
-            $dic['Yapeal.Log.Callable.Strategy'] = function () use ($dic) {
+            $dic['Yapeal.Log.Callable.Strategy'] = function() use ($dic) {
                 return new $dic['Yapeal.Log.Classes.strategy']((int)$dic['Yapeal.Log.Parameters.Strategy.actionLevel']);
             };
         }

lib/Configuration/Wiring.php

Spacing +4 added lines, -4 removed lines

@@ -75,13 +75,13 @@ 
     {
         $dic = $this->getDic();
         $base = 'Yapeal.Wiring.Classes.';
-        $dic[$base . 'config'] = $dic[$base . 'config'] ?? '\Yapeal\Configuration\ConfigWiring';
+        $dic[$base.'config'] = $dic[$base.'config'] ?? '\Yapeal\Configuration\ConfigWiring';
         $names = ['Config', 'Event', 'Log', 'Sql', 'Xml', 'Xsd', 'Xsl', 'FileSystem', 'Network', 'EveApi'];
         /**
          * @var WiringInterface $class
          */
         foreach ($names as $name) {
-            $setting = $base . strtolower($name);
+            $setting = $base.strtolower($name);
             if (!empty($dic[$setting])
                 && is_subclass_of($dic[$setting], '\Yapeal\Configuration\WiringInterface', true)
             ) {
@@ -89,11 +89,11 @@ 
                 $class->wire($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);
             }
         }

lib/AdminTools/ManageRegisteredKey.php

Spacing +6 added lines, -6 removed lines

@@ -81,7 +81,7 @@ 
                     break;
             }
         } catch (\BadMethodCallException $exc) {
-            $this->lastErrorString = 'Failed to get SQL for ' . $this->command;
+            $this->lastErrorString = 'Failed to get SQL for '.$this->command;
             return false;
         }
         if (!$this->executeCommandSql($sql)) {
@@ -194,7 +194,7 @@ 
     {
         try {
             if (!$this->pdo->beginTransaction()) {
-                $this->lastErrorString = 'Failed to start transaction for ' . $this->command;
+                $this->lastErrorString = 'Failed to start transaction for '.$this->command;
                 return false;
             }
             $stmt = $this->pdo->prepare($sql);
@@ -202,14 +202,14 @@ 
                 if ($this->pdo->inTransaction()) {
                     $this->pdo->rollBack();
                 }
-                $this->lastErrorString = 'Failed to execute prepared query for ' . $this->command;
+                $this->lastErrorString = 'Failed to execute prepared query for '.$this->command;
                 return false;
             }
             if (!$this->pdo->commit()) {
                 if ($this->pdo->inTransaction()) {
                     $this->pdo->rollBack();
                 }
-                $this->lastErrorString = 'Failed to commit the transaction for ' . $this->command;
+                $this->lastErrorString = 'Failed to commit the transaction for '.$this->command;
                 return false;
             }
         } catch (\PDOException $exc) {
@@ -283,7 +283,7 @@ 
         $stmt = $this->pdo->query($sql);
         $result = $stmt->fetchAll(\PDO::FETCH_ASSOC);
         if (1 !== count($result)) {
-            $this->lastErrorString = 'Expected to fetch a single row for ' . $this->command;
+            $this->lastErrorString = 'Expected to fetch a single row for '.$this->command;
             return false;
         }
         $this->active = (bool)$result[0]['active'];
@@ -301,7 +301,7 @@ 
      */
     private function enforceColumnTypes(array $columns): array
     {
-        array_walk($columns, function (&$value, $key) {
+        array_walk($columns, function(&$value, $key) {
             switch ($key) {
                 case 'active':
                     $value = (bool)$value;