Merge remote-tracking branch 'upstream/2.x' into merge-2.x

# Conflicts:
#	src/Block/Breadcrumb/BaseBreadcrumbMenuBlockService.php
#	src/Block/Breadcrumb/HomepageBreadcrumbBlockService.php
#	src/Block/Social/BaseFacebookSocialPluginsBlockService.php
#	src/Block/Social/BaseTwitterButtonBlockService.php
#	src/Block/Social/EmailShareButtonBlockService.php
#	src/Block/Social/FacebookLikeBoxBlockService.php
#	src/Block/Social/FacebookLikeButtonBlockService.php
#	src/Block/Social/FacebookSendButtonBlockService.php
#	src/Block/Social/FacebookShareButtonBlockService.php
#	src/Block/Social/PinterestPinButtonBlockService.php
#	src/Block/Social/TwitterEmbedTweetBlockService.php
#	src/Block/Social/TwitterFollowButtonBlockService.php
#	src/Block/Social/TwitterHashtagButtonBlockService.php
#	src/Block/Social/TwitterMentionButtonBlockService.php
#	src/Block/Social/TwitterShareButtonBlockService.php
#	src/Command/SitemapGeneratorCommand.php
#	src/DependencyInjection/Compiler/BreadcrumbBlockServicesCompilerPass.php
#	src/DependencyInjection/Configuration.php
#	src/DependencyInjection/SonataSeoExtension.php
#	src/Event/BreadcrumbListener.php
#	src/Resources/config/blocks.xml
#	src/Seo/SeoPage.php
#	src/Seo/SeoPageInterface.php
#	src/Sitemap/SourceManager.php
#	src/SonataSeoBundle.php
#	src/Twig/Extension/SeoExtension.php
#	tests/DependencyInjection/Compiler/BreadcrumbBlockServicesCompilerPassTest.php
#	tests/DependencyInjection/Compiler/ServiceCompilerPassTest.php
#	tests/DependencyInjection/ConfigurationTest.php
#	tests/Seo/SeoPageTest.php
#	tests/Twig/Extension/SeoExtensionTest.php

composer.json

@@ -6,7 +6,7 @@
         "seo",
         "sonata"
     ],
-    "homepage": "https://sonata-project.org/bundles/seo",
+    "homepage": "https://docs.sonata-project.org/projects/SonataSeoBundle",
     "license": "MIT",
     "authors": [
         {

src/Block/Breadcrumb/BaseBreadcrumbMenuBlockService.php

@@ -17,7 +17,6 @@
 use Knp\Menu\ItemInterface;
 use Sonata\BlockBundle\Block\BlockContextInterface;
 use Sonata\BlockBundle\Block\Service\AbstractBlockService;
-use Sonata\SeoBundle\BreadcrumbInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Twig\Environment;
 
@@ -26,7 +25,7 @@
  *
  * @author Sylvain Deloux <sylvain.deloux@ekino.com>
  */
-abstract class BaseBreadcrumbMenuBlockService extends AbstractBlockService implements BreadcrumbInterface
+abstract class BaseBreadcrumbMenuBlockService extends AbstractBlockService implements BreadcrumbBlockService
 {
     private FactoryInterface $factory;
 

src/Block/Breadcrumb/BreadcrumbBlockService.php

@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the Sonata Project package.
+ *
+ * (c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Sonata\SeoBundle\Block\Breadcrumb;
+
+use Sonata\SeoBundle\BreadcrumbInterface;
+
+interface BreadcrumbBlockService extends BreadcrumbInterface
+{
+}

src/BreadcrumbInterface.php

@@ -15,6 +15,9 @@
 
 use Sonata\BlockBundle\Block\Service\BlockServiceInterface;
 
+/**
+ * @deprecated since sonata-project/seo-bundle 2.x, to be removed in 3.0. Use Sonata\SeoBundle\Block\Breadcrumb\Breadcrumb instead.
+ */
 interface BreadcrumbInterface extends BlockServiceInterface
 {
     public function handleContext(string $context): bool;

src/DependencyInjection/SonataSeoExtension.php

@@ -16,7 +16,7 @@
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
-use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
+use Symfony\Component\DependencyInjection\Loader;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
@@ -33,15 +33,15 @@ public function load(array $configs, ContainerBuilder $container): void
 
         $bundles = $container->getParameter('kernel.bundles');
 
-        $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
+        $loader = new Loader\PhpFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
 
         if (isset($bundles['SonataBlockBundle'], $bundles['KnpMenuBundle'])) {
-            $loader->load('blocks.xml');
+            $loader->load('blocks.php');
         }
 
-        $loader->load('event.xml');
-        $loader->load('services.xml');
-        $loader->load('commands.xml');
+        $loader->load('event.php');
+        $loader->load('services.php');
+        $loader->load('commands.php');
 
         $this->configureSeoPage($config['page'], $container);
         $this->configureSitemap($config['sitemap'], $container);

src/Resources/config/blocks.php

@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the Sonata Project package.
+ *
+ * (c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Sonata\SeoBundle\Block\Breadcrumb\HomepageBreadcrumbBlockService;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ReferenceConfigurator;
+
+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%')
+            ->public()
+            ->tag('sonata.block')
+            ->tag('sonata.breadcrumb')
+            ->args([
+                new ReferenceConfigurator('twig'),
+                new ReferenceConfigurator('knp_menu.factory'),
+            ]);
+};

src/Resources/config/commands.php

@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the Sonata Project package.
+ *
+ * (c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Sonata\SeoBundle\Command\SitemapGeneratorCommand;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ReferenceConfigurator;
+
+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->services()
+
+        ->set(SitemapGeneratorCommand::class)
+            ->tag('console.command')
+            ->args([
+                new ReferenceConfigurator('router'),
+                new ReferenceConfigurator('sonata.seo.sitemap.manager'),
+                new ReferenceConfigurator('filesystem'),
+            ]);
+};

src/Resources/config/event.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the Sonata Project package.
+ *
+ * (c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Sonata\SeoBundle\Event\BreadcrumbListener;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+
+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->services()
+
+        ->set('sonata.seo.event.breadcrumb', BreadcrumbListener::class)
+            ->tag('kernel.event_listener', [
+                'event' => 'sonata.block.event.breadcrumb',
+                'method' => 'onBlock',
+            ]);
+};

src/Resources/config/services.php

@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the Sonata Project package.
+ *
+ * (c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * 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;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ReferenceConfigurator;
+
+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%')
+            ->public()
+
+        ->set('sonata.seo.twig.extension', '%sonata.seo.twig.extension.class%')
+            ->tag('twig.extension')
+            ->args([
+                new ReferenceConfigurator('sonata.seo.page'),
+                '',
+            ])
+
+        ->set('sonata.seo.sitemap.manager', '%sonata.seo.sitemap.manager.class%')
+            ->public();
+};

src/Seo/SeoPage.php

@@ -75,19 +75,6 @@ public function setTitle(string $title): self
         return $this;
     }
 
-    public function addTitle(string $title): self
-    {
-        @trigger_error(
-            'The '.__METHOD__.' method is deprecated since 2.14, to be removed in 3.0. '.
-            'Use '.__NAMESPACE__.'::addTitlePrefix() or '.__NAMESPACE__.'::addTitleSuffix .instead.',
-            \E_USER_DEPRECATED
-        );
-
-        $this->title = $title.$this->separator.$this->title;
-
-        return $this;
-    }
-
     public function addTitlePrefix(string $prefix): self
     {
         $this->title = $prefix.$this->separator.$this->title;

tests/Seo/SeoPageTest.php

@@ -113,19 +113,6 @@ public function testSetTitle(): void
         static::assertSame('My title', $page->getTitle());
     }
 
-    /**
-     * @group legacy
-     */
-    public function testAddTitle(): void
-    {
-        $page = new SeoPage();
-        $page->setTitle('My title');
-        $page->setSeparator(' - ');
-        $page->addTitle('Additional title');
-
-        static::assertSame('Additional title - My title', $page->getTitle());
-    }
-
     public function addTitlePrefix(): void
     {
         $page = new SeoPage();