@@ -85,7 +85,7 @@ |
||
| 85 | 85 | * @param string $name |
| 86 | 86 | * @param array $arguments |
| 87 | 87 | * |
| 88 | - * @return mixed |
|
| 88 | + * @return string |
|
| 89 | 89 | * @throws \InvalidArgumentException |
| 90 | 90 | * @throws \DomainException |
| 91 | 91 | * @throws \BadMethodCallException |
@@ -164,7 +164,7 @@ discard block |
||
| 164 | 164 | $dic = $this->getDic(); |
| 165 | 165 | /** @noinspection PhpParamsInspection */ |
| 166 | 166 | if (array_key_exists('Yapeal.vendorParentDir', $dic)) { |
| 167 | - $appConfigFile = $dic['Yapeal.vendorParentDir'] . 'config/yapeal.yaml'; |
|
| 167 | + $appConfigFile = $dic['Yapeal.vendorParentDir'].'config/yapeal.yaml'; |
|
| 168 | 168 | $this->configFile = is_readable($appConfigFile) && is_file($appConfigFile); |
| 169 | 169 | } |
| 170 | 170 | } |
@@ -197,7 +197,7 @@ discard block |
||
| 197 | 197 | $this->schema = false; |
| 198 | 198 | } |
| 199 | 199 | $result = array_values($result->fetchAll(\PDO::FETCH_COLUMN)); |
| 200 | - $schemaName = $dic['Yapeal.Sql.Platforms.' . $dic['Yapeal.Sql.platform'] . '.schema']; |
|
| 200 | + $schemaName = $dic['Yapeal.Sql.Platforms.'.$dic['Yapeal.Sql.platform'].'.schema']; |
|
| 201 | 201 | if (!in_array($schemaName, $result, false)) { |
| 202 | 202 | $this->schema = false; |
| 203 | 203 | } |
@@ -263,7 +263,7 @@ discard block |
||
| 263 | 263 | private function yamlMenu(InputInterface $input, OutputInterface $output) |
| 264 | 264 | { |
| 265 | 265 | if ($this->hasConfigFile()) { |
| 266 | - $ycf = new YamlConfigFile($this->getDic()['Yapeal.vendorParentDir'] . 'config'); |
|
| 266 | + $ycf = new YamlConfigFile($this->getDic()['Yapeal.vendorParentDir'].'config'); |
|
| 267 | 267 | $ycf->read(); |
| 268 | 268 | $this->yamlFile = $ycf->getSettings(); |
| 269 | 269 | } |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | * @var WiringInterface $class |
| 66 | 66 | */ |
| 67 | 67 | foreach ($names as $name) { |
| 68 | - $setting = $base . strtolower($name); |
|
| 68 | + $setting = $base.strtolower($name); |
|
| 69 | 69 | if (!empty($dic[$setting]) |
| 70 | 70 | && is_subclass_of($dic[$setting], '\\Yapeal\\Configuration\\WiringInterface', true) |
| 71 | 71 | ) { |
@@ -73,11 +73,11 @@ discard block |
||
| 73 | 73 | $class->wire($dic); |
| 74 | 74 | continue; |
| 75 | 75 | } |
| 76 | - $methodName = 'wire' . $name; |
|
| 76 | + $methodName = 'wire'.$name; |
|
| 77 | 77 | if (method_exists($this, $methodName)) { |
| 78 | 78 | $this->$methodName(); |
| 79 | 79 | } else { |
| 80 | - $mess = 'Could NOT find class or method for ' . $name; |
|
| 80 | + $mess = 'Could NOT find class or method for '.$name; |
|
| 81 | 81 | throw new \LogicException($mess); |
| 82 | 82 | } |
| 83 | 83 | } |
@@ -92,23 +92,23 @@ discard block |
||
| 92 | 92 | protected function wireConfig() |
| 93 | 93 | { |
| 94 | 94 | $dic = $this->getDic(); |
| 95 | - $path = str_replace('\\', '/', dirname(dirname(__DIR__))) . '/'; |
|
| 95 | + $path = str_replace('\\', '/', dirname(dirname(__DIR__))).'/'; |
|
| 96 | 96 | // These two paths are critical to Yapeal-ng working and can't be overridden here. |
| 97 | 97 | $dic['Yapeal.baseDir'] = $path; |
| 98 | - $dic['Yapeal.libDir'] = $path . 'lib/'; |
|
| 98 | + $dic['Yapeal.libDir'] = $path.'lib/'; |
|
| 99 | 99 | if (empty($dic['Yapeal.Config.Yaml'])) { |
| 100 | - $dic['Yapeal.Config.Yaml'] = $dic->factory(function () use($dic) { |
|
| 100 | + $dic['Yapeal.Config.Yaml'] = $dic->factory(function() use($dic) { |
|
| 101 | 101 | return new YamlConfigFile(); |
| 102 | 102 | }); |
| 103 | 103 | } |
| 104 | 104 | $configFiles = [ |
| 105 | - __DIR__ . '/yapeal_defaults.yaml', |
|
| 106 | - $path . 'config/yapeal.yaml' |
|
| 105 | + __DIR__.'/yapeal_defaults.yaml', |
|
| 106 | + $path.'config/yapeal.yaml' |
|
| 107 | 107 | ]; |
| 108 | 108 | $vendorPos = strpos($path, 'vendor/'); |
| 109 | 109 | if (false !== $vendorPos) { |
| 110 | 110 | $dic['Yapeal.vendorParentDir'] = substr($path, 0, $vendorPos); |
| 111 | - $configFiles[] = $dic['Yapeal.vendorParentDir'] . 'config/yapeal.yaml'; |
|
| 111 | + $configFiles[] = $dic['Yapeal.vendorParentDir'].'config/yapeal.yaml'; |
|
| 112 | 112 | } |
| 113 | 113 | $settings = []; |
| 114 | 114 | // Process each file in turn so any substitutions are done in a more |