diff --git a/composer.json b/composer.json index a949dde65daeb1f5696dacf0a64f715901da14bd..160557794fc7efd6d51f6f158a490bb2ccaeb6f2 100644 --- a/composer.json +++ b/composer.json @@ -6,7 +6,7 @@ "php": ">=7.3", "ext-json": "*", "api-platform/core": "^2.6", - "dbp/relay-core-bundle": "dev-main as 0.1.32", + "dbp/relay-core-bundle": "dev-main as 0.1.34", "symfony/config": "^5.4", "symfony/framework-bundle": "^5.4", "symfony/security-bundle": "^5.4", diff --git a/composer.lock b/composer.lock index 9d2908d4b8a3953f95487499217dd1f1bf825d6e..cf749b9451c2ab78223611517cdaf7a0a538c261 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "d21fecd0dcd474297b30d7107433ac01", + "content-hash": "4900ef0af037a9733d0007e42ceb50b0", "packages": [ { "name": "api-platform/core", @@ -172,14 +172,8 @@ "version": "dev-main", "source": { "type": "git", - "url": "https://gitlab.tugraz.at/dbp/relay/dbp-relay-core-bundle.git", - "reference": "d26c15b56035d0fc4277a8b6e1f49148b1c7653e" - }, - "dist": { - "type": "zip", - "url": "https://gitlab.tugraz.at/api/v4/projects/dbp%2Frelay%2Fdbp-relay-core-bundle/repository/archive.zip?sha=d26c15b56035d0fc4277a8b6e1f49148b1c7653e", - "reference": "d26c15b56035d0fc4277a8b6e1f49148b1c7653e", - "shasum": "" + "url": "git@gitlab.tugraz.at:dbp/relay/dbp-relay-core-bundle.git", + "reference": "d957d248aff513901e89d6eeb7dc8d0e3f68ea63" }, "require": { "api-platform/core": "^2.6.6", @@ -275,11 +269,7 @@ "AGPL-3.0-or-later" ], "description": "The core bundle of the Relay API gateway", - "support": { - "source": "https://gitlab.tugraz.at/dbp/relay/dbp-relay-core-bundle/-/tree/main", - "issues": "https://gitlab.tugraz.at/dbp/relay/dbp-relay-core-bundle/-/issues" - }, - "time": "2022-04-23T02:26:01+02:00" + "time": "2022-04-26T12:25:46+00:00" }, { "name": "doctrine/annotations", @@ -10041,8 +10031,8 @@ { "package": "dbp/relay-core-bundle", "version": "dev-main", - "alias": "0.1.32", - "alias_normalized": "0.1.32.0" + "alias": "0.1.34", + "alias_normalized": "0.1.34.0" } ], "minimum-stability": "stable", @@ -10059,5 +10049,5 @@ "platform-overrides": { "php": "7.3" }, - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.2.0" } diff --git a/src/DependencyInjection/DbpRelayBaseCourseExtension.php b/src/DependencyInjection/DbpRelayBaseCourseExtension.php index 38c2e02e3fe5e2a963b495ed5971f20d5222bb6a..34a57f0f20af84370d9d124e2605c850ed3b3964 100644 --- a/src/DependencyInjection/DbpRelayBaseCourseExtension.php +++ b/src/DependencyInjection/DbpRelayBaseCourseExtension.php @@ -4,6 +4,7 @@ declare(strict_types=1); namespace Dbp\Relay\BaseCourseBundle\DependencyInjection; +use Dbp\Relay\CoreBundle\Extension\ExtensionTrait; use Symfony\Component\Config\FileLocator; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Loader\YamlFileLoader; @@ -11,16 +12,14 @@ use Symfony\Component\HttpKernel\DependencyInjection\ConfigurableExtension; class DbpRelayBaseCourseExtension extends ConfigurableExtension { + use ExtensionTrait; + public function loadInternal(array $mergedConfig, ContainerBuilder $container) { - $this->extendArrayParameter( - $container, 'api_platform.resource_class_directories', [__DIR__.'/../Entity']); + $this->addResourceClassDirectory($container, __DIR__.'/../Entity'); - $this->extendArrayParameter( - $container, 'dbp_api.paths_to_hide', [ - '/course_attendees', - '/course_attendees/{identifier}', - ]); + $this->addPathToHide($container, '/course_attendees'); + $this->addPathToHide($container, '/course_attendees/{identifier}'); $loader = new YamlFileLoader( $container, @@ -28,14 +27,4 @@ class DbpRelayBaseCourseExtension extends ConfigurableExtension ); $loader->load('services.yaml'); } - - private function extendArrayParameter(ContainerBuilder $container, string $parameter, array $values) - { - if (!$container->hasParameter($parameter)) { - $container->setParameter($parameter, []); - } - $oldValues = $container->getParameter($parameter); - assert(is_array($oldValues)); - $container->setParameter($parameter, array_merge($oldValues, $values)); - } }