diff --git a/composer.json b/composer.json index ebda6ec9a..91418d6b0 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,6 @@ "composer/composer": "^1.10", "composer/package-versions-deprecated": "^1.8", "doctrine/doctrine-bundle": "^2.0", - "doctrine/doctrine-cache-bundle": "^1.4", "doctrine/doctrine-fixtures-bundle": "^3.3", "doctrine/orm": "^2.7", "drupol/composer-packages": "^1.1", diff --git a/config/bundles.php b/config/bundles.php index 1b9ca306e..549e66644 100644 --- a/config/bundles.php +++ b/config/bundles.php @@ -4,7 +4,6 @@ ApiPlatform\Core\Bridge\Symfony\Bundle\ApiPlatformBundle::class => ['all' => true], DAMA\DoctrineTestBundle\DAMADoctrineTestBundle::class => ['test' => true], Doctrine\Bundle\DoctrineBundle\DoctrineBundle::class => ['all' => true], - Doctrine\Bundle\DoctrineCacheBundle\DoctrineCacheBundle::class => ['all' => true], Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['dev' => true, 'test' => true, 'local' => true], Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle::class => ['all' => true], Http\HttplugBundle\HttplugBundle::class => ['dev' => true, 'local' => true], diff --git a/config/routes/bolt.yaml b/config/routes/bolt.yaml index 5eebe8074..c12bc6610 100644 --- a/config/routes/bolt.yaml +++ b/config/routes/bolt.yaml @@ -10,13 +10,13 @@ control_panel: # Async: Upload, Embed control_panel_async: - resource: '../src/Controller/Backend/Async' + resource: '../../src/Controller/Backend/Async/' prefix: '%bolt.backend_url%/async' type: annotation # ImageController, Currently only used for thumbnails controllers: - resource: '../src/Controller/ImageController.php' + resource: '../../src/Controller/ImageController.php' type: annotation # Routes added by Extensions get added here, by Bolt\Extension\RoutesLoader diff --git a/src/Kernel.php b/src/Kernel.php index 9b563962b..8e4ee1c88 100644 --- a/src/Kernel.php +++ b/src/Kernel.php @@ -92,8 +92,6 @@ private function setBoltParameters(ContainerBuilder $container, string $confDir) $yaml = Yaml::parseFile($fileName); unset($yaml['__nodes']); - $container->set('bolt.config.general', $yaml); - foreach ($this->flattenKeys($yaml) as $key => $value) { $container->setParameter('bolt.' . $key, $value); } diff --git a/symfony.lock b/symfony.lock index a34cb8496..a1ed8cc28 100644 --- a/symfony.lock +++ b/symfony.lock @@ -157,9 +157,6 @@ "src/Repository/.gitignore" ] }, - "doctrine/doctrine-cache-bundle": { - "version": "1.4.0" - }, "doctrine/doctrine-fixtures-bundle": { "version": "3.0", "recipe": {