Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing some deprecations #1475

Merged
merged 1 commit into from
Jun 13, 2020
Merged

Fixing some deprecations #1475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 0 additions & 1 deletion config/bundles.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand Down
4 changes: 2 additions & 2 deletions config/routes/bolt.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions src/Kernel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
3 changes: 0 additions & 3 deletions symfony.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,6 @@
"src/Repository/.gitignore"
]
},
"doctrine/doctrine-cache-bundle": {
"version": "1.4.0"
},
"doctrine/doctrine-fixtures-bundle": {
"version": "3.0",
"recipe": {
Expand Down