Prepare major release (#686)

sonata-project · Mar 28, 2019 · 6cb12b6 · 6cb12b6
1 parent 5457d51
commit 6cb12b6
Show file tree

Hide file tree

Showing 39 changed files with 60 additions and 925 deletions.
diff --git a/docs/reference/flash_messages.rst b/docs/reference/flash_messages.rst
@@ -66,7 +66,7 @@ Usage
 
 To use this feature in your PHP classes/controllers::
 
-    $flashManager = $this->get('sonata.core.flashmessage.manager');
+    $flashManager = $this->get('sonata.twig.flashmessage.manager');
 
     $messages = $flashManager->get('success');
 

diff --git a/src/CoreBundle/Date/MomentFormatConverter.php b/src/CoreBundle/Date/MomentFormatConverter.php
diff --git a/src/CoreBundle/DependencyInjection/Compiler/AdapterCompilerPass.php b/src/CoreBundle/DependencyInjection/Compiler/AdapterCompilerPass.php
diff --git a/src/CoreBundle/DependencyInjection/Compiler/StatusRendererCompilerPass.php b/src/CoreBundle/DependencyInjection/Compiler/StatusRendererCompilerPass.php
@@ -24,11 +24,11 @@ final class StatusRendererCompilerPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container): void
     {
-        if (!$container->hasDefinition('sonata.core.twig.status_extension')) {
+        if (!$container->hasDefinition('sonata.twig.status_extension')) {
             return;
         }
 
-        $definition = $container->getDefinition('sonata.core.twig.status_extension');
+        $definition = $container->getDefinition('sonata.twig.status_extension');
 
         foreach ($container->findTaggedServiceIds('sonata.status.renderer') as $id => $attributes) {
             $definition->addMethodCall('addStatusService', [new Reference($id)]);

diff --git a/src/CoreBundle/DependencyInjection/SonataCoreExtension.php b/src/CoreBundle/DependencyInjection/SonataCoreExtension.php
@@ -14,7 +14,6 @@
 namespace Sonata\CoreBundle\DependencyInjection;
 
 use JMS\Serializer\Handler\SubscribingHandlerInterface;
-use Sonata\Doctrine\Bridge\Symfony\Bundle\SonataDoctrineBundle;
 use Sonata\Serializer\BaseSerializerHandler;
 use Symfony\Component\Config\Definition\Processor;
 use Symfony\Component\Config\FileLocator;
@@ -49,31 +48,15 @@ public function load(array $configs, ContainerBuilder $container): void
         $config = $processor->processConfiguration($configuration, $configs);
         $bundles = $container->getParameter('kernel.bundles');
 
-        $bundles = $container->getParameter('kernel.bundles');
-
-        if (!isset($bundles['SonataDoctrineBundle'])) {
-            // NEXT_MAJOR remove the alias, throw an exception
-            @trigger_error(sprintf(
-                'Not registering bundle "%s" is deprecated since 3.12.0, registering it will be mandatory in 4.0',
-                SonataDoctrineBundle::class
-            ), E_USER_DEPRECATED);
-            $container->setAlias(
-                'sonata.doctrine.model.adapter.chain',
-                'sonata.core.model.adapter.chain'
-            );
-        }
-
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('date.xml');
         $loader->load('flash.xml');
         $loader->load('form_types.xml');
         $loader->load('validator.xml');
         $loader->load('twig.xml');
-        $loader->load('model_adapter.xml');
-        $loader->load('commands.xml');
 
         $this->registerFlashTypes($container, $config);
-        $container->setParameter('sonata.core.form_type', $config['form_type']);
+        $container->setParameter('sonata.form.form_type', $config['form_type']);
 
         if (isset($bundles['JMSSerializerBundle'])) {
             $this->configureSerializerFormats($config);
@@ -110,7 +93,7 @@ public function registerFlashTypes(ContainerBuilder $container, array $config):
             $cssClasses[$typeKey] = \array_key_exists('css_class', $typeConfig) ? $typeConfig['css_class'] : $typeKey;
         }
 
-        $identifier = 'sonata.core.flashmessage.manager';
+        $identifier = 'sonata.twig.flashmessage.manager';
 
         $definition = $container->getDefinition($identifier);
         $definition->replaceArgument(2, $types);

diff --git a/src/CoreBundle/Model/Adapter/AdapterChain.php b/src/CoreBundle/Model/Adapter/AdapterChain.php
diff --git a/src/CoreBundle/Model/Adapter/AdapterInterface.php b/src/CoreBundle/Model/Adapter/AdapterInterface.php
diff --git a/src/CoreBundle/Model/Adapter/DoctrineORMAdapter.php b/src/CoreBundle/Model/Adapter/DoctrineORMAdapter.php
diff --git a/src/CoreBundle/Model/PageableManagerInterface.php b/src/CoreBundle/Model/PageableManagerInterface.php
diff --git a/src/CoreBundle/Resources/config/commands.xml b/src/CoreBundle/Resources/config/commands.xml
diff --git a/src/CoreBundle/Resources/config/date.xml b/src/CoreBundle/Resources/config/date.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
     <services>
-        <service id="sonata.core.date.moment_format_converter" class="Sonata\Form\Date\MomentFormatConverter"/>
+        <service id="sonata.date.moment_format_converter" class="Sonata\Form\Date\MomentFormatConverter"/>
     </services>
 </container>
diff --git a/src/CoreBundle/Resources/config/flash.xml b/src/CoreBundle/Resources/config/flash.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
     <parameters>
-        <parameter key="sonata.core.flashmessage.manager.class">Sonata\Twig\FlashMessage\FlashManager</parameter>
-        <parameter key="sonata.core.twig.extension.flashmessage.class">Sonata\Twig\Extension\FlashMessageExtension</parameter>
+        <parameter key="sonata.twig.flashmessage.manager.class">Sonata\Twig\FlashMessage\FlashManager</parameter>
+        <parameter key="sonata.twig.extension.flashmessage.class">Sonata\Twig\Extension\FlashMessageExtension</parameter>
     </parameters>
     <services>
-        <service id="sonata.core.flashmessage.manager" class="%sonata.core.flashmessage.manager.class%" public="true">
+        <service id="sonata.twig.flashmessage.manager" class="%sonata.twig.flashmessage.manager.class%">
             <tag name="sonata.status.renderer"/>
             <argument type="service" id="session"/>
             <argument type="service" id="translator"/>
             <argument/>
             <argument/>
         </service>
-        <service id="sonata.core.flashmessage.twig.runtime" class="Sonata\Twig\Extension\FlashMessageRuntime">
+        <service id="sonata.flashmessage.twig.runtime" class="Sonata\Twig\Extension\FlashMessageRuntime">
             <tag name="twig.runtime"/>
-            <argument type="service" id="sonata.core.flashmessage.manager"/>
+            <argument type="service" id="sonata.twig.flashmessage.manager"/>
         </service>
-        <service id="sonata.core.flashmessage.twig.extension" class="%sonata.core.twig.extension.flashmessage.class%" public="true">
+        <service id="sonata.flashmessage.twig.extension" class="%sonata.twig.extension.flashmessage.class%">
             <tag name="twig.extension"/>
         </service>
     </services>