diff --git a/composer.json b/composer.json index f88b59a..fa4732d 100644 --- a/composer.json +++ b/composer.json @@ -10,27 +10,41 @@ } ], "require": { - "vlucas/phpdotenv": "^3.4@dev", + "php": "^8.2", "php-di/php-di": "dev-master", - "league/route": "dev-master", + "ext-json": "*", + "ext-posix": "*", + "ext-xmlreader": "*", + "ext-fileinfo": "*", + "league/route": "^5.0.0-dev", "laminas/laminas-diactoros": "2.24.x-dev", "laminas/laminas-httphandlerrunner": "2.5.x-dev", + "vlucas/phpdotenv": "^3.4@dev", + "middlewares/whoops": "dev-master", + "ralouphie/getallheaders": "dev-master", + "guzzlehttp/guzzle": "^6.3@dev", + "swiftmailer/swiftmailer": "^6.2@dev", "mcnd/storage": "dev-master", + "mcnd/lean": "dev-master", + "mcnd/lean-console": "dev-master", "mcnd/ulmus": "dev-master", "mcnd/picea": "dev-master", "mcnd/picea-ui": "dev-master", "mcnd/cronard": "dev-master", "mcnd/tell": "dev-master", "mcnd/dump": "dev-master", - "mcnd/notes": "dev-master", + "mcnd/event": "dev-master", + "mcnd/notes-cronard": "dev-master", + "mcnd/notes-event": "dev-master", + "mcnd/notes-tell": "dev-master", "mcnd/notes-route": "dev-master", "mcnd/notes-security": "dev-master", - "mcnd/notes-tell": "dev-master", - "swiftmailer/swiftmailer": "^6.2@dev", - "league/route": "^5.0.0-dev", - "vlucas/phpdotenv": "^3.4@dev", - "middlewares/whoops": "dev-master", - "ralouphie/getallheaders": "dev-master" + "mcnd/ulmus-user": "dev-master", + "mcnd/thebugs": "dev-master", + "mcnd/taxus": "dev-master", + "mcnd/imagine": "dev-master", + "mcnd/notes-breadcrumb": "dev-master", + "psr/simple-cache": "*" }, "repositories": [ { diff --git a/meta/definitions/event.php b/meta/definitions/event.php index 581e838..2e5fdd6 100644 --- a/meta/definitions/event.php +++ b/meta/definitions/event.php @@ -39,6 +39,7 @@ return [ { $class = $attribute->class; $method = $attribute->classMethod; + $object = $container->get($class); $request = $request->withAttribute('lean.route', $attribute); diff --git a/meta/definitions/template.php b/meta/definitions/template.php index 8aa3b7b..95d3d81 100644 --- a/meta/definitions/template.php +++ b/meta/definitions/template.php @@ -65,7 +65,7 @@ return [ NumberExtension::class => autowire(NumberExtension::class), - UrlExtension::class => create(UrlExtension::class)->constructor(getenv("URL_BASE"), get('git.commit'), getenv('APP_URL'), (bool) getenv('FORCE_SSL')), + UrlExtension::class => create(UrlExtension::class)->constructor(getenv("URL_BASE"), get('git.commit'), explode(',', getenv('APP_URL')), (bool) getenv('FORCE_SSL')), Cache::class => create(Opcache::class)->constructor(getenv("CACHE_PATH"), get(Context::class)), diff --git a/skeleton/.env b/skeleton/.env index 57ff9c5..b9cc2c8 100644 --- a/skeleton/.env +++ b/skeleton/.env @@ -1,11 +1,11 @@ APP_ENV = dev DEBUG = 1 -KEYS = "dev:dev" +KEYS = "dev" CRON_KEY = dev # Route URL_BASE = "" -APP_URL = "dev.cslsj.qc.ca" +APP_URL = "dev.mcnd.ca" # Path CACHE_DIR = "var/cache" @@ -22,18 +22,9 @@ DEFAULT_LOCAL = "fr_CA.UTF-8" DEFAULT_TIME = "fr.UTF-8" DEFAULT_TIME_FALLBACK = "french.UTF-8" -# MS Authentication -# MS_OAUTH_CLIENT_ID = "" -# MS_OAUTH_CLIENT_SECRET = "" - -# MS Graph -# MS_GRAPH_CLIENT_ID = "" -# MS_GRAPH_CLIENT_SECRET = "" -# MS_GRAPH_ACCESS_TOKEN_URL = "" - # Database -DATABASE_PORT = "3306" -DATABASE_HOST = "appsdb.cslsj.qc.ca" +DATABASE_PORT = "" +DATABASE_HOST = "" DATABASE_NAME = "" DATABASE_USERNAME = "" DATABASE_PASSWORD = ""