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

EZP-27249: Fix routerpass to use defined class #88

Merged
merged 3 commits into from
Apr 13, 2017
Merged

EZP-27249: Fix routerpass to use defined class #88

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7fcf137
Fix routerpass to use defined class
wizhippo Apr 12, 2017
09971d3
Use FQCN as string, since legacy bridge still supports PHP 5.4.
wizhippo Apr 13, 2017
3f91be3
Simplify routing pass
wizhippo Apr 13, 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
5 changes: 5 additions & 0 deletions bundle/DependencyInjection/Compiler/RoutingPass.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
*/
namespace eZ\Bundle\EzPublishLegacyBundle\DependencyInjection\Compiler;

use eZ\Bundle\EzPublishLegacyBundle\Routing\DefaultRouter as DefaultRouter;
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
use Symfony\Component\DependencyInjection\ContainerBuilder;

Expand All @@ -22,6 +23,10 @@ public function process(ContainerBuilder $container)
return;
}

$container
->findDefinition('router.default')
->setClass(DefaultRouter::class);
Copy link
Collaborator

Choose a reason for hiding this comment

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

This should use a FQCN as string, since legacy bridge still supports PHP 5.4.


$defaultRouterDef = $container->getDefinition('router.default');
$defaultRouterDef->addMethodCall(
'setLegacyAwareRoutes',
Expand Down
1 change: 0 additions & 1 deletion bundle/Resources/config/services.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ parameters:
ezpublish.default_router.legacy_aware_routes: ['_ezpublishLegacyTreeMenu', 'ezpublish_rest_', '_ezpublishPreviewContent', '_wdt', '_profiler', '_assetic']

# Core overrides
router.class: eZ\Bundle\EzPublishLegacyBundle\Routing\DefaultRouter
ezpublish.security.login_listener.class: eZ\Bundle\EzPublishLegacyBundle\Security\SecurityListener
security.authentication.listener.rememberme.class: eZ\Bundle\EzPublishLegacyBundle\Security\RememberMeListener
Copy link
Contributor

Choose a reason for hiding this comment

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

if this comes from symfony, then this is broken on 3.x as well.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Yep. We can fix it in separate PR?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Are you suggesting another PR just for the parameter removal?

Not quite sure I follow. As the compiler pass now sets the class, this parameter is not used anyway.

Let me know what you want done.

Copy link
Collaborator

Choose a reason for hiding this comment

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

@wizhippo I think @andrerom is referring to security.authentication.listener.rememberme.class parameter which comes from Symfony, so Legacy Bridge will not work on Symfony 3.x because this parameter was removed.

Copy link
Contributor

Choose a reason for hiding this comment

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

yes, it can be done in separate PR, just noticed it while reviewing here ;)


Expand Down