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

Jump to bottom

Always use service id as block id #302

Merged
merged 1 commit into from
Jan 2, 2017
Merged

Always use service id as block id #302

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
12 changes: 1 addition & 11 deletions DependencyInjection/Compiler/TweakCompilerPass.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,8 @@ public function process(ContainerBuilder $container)
foreach ($container->findTaggedServiceIds('sonata.block') as $id => $tags) {
$definition = $container->getDefinition($id);

$arguments = $definition->getArguments();

// Replace empty block id with service id
if (strlen($arguments[0]) == 0) {
$definition->replaceArgument(0, $id);
} elseif ($id != $arguments[0]) {
// NEXT_MAJOR: Remove deprecation notice
@trigger_error(
'Using different service id and block id is deprecated since 3.x and will be removed in 4.0.',
E_USER_DEPRECATED
);
}
$definition->replaceArgument(0, $id);

$manager->addMethodCall('add', array($id, $id, isset($parameters[$id]) ? $parameters[$id]['contexts'] : array()));
}
Expand Down
12 changes: 6 additions & 6 deletions Resources/config/block.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,34 +11,34 @@
<services>
<service id="sonata.block.service.container" class="%sonata.block.service.container.class%">
<tag name="sonata.block"/>
<argument>sonata.block.container</argument>
<argument/>
<argument type="service" id="templating"/>
</service>
<service id="sonata.block.service.empty" class="%sonata.block.service.empty.class%">
<tag name="sonata.block"/>
<argument>sonata.block.empty</argument>
<argument/>
<argument type="service" id="templating"/>
</service>
<service id="sonata.block.service.text" class="%sonata.block.service.text.class%">
<tag name="sonata.block"/>
<argument>sonata.block.text</argument>
<argument/>
<argument type="service" id="templating"/>
</service>
<service id="sonata.block.service.rss" class="%sonata.block.service.rss.class%">
<tag name="sonata.block"/>
<argument>sonata.block.rss</argument>
<argument/>
<argument type="service" id="templating"/>
</service>
<service id="sonata.block.service.menu" class="%sonata.block.service.menu.class%">
<tag name="sonata.block"/>
<argument>sonata.block.menu</argument>
<argument/>
<argument type="service" id="templating"/>
<argument type="service" id="knp_menu.menu_provider"/>
<argument type="collection"/>
</service>
<service id="sonata.block.service.template" class="%sonata.block.service.template.class%">
<tag name="sonata.block"/>
<argument>sonata.block.template</argument>
<argument/>
<argument type="service" id="templating"/>
</service>
</services>
Expand Down
20 changes: 10 additions & 10 deletions Resources/translations/SonataBlockBundle.de.xliff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
<file source-language="en" target-language="de" datatype="plaintext" original="SonataBlockBundle.en.xliff">
<body>
<trans-unit id="sonata.block.container">
<source>sonata.block.container</source>
<trans-unit id="sonata.block.service.container">
<source>sonata.block.service.container</source>
<target>Container</target>
</trans-unit>
<trans-unit id="sonata.block.text">
<source>sonata.block.text</source>
<trans-unit id="sonata.block.service.text">
<source>sonata.block.service.text</source>
<target>Einfacher Text</target>
</trans-unit>
<trans-unit id="sonata.block.rss">
<source>sonata.block.rss</source>
<trans-unit id="sonata.block.service.rss">
<source>sonata.block.service.rss</source>
<target>RSS Feed</target>
</trans-unit>
<trans-unit id="sonata.block.menu">
<source>sonata.block.menu</source>
<trans-unit id="sonata.block.service.menu">
<source>sonata.block.service.menu</source>
<target>Menü</target>
</trans-unit>
<trans-unit id="sonata.block.template">
<source>sonata.block.template</source>
<trans-unit id="sonata.block.service.template">
<source>sonata.block.service.template</source>
<target>Template</target>
</trans-unit>
</body>
Expand Down
20 changes: 10 additions & 10 deletions Resources/translations/SonataBlockBundle.en.xliff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
<file source-language="en" datatype="plaintext" original="file.ext">
<body>
<trans-unit id="sonata.block.container">
<source>sonata.block.container</source>
<trans-unit id="sonata.block.service.container">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMO, just removing the .service will solve all our BC break issue. Am I wrong?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we just remove the .service in <service id="sonata.block.service... we have a BC break.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can't handle this without a BC break. So which name do you prefer?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

