Skip to content
Snippets Groups Projects
Commit 182ad3a3 authored by Reiter, Christoph's avatar Reiter, Christoph :snake:
Browse files

Switch to the new core package name

parent efdc5ece
No related branches found
No related tags found
No related merge requests found
Pipeline #105734 failed
...@@ -4,10 +4,10 @@ ...@@ -4,10 +4,10 @@
"license": "AGPL-3.0-or-later", "license": "AGPL-3.0-or-later",
"require": { "require": {
"php": "^7.3", "php": "^7.3",
"ext-json": "*",
"api-platform/core": "^2.5", "api-platform/core": "^2.5",
"symfony/framework-bundle": "^5.2", "dbp/relay-core-bundle": "^0.1.11",
"dbp/api-core-bundle": "^0.1.3", "symfony/framework-bundle": "^5.2"
"ext-json": "*"
}, },
"require-dev": { "require-dev": {
"friendsofphp/php-cs-fixer": "^3.0", "friendsofphp/php-cs-fixer": "^3.0",
...@@ -18,12 +18,6 @@ ...@@ -18,12 +18,6 @@
"symfony/phpunit-bridge": "^5.2", "symfony/phpunit-bridge": "^5.2",
"vimeo/psalm": "^4.2.1" "vimeo/psalm": "^4.2.1"
}, },
"repositories": [
{
"type": "vcs",
"url": "https://gitlab.tugraz.at/dbp/dbp-api/api-core-bundle.git"
}
],
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"Dbp\\Relay\\TemplateBundle\\": "src/" "Dbp\\Relay\\TemplateBundle\\": "src/"
......
This diff is collapsed.
...@@ -6,7 +6,7 @@ namespace Dbp\Relay\TemplateBundle\DataProvider; ...@@ -6,7 +6,7 @@ namespace Dbp\Relay\TemplateBundle\DataProvider;
use ApiPlatform\Core\DataProvider\CollectionDataProviderInterface; use ApiPlatform\Core\DataProvider\CollectionDataProviderInterface;
use ApiPlatform\Core\DataProvider\RestrictedDataProviderInterface; use ApiPlatform\Core\DataProvider\RestrictedDataProviderInterface;
use DBP\API\CoreBundle\Helpers\ArrayFullPaginator; use Dbp\Relay\CoreBundle\Helpers\ArrayFullPaginator;
use Dbp\Relay\TemplateBundle\Entity\Place; use Dbp\Relay\TemplateBundle\Entity\Place;
use Dbp\Relay\TemplateBundle\Service\PlaceProviderInterface; use Dbp\Relay\TemplateBundle\Service\PlaceProviderInterface;
......
...@@ -5,7 +5,7 @@ declare(strict_types=1); ...@@ -5,7 +5,7 @@ declare(strict_types=1);
namespace Dbp\Relay\TemplateBundle\Tests; namespace Dbp\Relay\TemplateBundle\Tests;
use ApiPlatform\Core\Bridge\Symfony\Bundle\ApiPlatformBundle; use ApiPlatform\Core\Bridge\Symfony\Bundle\ApiPlatformBundle;
use DBP\API\CoreBundle\DbpCoreBundle; use Dbp\Relay\CoreBundle\DbpRelayCoreBundle;
use Dbp\Relay\TemplateBundle\DbpRelayTemplateBundle; use Dbp\Relay\TemplateBundle\DbpRelayTemplateBundle;
use Nelmio\CorsBundle\NelmioCorsBundle; use Nelmio\CorsBundle\NelmioCorsBundle;
use Symfony\Bundle\FrameworkBundle\FrameworkBundle; use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
...@@ -13,7 +13,7 @@ use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait; ...@@ -13,7 +13,7 @@ use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
use Symfony\Bundle\SecurityBundle\SecurityBundle; use Symfony\Bundle\SecurityBundle\SecurityBundle;
use Symfony\Bundle\TwigBundle\TwigBundle; use Symfony\Bundle\TwigBundle\TwigBundle;
use Symfony\Component\Config\Loader\LoaderInterface; use Symfony\Component\Config\Loader\LoaderInterface;
use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
use Symfony\Component\HttpKernel\Kernel as BaseKernel; use Symfony\Component\HttpKernel\Kernel as BaseKernel;
use Symfony\Component\Routing\RouteCollectionBuilder; use Symfony\Component\Routing\RouteCollectionBuilder;
...@@ -29,22 +29,23 @@ class Kernel extends BaseKernel ...@@ -29,22 +29,23 @@ class Kernel extends BaseKernel
yield new NelmioCorsBundle(); yield new NelmioCorsBundle();
yield new ApiPlatformBundle(); yield new ApiPlatformBundle();
yield new DbpRelayTemplateBundle(); yield new DbpRelayTemplateBundle();
yield new DbpCoreBundle(); yield new DbpRelayCoreBundle();
} }
protected function configureRoutes(RouteCollectionBuilder $routes) protected function configureRoutes(RouteCollectionBuilder $routes)
{ {
$routes->import('@DbpCoreBundle/Resources/config/routing.yaml'); $routes->import('@DbpRelayCoreBundle/Resources/config/routing.yaml');
} }
protected function configureContainer(ContainerBuilder $c, LoaderInterface $loader) protected function configureContainer(ContainerConfigurator $container, LoaderInterface $loader)
{ {
$c->loadFromExtension('framework', [ $container->import('@DbpRelayCoreBundle/Resources/config/services_test.yaml');
$container->extension('framework', [
'test' => true, 'test' => true,
'secret' => '', 'secret' => '',
]); ]);
$c->loadFromExtension('dbp_relay_template', [ $container->extension('dbp_relay_template', [
'secret_token' => 'secret-test', 'secret_token' => 'secret-test',
]); ]);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment