Yapeal / yapeal-ng

lib/Configuration/ConfigFileInterface.php

Doc Comments +4 added lines

@@ -56,18 +56,22 @@
     public function getSettings(): array;
     /**
      * @throws \LogicException
+     * @return YamlConfigFile
      */
     public function read();
     /**
      * @throws \LogicException
+     * @return void
      */
     public function save();
     /**
      * @param string|null $value File name with absolute path.
+     * @return YamlConfigFile
      */
     public function setPathFile(string $value = null);
     /**
      * @param array $value
+     * @return YamlConfigFile
      */
     public function setSettings(array $value = []);
     /**

lib/Configuration/LogWiring.php

Doc Comments +2 added lines, -2 removed lines

@@ -176,7 +176,7 @@ 
                  *  constructor.
                  *
                  * @param LoggerInterface $logger
-                 * @param int|null        $uncaughtExceptionLevel
+                 * @param integer        $uncaughtExceptionLevel
                  */
                 public function __construct(LoggerInterface $logger, int $uncaughtExceptionLevel)
                 {
@@ -431,7 +431,7 @@ 
             /**
              * @param ContainerInterface $dic
              *
-             * @return FormatterInterface
+             * @return LogWiring
              */
             function (ContainerInterface $dic): FormatterInterface {
             $parameters = [

Spacing +7 added lines, -7 removed lines

@@ -302,7 +302,7 @@ 
              *
              * @return HandlerInterface
              */
-            $dic['Yapeal.Log.Callable.Cli'] = function (ContainerInterface $dic): HandlerInterface {
+            $dic['Yapeal.Log.Callable.Cli'] = function(ContainerInterface $dic): HandlerInterface {
                 $parameters = [
                     $dic['Yapeal.Log.Parameters.Cli.stream'],
                     $dic['Yapeal.Log.Parameters.Cli.level'],
@@ -335,7 +335,7 @@ 
              *
              * @return HandlerInterface
              */
-            $dic['Yapeal.Log.Callable.FileSystem'] = function (ContainerInterface $dic): HandlerInterface {
+            $dic['Yapeal.Log.Callable.FileSystem'] = function(ContainerInterface $dic): HandlerInterface {
                 $parameters = [
                     $dic['Yapeal.Log.Parameters.FileSystem.stream'],
                     $dic['Yapeal.Log.Parameters.FileSystem.level'],
@@ -368,7 +368,7 @@ 
              *
              * @return HandlerInterface
              */
-            $dic['Yapeal.Log.Callable.FingersCrossed'] = function (ContainerInterface $dic): HandlerInterface {
+            $dic['Yapeal.Log.Callable.FingersCrossed'] = function(ContainerInterface $dic): HandlerInterface {
                 /**
                  * @var string $activationStrategy
                  * @var string $handler
@@ -402,7 +402,7 @@ 
              *
              * @return HandlerInterface
              */
-            $dic['Yapeal.Log.Callable.Group'] = function (ContainerInterface $dic): HandlerInterface {
+            $dic['Yapeal.Log.Callable.Group'] = function(ContainerInterface $dic): HandlerInterface {
                 $handlers = [];
                 foreach (explode(',', $dic['Yapeal.Log.Parameters.Group.handlers']) as $handler) {
                     if ('' === $handler) {
@@ -433,7 +433,7 @@ 
              *
              * @return FormatterInterface
              */
-            function (ContainerInterface $dic): FormatterInterface {
+            function(ContainerInterface $dic): FormatterInterface {
             $parameters = [
                 $dic['Yapeal.Log.Parameters.LineFormatter.format'],
                 $dic['Yapeal.Log.Parameters.LineFormatter.dateFormat'],
@@ -470,7 +470,7 @@ 
              *
              * @return Logger
              */
-            $dic['Yapeal.Log.Callable.Logger'] = function (ContainerInterface $dic): Logger {
+            $dic['Yapeal.Log.Callable.Logger'] = function(ContainerInterface $dic): Logger {
                 /**
                  * @var \Yapeal\Log\Logger $logger
                  */
@@ -512,7 +512,7 @@ 
              *
              * @return ActivationStrategyInterface
              */
-            $dic['Yapeal.Log.Callable.Strategy'] = function (ContainerInterface $dic): ActivationStrategyInterface {
+            $dic['Yapeal.Log.Callable.Strategy'] = function(ContainerInterface $dic): ActivationStrategyInterface {
                 return new $dic['Yapeal.Log.Classes.strategy']((int)$dic['Yapeal.Log.Parameters.Strategy.actionLevel']);
             };
         }

lib/AdminTools/ManageRegisteredKey.php

Spacing +9 added lines, -9 removed lines

@@ -86,7 +86,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)) {
@@ -203,7 +203,7 @@ 
     private function enforceColumnTypesAndStructure(array $columns): array
     {
         array_walk($columns,
-            function (&$value, $key) {
+            function(&$value, $key) {
                 switch ($key) {
                     case 'active':
                         $value = (bool)$value;
@@ -216,13 +216,13 @@ 
                         $value = (string)$value;
                         break;
                     default:
-                        $mess = 'Given unknown value ' . $key;
+                        $mess = 'Given unknown value '.$key;
                         throw new \UnexpectedValueException($mess);
                 }
             });
         if (count($this->columnNames) > count($columns)) {
-            $mess = 'Missing one or more of the required values: "' . implode('","', $this->columnNames) . '"';
-            $mess .= ' Was given "' . implode('","', array_keys($columns)) . '"';
+            $mess = 'Missing one or more of the required values: "'.implode('","', $this->columnNames).'"';
+            $mess .= ' Was given "'.implode('","', array_keys($columns)).'"';
             throw new \InvalidArgumentException($mess);
         }
         return $columns;
@@ -237,7 +237,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);
@@ -245,14 +245,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) {
@@ -277,7 +277,7 @@ 
         $stmt = $this->pdo->query($sql);
         $columns = $stmt->fetchAll(\PDO::FETCH_ASSOC);
         if (1 !== count($columns)) {
-            $this->lastErrorString = 'Expected to fetch a single row for ' . $this->command;
+            $this->lastErrorString = 'Expected to fetch a single row for '.$this->command;
             return false;
         }
         $columns = $this->enforceColumnTypesAndStructure($columns[0]);

lib/Configuration/FileSystemWiring.php

Spacing +2 added lines, -2 removed lines

@@ -72,7 +72,7 @@ 
              *
              * @return EveApiPreserverInterface
              */
-            $dic['Yapeal.FileSystem.Callable.CachePreserver'] = function (ContainerInterface $dic
+            $dic['Yapeal.FileSystem.Callable.CachePreserver'] = function(ContainerInterface $dic
             ): EveApiPreserverInterface {
                 return new $dic['Yapeal.FileSystem.Classes.preserve']($dic['Yapeal.FileSystem.Cache.dir'],
                     $dic['Yapeal.FileSystem.Parameters.preserve']);
@@ -97,7 +97,7 @@ 
              *
              * @return EveApiRetrieverInterface
              */
-            $dic['Yapeal.FileSystem.Callable.CacheRetriever'] = function (ContainerInterface $dic
+            $dic['Yapeal.FileSystem.Callable.CacheRetriever'] = function(ContainerInterface $dic
             ): EveApiRetrieverInterface {
                 return new $dic['Yapeal.FileSystem.Classes.retrieve']($dic['Yapeal.FileSystem.Cache.dir'],
                     $dic['Yapeal.FileSystem.Parameters.retrieve']);

lib/Configuration/XsdWiring.php

Spacing +4 added lines, -4 removed lines

@@ -73,15 +73,15 @@ 
              * @return \Yapeal\Xsd\Creator
              * @throws \LogicException
              */
-            $dic['Yapeal.Xsd.Callable.Creator'] = function (ContainerInterface $dic) {
+            $dic['Yapeal.Xsd.Callable.Creator'] = function(ContainerInterface $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) {
+                $filter = new \Twig_SimpleFilter('ucFirst', function($value) {
                     return ucfirst($value);
                 });
                 $twig->addFilter($filter);
-                $filter = new \Twig_SimpleFilter('lcFirst', function ($value) {
+                $filter = new \Twig_SimpleFilter('lcFirst', function($value) {
                     return lcfirst($value);
                 });
                 $twig->addFilter($filter);
@@ -112,7 +112,7 @@ 
              *
              * @return ValidatorInterface
              */
-            $dic['Yapeal.Xsd.Callable.Validator'] = function (ContainerInterface $dic): ValidatorInterface {
+            $dic['Yapeal.Xsd.Callable.Validator'] = function(ContainerInterface $dic): ValidatorInterface {
                 return new $dic['Yapeal.Xsd.Classes.validate']($dic['Yapeal.Xsd.dir']);
             };
             $mediator->addServiceListener('Yapeal.EveApi.validate',

lib/Configuration/NetworkWiring.php

Spacing +4 added lines, -4 removed lines

@@ -67,7 +67,7 @@ 
              *
              * @return Client
              */
-            $dic['Yapeal.Network.Callable.Client'] = function (ContainerInterface $dic): Client {
+            $dic['Yapeal.Network.Callable.Client'] = function(ContainerInterface $dic): Client {
                 $clientParameters = $dic['Yapeal.Network.Callable.GetClientMergedParameters'];
                 $headers = [
                     'Accept' => $clientParameters['accept'],
@@ -79,7 +79,7 @@ 
                 ];
                 // Clean up any extra spaces and EOL chars from Yaml.
                 array_walk($headers,
-                    function (&$value) {
+                    function(&$value) {
                         $value = trim(str_replace(' ', '', (string)$value));
                     });
                 $agentSubs = [
@@ -144,7 +144,7 @@ 
              * @return array
              * @throws \OutOfBoundsException
              */
-            $dic['Yapeal.Network.Callable.GetClientMergedParameters'] = function (ContainerInterface $dic): array {
+            $dic['Yapeal.Network.Callable.GetClientMergedParameters'] = function(ContainerInterface $dic): array {
                 $getScalars = $dic['Yapeal.Config.Callable.ExtractScalarsByKeyPrefix'];
                 $base = [];
                 foreach ($getScalars($dic, 'Yapeal.Network.') as $index => $item) {
@@ -188,7 +188,7 @@ 
              *
              * @return EveApiRetrieverInterface
              */
-            $dic['Yapeal.Network.Callable.Retriever'] = function (ContainerInterface $dic): EveApiRetrieverInterface {
+            $dic['Yapeal.Network.Callable.Retriever'] = function(ContainerInterface $dic): EveApiRetrieverInterface {
                 return new $dic['Yapeal.Network.Classes.retrieve']($dic['Yapeal.Network.Callable.Client'],
                     $dic['Yapeal.Network.Parameters.retrieve']);
             };

lib/Configuration/XslWiring.php

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
              *
              * @return TransformerInterface
              */
-            $dic['Yapeal.Xsl.Callable.Transformer'] = function (ContainerInterface $dic): TransformerInterface {
+            $dic['Yapeal.Xsl.Callable.Transformer'] = function(ContainerInterface $dic): TransformerInterface {
                 return new $dic['Yapeal.Xsl.Classes.transform']($dic['Yapeal.Xsl.dir']);
             };
         }

lib/Configuration/XmlWiring.php

Spacing +2 added lines, -2 removed lines

@@ -66,7 +66,7 @@ 
              *
              * @return EveApiReadWriteInterface
              */
-            $dic['Yapeal.Xml.Callable.Data'] = function (ContainerInterface $dic): EveApiReadWriteInterface {
+            $dic['Yapeal.Xml.Callable.Data'] = function(ContainerInterface $dic): EveApiReadWriteInterface {
                 return new $dic['Yapeal.Xml.Classes.data']();
             };
         }
@@ -83,7 +83,7 @@ 
              *
              * @return \Yapeal\Xml\ErrorCacheIntervalSubscriber
              */
-            $dic['Yapeal.Xml.Error.Callable.Subscriber'] = function (ContainerInterface $dic) {
+            $dic['Yapeal.Xml.Error.Callable.Subscriber'] = function(ContainerInterface $dic) {
                 return new $dic['Yapeal.Xml.Classes.error']();
             };
             /**

lib/Configuration/ConfigWiring.php

Spacing +9 added lines, -9 removed lines

@@ -53,14 +53,14 @@ 
         $this->wireYaml($dic)
             ->wireManager($dic)
             ->wireExtractorCallable($dic);
-        $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/';
+        $dic['Yapeal.libDir'] = $path.'lib/';
         $settings = $this->gitVersionSetting($dic, []);
         $configFiles = [
             [
-                'pathName' => str_replace('\\', '/', __DIR__) . '/yapealDefaults.yaml',
+                'pathName' => str_replace('\\', '/', __DIR__).'/yapealDefaults.yaml',
                 PHP_INT_MAX,
                 false
             ]
@@ -81,11 +81,11 @@ 
          */
         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';
+            $configFiles[] = $path.'config/yapeal.yaml';
             $settings['Yapeal.FileSystem.Cache.dir'] = '{Yapeal.baseDir}cache/';
             $settings['Yapeal.Log.dir'] = '{Yapeal.baseDir}log/';
         }
@@ -108,7 +108,7 @@ 
     {
         $gitVersion = trim(exec('git describe --always --long 2>&1', $junk, $status));
         if (0 === $status && '' !== $gitVersion) {
-            $dic['Yapeal.version'] = $gitVersion . '-dev';
+            $dic['Yapeal.version'] = $gitVersion.'-dev';
         } else {
             $settings['Yapeal.version'] = '0.0.0-0-noGit-unknown';
         }
@@ -134,7 +134,7 @@ 
              *
              * @return \Generator
              */
-            function (ContainerInterface $dic, string $prefix): \Generator {
+            function(ContainerInterface $dic, string $prefix): \Generator {
                 $preLen = strlen($prefix);
                 if ($preLen !== strrpos($prefix, '.') + 1) {
                     $prefix .= '.';
@@ -172,7 +172,7 @@ 
              *
              * @return ConfigManagementInterface
              */
-            $dic['Yapeal.Configuration.Callable.Manager'] = function (ContainerInterface $dic): ConfigManagementInterface {
+            $dic['Yapeal.Configuration.Callable.Manager'] = function(ContainerInterface $dic): ConfigManagementInterface {
                 $manager = $dic['Yapeal.Configuration.Classes.manager'] ?? '\Yapeal\Configuration\ConfigManager';
                 /**
                  * @var ConfigManager $manager
@@ -198,7 +198,7 @@ 
              *
              * @return mixed
              */
-            function (ContainerInterface $dic) {
+            function(ContainerInterface $dic) {
             $yaml = $dic['Yapeal.Configuration.Classes.yaml'] ?? '\Yapeal\Configuration\YamlConfigFile';
             return new $yaml();
             });