.service looks better.

<source>sonata.block.service.container</source>
<target>Container</target>
</trans-unit>
<trans-unit id="sonata.block.text">
<source>sonata.block.text</source>
<trans-unit id="sonata.block.service.text">
<source>sonata.block.service.text</source>
<target>Simple text</target>
</trans-unit>
<trans-unit id="sonata.block.rss">
<source>sonata.block.rss</source>
<trans-unit id="sonata.block.service.rss">
<source>sonata.block.service.rss</source>
<target>RSS feed</target>
</trans-unit>
<trans-unit id="sonata.block.menu">
<source>sonata.block.menu</source>
<trans-unit id="sonata.block.service.menu">
<source>sonata.block.service.menu</source>
<target>Menu</target>
</trans-unit>
<trans-unit id="sonata.block.template">
<source>sonata.block.template</source>
<trans-unit id="sonata.block.service.template">
<source>sonata.block.service.template</source>
<target>Template</target>
</trans-unit>
</body>
Expand Down
20 changes: 10 additions & 10 deletions Resources/translations/SonataBlockBundle.fr.xliff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
<file source-language="en" target-language="fr" datatype="plaintext" original="SonataBlockBundle.en.xliff">
<body>
<trans-unit id="sonata.block.container">
<source>sonata.block.container</source>
<trans-unit id="sonata.block.service.container">
<source>sonata.block.service.container</source>
<target>Conteneur</target>
</trans-unit>
<trans-unit id="sonata.block.text">
<source>sonata.block.text</source>
<trans-unit id="sonata.block.service.text">
<source>sonata.block.service.text</source>
<target>Texte</target>
</trans-unit>
<trans-unit id="sonata.block.rss">
<source>sonata.block.rss</source>
<trans-unit id="sonata.block.service.rss">
<source>sonata.block.service.rss</source>
<target>Flux RSS</target>
</trans-unit>
<trans-unit id="sonata.block.menu">
<source>sonata.block.menu</source>
<trans-unit id="sonata.block.service.menu">
<source>sonata.block.service.menu</source>
<target>Menu</target>
</trans-unit>
<trans-unit id="sonata.block.template">
<source>sonata.block.template</source>
<trans-unit id="sonata.block.service.template">
<source>sonata.block.service.template</source>
<target>Vue Partielle</target>
</trans-unit>
</body>
Expand Down
20 changes: 10 additions & 10 deletions Resources/translations/SonataBlockBundle.hu.xliff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
<file source-language="en" target-language="hu" datatype="plaintext" original="SonataBlockBundle.en.xliff">
<body>
<trans-unit id="sonata.block.container">
<source>sonata.block.container</source>
<trans-unit id="sonata.block.service.container">
<source>sonata.block.service.container</source>
<target>Konténer</target>
</trans-unit>
<trans-unit id="sonata.block.text">
<source>sonata.block.text</source>
<trans-unit id="sonata.block.service.text">
<source>sonata.block.service.text</source>
<target>Szöveg</target>
</trans-unit>
<trans-unit id="sonata.block.rss">
<source>sonata.block.rss</source>
<trans-unit id="sonata.block.service.rss">
<source>sonata.block.service.rss</source>
<target>RSS hírfolyam</target>
</trans-unit>
<trans-unit id="sonata.block.menu">
<source>sonata.block.menu</source>
<trans-unit id="sonata.block.service.menu">
<source>sonata.block.service.menu</source>
<target>Menü</target>
</trans-unit>
<trans-unit id="sonata.block.template">
<source>sonata.block.template</source>
<trans-unit id="sonata.block.service.template">
<source>sonata.block.service.template</source>
<target>Sablon</target>
</trans-unit>
</body>
Expand Down
4 changes: 4 additions & 0 deletions UPGRADE-4.0.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,7 @@ All the deprecated code introduced on 3.x is removed on 4.0.
Please read [3.x](https://github.com/sonata-project/SonataAdminBundle/tree/3.x) upgrade guides for more information.

See also the [diff code](https://github.com/sonata-project/SonataAdminBundle/compare/3.x...4.0.0).

## Block id

If you have created a custom `AbstractBlockService` you must now implement the new constructor, because all blocks use the service id as the block id now. Because of that, the translation keys for the block ids have changed from `sonata.block.$NAME` to `sonata.block.service.$NAME`.