Skip to content

Commit 8c2681e

Browse files
committed
Update for PHP-CRUD-API v2.14.12
1 parent 94c6cee commit 8c2681e

File tree

6 files changed

+3617
-1575
lines changed

6 files changed

+3617
-1575
lines changed

composer.lock

Lines changed: 23 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Tqdev/PhpCrudUi/Client/LocalCaller.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
namespace Tqdev\PhpCrudUi\Client;
44

55
use Tqdev\PhpCrudApi\Api;
6-
use Tqdev\PhpCrudApi\Config;
6+
use Tqdev\PhpCrudApi\Config\Config;
77
use Tqdev\PhpCrudApi\RequestFactory;
88

99
class LocalCaller implements ApiCaller

src/Tqdev/PhpCrudUi/Config.php

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
namespace Tqdev\PhpCrudUi;
44

5-
class Config
5+
use Tqdev\PhpCrudApi\Config\Base\ConfigInterface;
6+
7+
class Config implements ConfigInterface
68
{
79
private $values = [
810
'url' => '',
@@ -66,6 +68,22 @@ public function __construct(array $values)
6668
$this->values = $newValues;
6769
}
6870

71+
private function getEnvironmentVariableName(string $key): string
72+
{
73+
$prefix = "PHP_CRUD_UI_";
74+
$suffix = strtoupper(preg_replace('/(?<!^)[A-Z]/', '_$0', str_replace('.', '_', $key)));
75+
return $prefix . $suffix;
76+
}
77+
78+
public function getProperty(string $key, $default = '')
79+
{
80+
if (strpos($key, 'Handler')) {
81+
return $this->values[$key] ?? $default;
82+
}
83+
$variableName = $this->getEnvironmentVariableName($key);
84+
return getenv($variableName, true) ?: ($this->values[$key] ?? $default);
85+
}
86+
6987
public function getMiddlewares(): array
7088
{
7189
return $this->values['middlewares'];

src/Tqdev/PhpCrudUi/Ui.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ public function __construct(Config $config)
3636
$definition = new SpecificationService($api, $cache, $config->getCacheTime());
3737
$responder = new MultiResponder($config->getTemplatePath());
3838
$router = new SimpleRouter($config->getBasePath(), $responder, $cache, $config->getCacheTime(), $config->getDebug());
39-
foreach ($config->getMiddlewares() as $middleware => $properties) {
39+
foreach (array_keys($config->getMiddlewares()) as $middleware) {
4040
switch ($middleware) {
4141
case 'staticFile':
42-
new StaticFileMiddleware($router, $responder, $properties);
42+
new StaticFileMiddleware($router, $responder, $config, $middleware);
4343
break;
4444
}
4545
}

0 commit comments

Comments
 (0)