Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

[DependencyInjection] ActionBundle integration: introduce _instanceof #21357

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

Closed
wants to merge 5 commits into from
Closed

[DependencyInjection] ActionBundle integration: introduce _instanceof #21357

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0a48b9e
[DependencyInjection] ActionBundle integration: introduce _instanceof
dunglas Jan 19, 2017
9b9dbea
Factorize the ID generation logic
dunglas Jan 24, 2017
14e85c6
Fix CS
dunglas Jan 24, 2017
4e0b1e5
Clone the DOM when setting the parent
dunglas Jan 24, 2017
ec9c5b2
Make the service starting by a number
dunglas Jan 24, 2017
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
Prev Previous commit
Next Next commit
Fix CS
  • Loading branch information
@dunglas
dunglas committed Jan 24, 2017
commit 14e85c615345712cc0d90732a024d77dfd40298b
2 changes: 1 addition & 1 deletion 2 src/Symfony/Component/DependencyInjection/Loader/FileLoader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,6 @@ public function __construct(ContainerBuilder $container, FileLocatorInterface $l
*/
protected function generateInstanceofDefinitionId($id, $type, $file)
{
return sprintf("%s_%s_%s", $id, $type, hash('sha256', $file));
return sprintf('%s_%s_%s', $id, $type, hash('sha256', $file));
Copy link
Member

Choose a reason for hiding this comment

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

generated ids should start with a number so that we don't confuse them with classes (maybe not applicable here, but still a good default practice to me).

Copy link
Member Author

Choose a reason for hiding this comment

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

Like sprintf('0%s_%s_%s', $id, $type, hash('sha256', $file));?

Copy link
Member

Choose a reason for hiding this comment

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

yes

Copy link
Member Author

Choose a reason for hiding this comment

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

done

}
}
2 changes: 1 addition & 1 deletion 2 src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -663,7 +663,7 @@ public function testDefaultsWithAutowiredMethods()
public function testInstanceof()
{
$container = new ContainerBuilder();
$loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath . '/xml'));
$loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
$loader->load('services32.xml');

$definitions = $container->getDefinitions();
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.