Yapeal / yapeal-ng

lib/Cli/Yapeal/YapealSetup.php

Spacing +3 added lines, -3 removed lines

@@ -164,7 +164,7 @@ 
             $dic = $this->getDic();
             /** @noinspection PhpParamsInspection */
             if (array_key_exists('Yapeal.vendorParentDir', $dic)) {
-                $appConfigFile = $dic['Yapeal.vendorParentDir'] . 'config/yapeal.yaml';
+                $appConfigFile = $dic['Yapeal.vendorParentDir'].'config/yapeal.yaml';
                 $this->configFile = is_readable($appConfigFile) && is_file($appConfigFile);
             }
         }
@@ -197,7 +197,7 @@ 
                 $this->schema = false;
             }
             $result = array_values($result->fetchAll(\PDO::FETCH_COLUMN));
-            $schemaName = $dic['Yapeal.Sql.Platforms.' . $dic['Yapeal.Sql.platform'] . '.schema'];
+            $schemaName = $dic['Yapeal.Sql.Platforms.'.$dic['Yapeal.Sql.platform'].'.schema'];
             if (!in_array($schemaName, $result, false)) {
                 $this->schema = false;
             }
@@ -263,7 +263,7 @@ 
     private function yamlMenu(InputInterface $input, OutputInterface $output)
     {
         if ($this->hasConfigFile()) {
-            $ycf = new YamlConfigFile($this->getDic()['Yapeal.vendorParentDir'] . 'config');
+            $ycf = new YamlConfigFile($this->getDic()['Yapeal.vendorParentDir'].'config');
             $ycf->read();
             $this->yamlFile = $ycf->getSettings();
         }

lib/Sql/SqlSubsTrait.php

Spacing +4 added lines, -4 removed lines

@@ -71,7 +71,7 @@ 
         $lines = explode("\n", $sql);
         // Filter out non-sql lines like comments and blank lines.
         $lines = array_filter($lines,
-            function ($line) {
+            function($line) {
                 $line = trim($line);
                 $nonSql = '' === $line
                     || 0 === strpos($line, '--')
@@ -91,12 +91,12 @@ 
     protected function getSqlSubs(ContainerInterface $dic)
     {
         $keys = $dic->keys();
-        $platform = '.' . $dic['Yapeal.Sql.platform'];
+        $platform = '.'.$dic['Yapeal.Sql.platform'];
         /**
          * @var array $filteredKeys
          */
         $filteredKeys = array_filter($keys,
-            function ($key) use ($platform) {
+            function($key) use ($platform) {
                 if (0 !== strpos($key, 'Yapeal.Sql.')) {
                     return false;
                 }
@@ -107,7 +107,7 @@ 
             });
         $replacements = [];
         foreach ($filteredKeys as $key) {
-            $subName = '{' . substr($key, strrpos($key, '.') + 1) . '}';
+            $subName = '{'.substr($key, strrpos($key, '.') + 1).'}';
             $replacements[$subName] = $dic[$key];
         }
         return $replacements;

lib/FileSystem/CacheRetriever.php

Spacing +4 added lines, -4 removed lines

@@ -108,10 +108,10 @@ 
     public function setCachePath(string $value = null): self
     {
         if (null === $value) {
-            $value = dirname(__DIR__, 2) . '/cache/';
+            $value = dirname(__DIR__, 2).'/cache/';
         }
         if (!is_string($value)) {
-            $mess = 'Cache path MUST be string, but was given ' . gettype($value);
+            $mess = 'Cache path MUST be string, but was given '.gettype($value);
             throw new \InvalidArgumentException($mess);
         }
         $this->cachePath = $this->getFpn()
@@ -179,8 +179,8 @@ 
         }
         $eveFormat = 'Y-m-d H:i:sP';
         $now = new \DateTimeImmutable('now', new \DateTimeZone('UTC'));
-        $current = \DateTimeImmutable::createFromFormat($eveFormat, $current . '+00:00');
-        $until = \DateTimeImmutable::createFromFormat($eveFormat, $until . '+00:00');
+        $current = \DateTimeImmutable::createFromFormat($eveFormat, $current.'+00:00');
+        $until = \DateTimeImmutable::createFromFormat($eveFormat, $until.'+00:00');
         // At minimum use cached XML for 5 minutes.
         if ($now <= $current->add(new \DateInterval('PT5M'))) {
             return false;

lib/Configuration/Wiring.php

Spacing +9 added lines, -9 removed lines

@@ -65,7 +65,7 @@ 
          * @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)
             ) {
@@ -73,11 +73,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);
             }
         }
@@ -92,23 +92,23 @@ 
     protected function wireConfig()
     {
         $dic = $this->getDic();
-        $path = str_replace('\\', '/', dirname(dirname(__DIR__))) . '/';
+        $path = str_replace('\\', '/', dirname(dirname(__DIR__))).'/';
         // These two paths are critical to Yapeal-ng working and can't be overridden here.
         $dic['Yapeal.baseDir'] = $path;
-        $dic['Yapeal.libDir'] = $path . 'lib/';
+        $dic['Yapeal.libDir'] = $path.'lib/';
         if (empty($dic['Yapeal.Config.Yaml'])) {
-            $dic['Yapeal.Config.Yaml'] = $dic->factory(function () {
+            $dic['Yapeal.Config.Yaml'] = $dic->factory(function() {
                 return new YamlConfigFile();
             });
         }
         $configFiles = [
-            __DIR__ . '/yapeal_defaults.yaml',
-            $path . 'config/yapeal.yaml'
+            __DIR__.'/yapeal_defaults.yaml',
+            $path.'config/yapeal.yaml'
         ];
         $vendorPos = strpos($path, 'vendor/');
         if (false !== $vendorPos) {
             $dic['Yapeal.vendorParentDir'] = substr($path, 0, $vendorPos);
-            $configFiles[] = $dic['Yapeal.vendorParentDir'] . 'config/yapeal.yaml';
+            $configFiles[] = $dic['Yapeal.vendorParentDir'].'config/yapeal.yaml';
         }
         $settings = [];
         // Process each file in turn so any substitutions are done in a more

lib/Configuration/ConfigFileProcessingTrait.php

Spacing +2 added lines, -2 removed lines

@@ -87,7 +87,7 @@ 
         $depth = 0;
         $maxDepth = 10;
         $regEx = '%(?<all>\{(?<name>Yapeal(?:\.\w+)+)\})%';
-        $callback = function ($match) use ($settings, $dic) {
+        $callback = function($match) use ($settings, $dic) {
             $name = $match['name'];
             return $settings[$name] ?? $dic[$name] ?? $match['all'];
         };
@@ -101,7 +101,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);

lib/Cli/Schema/AbstractSchemaCommon.php

Spacing +3 added lines, -3 removed lines

@@ -128,7 +128,7 @@ 
         $yem = $this->getYem();
         $statements = explode(';', $this->getCleanedUpSql($sqlStatements, $this->getReplacements()));
         $statements = array_filter($statements,
-            function ($statement) {
+            function($statement) {
                 return '' !== trim($statement);
             });
         $progress = null;
@@ -160,7 +160,7 @@ 
                     $progress->finish();
                     $output->writeln('');
                 }
-                $mess = '<comment>' . $sql . '</comment>';
+                $mess = '<comment>'.$sql.'</comment>';
                 $yem->triggerLogEvent('Yapeal.Log.log', Logger::DEBUG, strip_tags($mess));
                 $output->writeln($mess);
                 $mess = sprintf('Sql failed in %1$s on statement %2$s with (%3$s) %4$s',
@@ -207,7 +207,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;