Remove class parameters from container

sonata-project · Oct 7, 2021 · 0aa95b4 · 0aa95b4
1 parent 883e3c1
commit 0aa95b4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 23 deletions.
diff --git a/src/DependencyInjection/SonataSeoExtension.php b/src/DependencyInjection/SonataSeoExtension.php
@@ -13,6 +13,8 @@
 
 namespace Sonata\SeoBundle\DependencyInjection;
 
+use Sonata\Exporter\Source\DoctrineDBALConnectionSourceIterator;
+use Sonata\Exporter\Source\SymfonySitemapSourceIterator;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
@@ -75,7 +77,7 @@ private function configureSitemap(array $config, ContainerBuilder $container): v
             // define the connectionIterator
             $connectionIteratorId = 'sonata.seo.source.doctrine_connection_iterator_'.$pos;
 
-            $connectionIterator = new Definition('%sonata.seo.exporter.database_source_iterator.class%', [
+            $connectionIterator = new Definition(DoctrineDBALConnectionSourceIterator::class, [
                 new Reference($sitemap['connection']),
                 $sitemap['query'],
             ]);
@@ -86,7 +88,7 @@ private function configureSitemap(array $config, ContainerBuilder $container): v
             // define the sitemap proxy iterator
             $sitemapIteratorId = 'sonata.seo.source.doctrine_sitemap_iterator_'.$pos;
 
-            $sitemapIterator = new Definition('%sonata.seo.exporter.sitemap_source_iterator.class%', [
+            $sitemapIterator = new Definition(SymfonySitemapSourceIterator::class, [
                 new Reference($connectionIteratorId),
                 new Reference('router'),
                 $sitemap['route'],

diff --git a/src/Resources/config/blocks.php b/src/Resources/config/blocks.php
@@ -18,13 +18,10 @@
 return static function (ContainerConfigurator $containerConfigurator): void {
     // Use "service" function for creating references to services when dropping support for Symfony 4.4
     // Use "param" function for creating references to parameters when dropping support for Symfony 5.1
-    $containerConfigurator->parameters()
-        ->set('sonata.seo.block.breadcrumb.homepage.class', HomepageBreadcrumbBlockService::class);
 
     $containerConfigurator->services()
 
-        // Breadcrumb
-        ->set('sonata.seo.block.breadcrumb.homepage', '%sonata.seo.block.breadcrumb.homepage.class%')
+        ->set('sonata.seo.block.breadcrumb.homepage', HomepageBreadcrumbBlockService::class)
             ->public()
             ->tag('sonata.block')
             ->tag('sonata.breadcrumb')

diff --git a/src/Resources/config/services.php b/src/Resources/config/services.php
@@ -11,8 +11,6 @@
  * file that was distributed with this source code.
  */
 
-use Sonata\Exporter\Source\DoctrineDBALConnectionSourceIterator;
-use Sonata\Exporter\Source\SymfonySitemapSourceIterator;
 use Sonata\SeoBundle\Seo\SeoPage;
 use Sonata\SeoBundle\Sitemap\SourceManager;
 use Sonata\SeoBundle\Twig\Extension\SeoExtension;
@@ -22,30 +20,18 @@
 return static function (ContainerConfigurator $containerConfigurator): void {
     // Use "service" function for creating references to services when dropping support for Symfony 4.4
     // Use "param" function for creating references to parameters when dropping support for Symfony 5.1
-    $containerConfigurator->parameters()
-
-        ->set('sonata.seo.exporter.database_source_iterator.class', DoctrineDBALConnectionSourceIterator::class)
-
-        ->set('sonata.seo.exporter.sitemap_source_iterator.class', SymfonySitemapSourceIterator::class)
-
-        ->set('sonata.seo.page.default.class', SeoPage::class)
-
-        ->set('sonata.seo.twig.extension.class', SeoExtension::class)
-
-        ->set('sonata.seo.sitemap.manager.class', SourceManager::class);
-
     $containerConfigurator->services()
 
-        ->set('sonata.seo.page.default', '%sonata.seo.page.default.class%')
+        ->set('sonata.seo.page.default', SeoPage::class)
             ->public()
 
-        ->set('sonata.seo.twig.extension', '%sonata.seo.twig.extension.class%')
+        ->set(SeoExtension::class)
             ->tag('twig.extension')
             ->args([
                 new ReferenceConfigurator('sonata.seo.page'),
                 '',
             ])
 
-        ->set('sonata.seo.sitemap.manager', '%sonata.seo.sitemap.manager.class%')
+        ->set('sonata.seo.sitemap.manager', SourceManager::class)
             ->public();
 };