Version 5.1 - All the GraphQL #32

Closed
timw4mail wants to merge 1160 commits from develop into master
2 changed files with 6 additions and 9 deletions
Showing only changes of commit fffd75122f - Show all commits

View File

@ -27,10 +27,7 @@
} }
}, },
"config": { "config": {
"lock": false, "lock": false
"platform": {
"php": "8"
}
}, },
"require": { "require": {
"amphp/amp": "^2.5.0", "amphp/amp": "^2.5.0",
@ -39,18 +36,18 @@
"aura/router": "^3.1.0", "aura/router": "^3.1.0",
"aura/session": "^2.1.0", "aura/session": "^2.1.0",
"aviat/banker": "^3.0.0", "aviat/banker": "^3.0.0",
"aviat/query": "^3.0.0", "aviat/query": "^4.0.0",
"danielstjules/stringy": "^3.1.0",
"ext-dom": "*", "ext-dom": "*",
"ext-gd": "*",
"ext-intl": "*", "ext-intl": "*",
"ext-json": "*", "ext-json": "*",
"ext-gd": "*", "ext-mbstring": "*",
"ext-pdo": "*", "ext-pdo": "*",
"laminas/laminas-diactoros": "^2.5.0", "laminas/laminas-diactoros": "^2.5.0",
"laminas/laminas-httphandlerrunner": "^2.1.0", "laminas/laminas-httphandlerrunner": "^2.1.0",
"maximebf/consolekit": "^1.0.3", "maximebf/consolekit": "^1.0.3",
"monolog/monolog": "^2.0.2", "monolog/monolog": "^2.0.2",
"php": ">= 8.0.0", "php": ">= 8.1.0",
"psr/http-message": "^1.0.1", "psr/http-message": "^1.0.1",
"psr/log": "*", "psr/log": "*",
"symfony/polyfill-mbstring": "^1.0.0", "symfony/polyfill-mbstring": "^1.0.0",

View File

@ -35,7 +35,7 @@ $CONF_DIR = _dir($APP_DIR, 'config');
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// Dependency Injection setup // Dependency Injection setup
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
$baseConfig = require "{$APPCONF_DIR}/base_config.php"; $baseConfig = require _dir($APPCONF_DIR, 'base_config.php');
$di = require "{$APP_DIR}/bootstrap.php"; $di = require "{$APP_DIR}/bootstrap.php";
$config = loadConfig($CONF_DIR); $config = loadConfig($CONF_DIR);