Fixed cs issue and ServiceManager support

basz · Sep 15, 2017 · f67aabc · f67aabc
1 parent 7f99f05
commit f67aabc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/SlmLocale/Strategy/Factory/UriPathStrategyFactory.php b/src/SlmLocale/Strategy/Factory/UriPathStrategyFactory.php
@@ -65,8 +65,8 @@ class UriPathStrategyFactory implements FactoryInterface
      */
     public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
     {
-        $strategy = new UriPathStrategy($container->getServiceLocator()->get('router'));
-        $strategy->setServiceLocator($container);
+        $strategy = new UriPathStrategy($container->get('router'));
+        $strategy->setServiceLocator($container->get(\SlmLocale\Strategy\StrategyPluginManager::class));
 
         return $strategy;
     }
@@ -80,6 +80,6 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
      */
     public function createService(ServiceLocatorInterface $serviceLocator)
     {
-        return $this($serviceLocator, UriPathStrategy::class);
+        return $this($serviceLocator->getServiceLocator(), UriPathStrategy::class);
     }
 }
diff --git a/src/SlmLocale/Strategy/StrategyPluginManager.php b/src/SlmLocale/Strategy/StrategyPluginManager.php
@@ -40,9 +40,9 @@
 
 namespace SlmLocale\Strategy;
 
+use SlmLocale\Strategy\Factory\UriPathStrategyFactory;
 use Zend\ServiceManager\AbstractPluginManager;
 use Zend\ServiceManager\Factory\InvokableFactory;
-use SlmLocale\Strategy\Factory\UriPathStrategyFactory;
 
 class StrategyPluginManager extends AbstractPluginManager
 {