Commit b9c162dd authored by David Surville's avatar David Surville
Browse files

Merge branch 'zf-3.x'

parents b9709199 ec64a0f1
Pipeline #5602 failed with stage
in 11 seconds
......@@ -3,6 +3,7 @@
namespace UnicaenKsup\Mvc\Service;
use Application\View\Renderer\PhpRenderer;
use Interop\Container\ContainerInterface;
use UnicaenKsup\Service\KsupService;
use Zend\ServiceManager\FactoryInterface;
use Zend\ServiceManager\ServiceLocatorInterface;
......@@ -11,16 +12,27 @@ use UnicaenKsup\View\Strategy\KsupStrategy;
class ViewKsupStrategyFactory implements FactoryInterface
{
public function createService(ServiceLocatorInterface $serviceLocator)
/**
* @param ContainerInterface $container
* @param string $requestedName
* @param array|null $options
* @return object|KsupStrategy
*/
public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
{
/** @var PhpRenderer $renderer */
$renderer = $serviceLocator->get('ViewRenderer');
$renderer = $container->get('ViewRenderer');
/** @var KsupService $service */
$service = $serviceLocator->get('ksup');
$service = $container->get('ksup');
$strategy = new KsupStrategy($renderer);
$strategy->setServiceKsup($service);
return $strategy;
}
}
public function createService(ServiceLocatorInterface $container)
{
return $this($container, KsupStrategy::class);
}
}
\ No newline at end of file
......@@ -2,29 +2,41 @@
namespace UnicaenKsup\Service;
use Interop\Container\ContainerInterface;
use UnicaenKsup\View\Strategy\KsupStrategy;
use Zend\ServiceManager\FactoryInterface;
use Zend\ServiceManager\ServiceLocatorInterface;
use Zend\View\Helper\BasePath;
class KsupServiceFactory implements FactoryInterface
{
public function createService(ServiceLocatorInterface $serviceLocator)
/**
* @param ContainerInterface $container
* @param string $requestedName
* @param array|null $options
* @return object|KsupService
*/
public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
{
$service = new KsupService();
$config = $serviceLocator->get('config');
if (isset($config['unicaen-ksup'])){
$config = $container->get('config');
if (isset($config['unicaen-ksup'])) {
$config = $config['unicaen-ksup'];
}else{
} else {
$config = [];
}
$service->setConfig($config);
/** @var BasePath $basePath */
$basePath = $serviceLocator->get('viewHelperManager')->get('basePath');
$basePath = $container->get('ViewHelperManager')->get('basePath');
$service->setBasePath($basePath);
return $service;
}
public function createService(ServiceLocatorInterface $container)
{
return $this($container, KsupService::class);
}
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment