@@ -31,7 +31,7 @@ |
||
31 | 31 | * |
32 | 32 | * @param EventManagerInterface $events |
33 | 33 | * @param integer $priority |
34 | - */ |
|
34 | + */ |
|
35 | 35 | public function attach(EventManagerInterface $events, $priority = 1) |
36 | 36 | { |
37 | 37 | $this->listeners[] = $events->attach(MvcEvent::EVENT_DISPATCH_ERROR, array($this, 'handleError'), $priority); |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | */ |
36 | 36 | protected $hasRunned = true; |
37 | 37 | |
38 | - /** |
|
38 | + /** |
|
39 | 39 | * @param SharedEventManagerInterface $events |
40 | 40 | * |
41 | 41 | * @return $this |
@@ -67,13 +67,13 @@ discard block |
||
67 | 67 | */ |
68 | 68 | public function add($event) |
69 | 69 | { |
70 | - //@TODO: [ZF3] $event->getNotification() is not working |
|
71 | - $target = $event->getTarget(); |
|
72 | - if($target instanceof NotificationEvent){ |
|
73 | - $notification = $target->getNotification(); |
|
74 | - $this->notifications[] = $notification; |
|
75 | - $this->hasRunned = false; |
|
76 | - } |
|
70 | + //@TODO: [ZF3] $event->getNotification() is not working |
|
71 | + $target = $event->getTarget(); |
|
72 | + if($target instanceof NotificationEvent){ |
|
73 | + $notification = $target->getNotification(); |
|
74 | + $this->notifications[] = $notification; |
|
75 | + $this->hasRunned = false; |
|
76 | + } |
|
77 | 77 | |
78 | 78 | return $this; |
79 | 79 | } |
@@ -133,16 +133,16 @@ discard block |
||
133 | 133 | return $this; |
134 | 134 | } |
135 | 135 | |
136 | - /** |
|
137 | - * @param ContainerInterface $container |
|
138 | - * |
|
139 | - * @return NotificationListener |
|
140 | - */ |
|
136 | + /** |
|
137 | + * @param ContainerInterface $container |
|
138 | + * |
|
139 | + * @return NotificationListener |
|
140 | + */ |
|
141 | 141 | static public function factory(ContainerInterface $container) |
142 | 142 | { |
143 | - $sharedManager = $container->get('Application')->getEventManager()->getSharedManager(); |
|
144 | - $instance = new NotificationListener($sharedManager); |
|
145 | - $instance->setEventPrototype(new NotificationEvent()); |
|
146 | - return $instance; |
|
143 | + $sharedManager = $container->get('Application')->getEventManager()->getSharedManager(); |
|
144 | + $instance = new NotificationListener($sharedManager); |
|
145 | + $instance->setEventPrototype(new NotificationEvent()); |
|
146 | + return $instance; |
|
147 | 147 | } |
148 | 148 | } |
@@ -42,12 +42,12 @@ discard block |
||
42 | 42 | */ |
43 | 43 | public function attachShared(SharedEventManagerInterface $events) |
44 | 44 | { |
45 | - $events->attach('*', NotificationEvent::EVENT_NOTIFICATION_ADD, array($this,'add'), 1); |
|
46 | - $events->attach('Zend\Mvc\Application', MvcEvent::EVENT_DISPATCH, array($this,'renderJSON'), -240); |
|
47 | - $events->attach('Zend\Mvc\Application', MvcEvent::EVENT_DISPATCH, array($this,'renderHTML'), -250); |
|
45 | + $events->attach('*', NotificationEvent::EVENT_NOTIFICATION_ADD, array($this, 'add'), 1); |
|
46 | + $events->attach('Zend\Mvc\Application', MvcEvent::EVENT_DISPATCH, array($this, 'renderJSON'), -240); |
|
47 | + $events->attach('Zend\Mvc\Application', MvcEvent::EVENT_DISPATCH, array($this, 'renderHTML'), -250); |
|
48 | 48 | // Sometimes the Dispatch-Event is not reached, for instance with a route-direct |
49 | 49 | // but also for Events, that are happening after the Dispatch |
50 | - $events->attach('Zend\Mvc\Application', MvcEvent::EVENT_FINISH, array($this,'renderHTML'), -250); |
|
50 | + $events->attach('Zend\Mvc\Application', MvcEvent::EVENT_FINISH, array($this, 'renderHTML'), -250); |
|
51 | 51 | return $this; |
52 | 52 | } |
53 | 53 | |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | { |
70 | 70 | //@TODO: [ZF3] $event->getNotification() is not working |
71 | 71 | $target = $event->getTarget(); |
72 | - if($target instanceof NotificationEvent){ |
|
72 | + if ($target instanceof NotificationEvent) { |
|
73 | 73 | $notification = $target->getNotification(); |
74 | 74 | $this->notifications[] = $notification; |
75 | 75 | $this->hasRunned = false; |
@@ -30,7 +30,7 @@ |
||
30 | 30 | /* @var $serviceLocator \Zend\View\HelperPluginManager */ |
31 | 31 | $options = $container->get('Auth/Options'); |
32 | 32 | $config = $container->get('Config'); |
33 | - $helper = new SocialButtons($options,$config); |
|
33 | + $helper = new SocialButtons($options, $config); |
|
34 | 34 | return $helper; |
35 | 35 | } |
36 | 36 | } |
@@ -14,10 +14,10 @@ |
||
14 | 14 | |
15 | 15 | interface ContainerAwareInterface |
16 | 16 | { |
17 | - /** |
|
18 | - * @param ContainerInterface $container |
|
19 | - * |
|
20 | - * @return mixed |
|
21 | - */ |
|
22 | - public function setContainer(ContainerInterface $container); |
|
17 | + /** |
|
18 | + * @param ContainerInterface $container |
|
19 | + * |
|
20 | + * @return mixed |
|
21 | + */ |
|
22 | + public function setContainer(ContainerInterface $container); |
|
23 | 23 | } |
24 | 24 | \ No newline at end of file |
@@ -76,10 +76,10 @@ discard block |
||
76 | 76 | $queryBuilder->find($this->getEntityClassName($requestedName)); |
77 | 77 | |
78 | 78 | $filterManager = $container->get('FilterManager'); |
79 | - $filterName = 'PaginationQuery/' . $requestedName; |
|
79 | + $filterName = 'PaginationQuery/'.$requestedName; |
|
80 | 80 | |
81 | 81 | if ($filterManager->has($filterName)) { |
82 | - $filter = $filterManager->get('PaginationQuery/' . $requestedName); |
|
82 | + $filter = $filterManager->get('PaginationQuery/'.$requestedName); |
|
83 | 83 | $queryBuilder = $filter->filter($options, $queryBuilder); |
84 | 84 | } |
85 | 85 | |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | * @param array|null $options |
99 | 99 | * @return bool |
100 | 100 | */ |
101 | - public function canCreate(ContainerInterface $container, $requestedName, array $options=null) |
|
101 | + public function canCreate(ContainerInterface $container, $requestedName, array $options = null) |
|
102 | 102 | { |
103 | 103 | $class = $this->getEntityClassName($requestedName); |
104 | 104 |
@@ -24,57 +24,57 @@ |
||
24 | 24 | */ |
25 | 25 | class LazyControllerFactory implements AbstractFactoryInterface |
26 | 26 | { |
27 | - protected $aliases = [ |
|
28 | - FormElementManager::class => 'FormElementManager', |
|
29 | - ValidatorPluginManager::class => 'ValidatorManager', |
|
30 | - Translator::class => 'translator', |
|
31 | - ModuleManager::class => 'ModuleManager', |
|
32 | - EventManager::class => 'Core/EventManager' |
|
33 | - ]; |
|
27 | + protected $aliases = [ |
|
28 | + FormElementManager::class => 'FormElementManager', |
|
29 | + ValidatorPluginManager::class => 'ValidatorManager', |
|
30 | + Translator::class => 'translator', |
|
31 | + ModuleManager::class => 'ModuleManager', |
|
32 | + EventManager::class => 'Core/EventManager' |
|
33 | + ]; |
|
34 | 34 | |
35 | - public function canCreate( ContainerInterface $container, $requestedName ) |
|
36 | - { |
|
37 | - list( $module, ) = explode( '\\', __NAMESPACE__, 2 ); |
|
38 | - return strstr( $requestedName, $module . '\Controller') !== false; |
|
39 | - } |
|
35 | + public function canCreate( ContainerInterface $container, $requestedName ) |
|
36 | + { |
|
37 | + list( $module, ) = explode( '\\', __NAMESPACE__, 2 ); |
|
38 | + return strstr( $requestedName, $module . '\Controller') !== false; |
|
39 | + } |
|
40 | 40 | |
41 | - public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) |
|
42 | - { |
|
43 | - $class = new \ReflectionClass($requestedName); |
|
44 | - $parentLocator = $container; |
|
45 | - if( $constructor = $class->getConstructor() ) |
|
46 | - { |
|
47 | - if( $params = $constructor->getParameters() ) |
|
48 | - { |
|
49 | - $parameter_instances = []; |
|
50 | - foreach( $params as $p ) |
|
51 | - { |
|
41 | + public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) |
|
42 | + { |
|
43 | + $class = new \ReflectionClass($requestedName); |
|
44 | + $parentLocator = $container; |
|
45 | + if( $constructor = $class->getConstructor() ) |
|
46 | + { |
|
47 | + if( $params = $constructor->getParameters() ) |
|
48 | + { |
|
49 | + $parameter_instances = []; |
|
50 | + foreach( $params as $p ) |
|
51 | + { |
|
52 | 52 | |
53 | - if( $p->getClass() ) { |
|
54 | - $cn = $p->getClass()->getName(); |
|
55 | - if (array_key_exists($cn, $this->aliases)) { |
|
56 | - $cn = $this->aliases[$cn]; |
|
57 | - } |
|
53 | + if( $p->getClass() ) { |
|
54 | + $cn = $p->getClass()->getName(); |
|
55 | + if (array_key_exists($cn, $this->aliases)) { |
|
56 | + $cn = $this->aliases[$cn]; |
|
57 | + } |
|
58 | 58 | |
59 | - try { |
|
60 | - $parameter_instances[] = $parentLocator->get($cn); |
|
61 | - } |
|
62 | - catch (\Exception $x) { |
|
63 | - echo __CLASS__ |
|
64 | - . " couldn't create an instance of $cn to satisfy the constructor for $requestedName."; |
|
65 | - exit; |
|
66 | - } |
|
67 | - } |
|
68 | - else{ |
|
69 | - if( $p->isArray() && $p->getName() == 'config' ) |
|
70 | - $parameter_instances[] = $parentLocator->get('config'); |
|
71 | - } |
|
59 | + try { |
|
60 | + $parameter_instances[] = $parentLocator->get($cn); |
|
61 | + } |
|
62 | + catch (\Exception $x) { |
|
63 | + echo __CLASS__ |
|
64 | + . " couldn't create an instance of $cn to satisfy the constructor for $requestedName."; |
|
65 | + exit; |
|
66 | + } |
|
67 | + } |
|
68 | + else{ |
|
69 | + if( $p->isArray() && $p->getName() == 'config' ) |
|
70 | + $parameter_instances[] = $parentLocator->get('config'); |
|
71 | + } |
|
72 | 72 | |
73 | - } |
|
74 | - return $class->newInstanceArgs($parameter_instances); |
|
75 | - } |
|
76 | - } |
|
73 | + } |
|
74 | + return $class->newInstanceArgs($parameter_instances); |
|
75 | + } |
|
76 | + } |
|
77 | 77 | |
78 | - return new $requestedName; |
|
79 | - } |
|
78 | + return new $requestedName; |
|
79 | + } |
|
80 | 80 | } |
81 | 81 | \ No newline at end of file |
@@ -32,25 +32,25 @@ discard block |
||
32 | 32 | EventManager::class => 'Core/EventManager' |
33 | 33 | ]; |
34 | 34 | |
35 | - public function canCreate( ContainerInterface $container, $requestedName ) |
|
35 | + public function canCreate(ContainerInterface $container, $requestedName) |
|
36 | 36 | { |
37 | - list( $module, ) = explode( '\\', __NAMESPACE__, 2 ); |
|
38 | - return strstr( $requestedName, $module . '\Controller') !== false; |
|
37 | + list($module,) = explode('\\', __NAMESPACE__, 2); |
|
38 | + return strstr($requestedName, $module.'\Controller') !== false; |
|
39 | 39 | } |
40 | 40 | |
41 | - public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) |
|
41 | + public function __invoke(ContainerInterface $container, $requestedName, array $options = null) |
|
42 | 42 | { |
43 | 43 | $class = new \ReflectionClass($requestedName); |
44 | 44 | $parentLocator = $container; |
45 | - if( $constructor = $class->getConstructor() ) |
|
45 | + if ($constructor = $class->getConstructor()) |
|
46 | 46 | { |
47 | - if( $params = $constructor->getParameters() ) |
|
47 | + if ($params = $constructor->getParameters()) |
|
48 | 48 | { |
49 | 49 | $parameter_instances = []; |
50 | - foreach( $params as $p ) |
|
50 | + foreach ($params as $p) |
|
51 | 51 | { |
52 | 52 | |
53 | - if( $p->getClass() ) { |
|
53 | + if ($p->getClass()) { |
|
54 | 54 | $cn = $p->getClass()->getName(); |
55 | 55 | if (array_key_exists($cn, $this->aliases)) { |
56 | 56 | $cn = $this->aliases[$cn]; |
@@ -65,8 +65,8 @@ discard block |
||
65 | 65 | exit; |
66 | 66 | } |
67 | 67 | } |
68 | - else{ |
|
69 | - if( $p->isArray() && $p->getName() == 'config' ) |
|
68 | + else { |
|
69 | + if ($p->isArray() && $p->getName() == 'config') |
|
70 | 70 | $parameter_instances[] = $parentLocator->get('config'); |
71 | 71 | } |
72 | 72 |
@@ -54,16 +54,15 @@ |
||
54 | 54 | |
55 | 55 | try { |
56 | 56 | $parameter_instances[] = $parentLocator->get($cn); |
57 | - } |
|
58 | - catch (\Exception $x) { |
|
57 | + } catch (\Exception $x) { |
|
59 | 58 | echo __CLASS__ |
60 | 59 | . " couldn't create an instance of $cn to satisfy the constructor for $requestedName."; |
61 | 60 | exit; |
62 | 61 | } |
63 | - } |
|
64 | - else{ |
|
65 | - if( $p->isArray() && $p->getName() == 'config' ) |
|
66 | - $parameter_instances[] = $parentLocator->get('config'); |
|
62 | + } else{ |
|
63 | + if( $p->isArray() && $p->getName() == 'config' ) { |
|
64 | + $parameter_instances[] = $parentLocator->get('config'); |
|
65 | + } |
|
67 | 66 | } |
68 | 67 | |
69 | 68 | } |
@@ -39,27 +39,27 @@ |
||
39 | 39 | * @throws ContainerException if any other error occurs |
40 | 40 | */ |
41 | 41 | public function __invoke(ContainerInterface $container, $requestedName, array $options = null) { |
42 | - $basePath = $container->get( 'ViewHelperManager' )->get( 'basepath' ); |
|
43 | - $config = $container->get( 'Config' ); |
|
42 | + $basePath = $container->get( 'ViewHelperManager' )->get( 'basepath' ); |
|
43 | + $config = $container->get( 'Config' ); |
|
44 | 44 | |
45 | - /* @var \Zend\Mvc\MvcEvent $event */ |
|
46 | - $event = $container->get( 'application' )->getMvcEvent(); |
|
45 | + /* @var \Zend\Mvc\MvcEvent $event */ |
|
46 | + $event = $container->get( 'application' )->getMvcEvent(); |
|
47 | 47 | |
48 | - $lang = $event->getRouteMatch()->getParam( 'lang' ); |
|
48 | + $lang = $event->getRouteMatch()->getParam( 'lang' ); |
|
49 | 49 | |
50 | - $helper = new FormEditorLight(); |
|
51 | - if ( isset( $config['view_helper_config']['form_editor']['light'] ) && is_array( $config['view_helper_config']['form_editor']['light'] ) ) { |
|
52 | - $helper->setOptions( $config['view_helper_config']['form_editor']['light'] ); |
|
53 | - } |
|
50 | + $helper = new FormEditorLight(); |
|
51 | + if ( isset( $config['view_helper_config']['form_editor']['light'] ) && is_array( $config['view_helper_config']['form_editor']['light'] ) ) { |
|
52 | + $helper->setOptions( $config['view_helper_config']['form_editor']['light'] ); |
|
53 | + } |
|
54 | 54 | |
55 | - $helper->setOption( 'theme', 'modern' ); |
|
56 | - $helper->setOption( 'selector', 'div.tinymce_light' ); |
|
55 | + $helper->setOption( 'theme', 'modern' ); |
|
56 | + $helper->setOption( 'selector', 'div.tinymce_light' ); |
|
57 | 57 | |
58 | - if ( in_array( $lang, [ 'de', 'fr', 'it', 'es', 'hi', 'ar', 'ru', 'zh', 'tr' ] ) ) { |
|
59 | - $helper->setOption( 'language', $lang ); |
|
60 | - $helper->setOption( 'language_url', $basePath( '/js/tinymce-lang/' ) . $lang . '.js' ); |
|
61 | - } |
|
58 | + if ( in_array( $lang, [ 'de', 'fr', 'it', 'es', 'hi', 'ar', 'ru', 'zh', 'tr' ] ) ) { |
|
59 | + $helper->setOption( 'language', $lang ); |
|
60 | + $helper->setOption( 'language_url', $basePath( '/js/tinymce-lang/' ) . $lang . '.js' ); |
|
61 | + } |
|
62 | 62 | |
63 | - return $helper; |
|
63 | + return $helper; |
|
64 | 64 | } |
65 | 65 | } |
66 | 66 | \ No newline at end of file |
@@ -39,25 +39,25 @@ |
||
39 | 39 | * @throws ContainerException if any other error occurs |
40 | 40 | */ |
41 | 41 | public function __invoke(ContainerInterface $container, $requestedName, array $options = null) { |
42 | - $basePath = $container->get( 'ViewHelperManager' )->get( 'basepath' ); |
|
43 | - $config = $container->get( 'Config' ); |
|
42 | + $basePath = $container->get('ViewHelperManager')->get('basepath'); |
|
43 | + $config = $container->get('Config'); |
|
44 | 44 | |
45 | 45 | /* @var \Zend\Mvc\MvcEvent $event */ |
46 | - $event = $container->get( 'application' )->getMvcEvent(); |
|
46 | + $event = $container->get('application')->getMvcEvent(); |
|
47 | 47 | |
48 | - $lang = $event->getRouteMatch()->getParam( 'lang' ); |
|
48 | + $lang = $event->getRouteMatch()->getParam('lang'); |
|
49 | 49 | |
50 | 50 | $helper = new FormEditorLight(); |
51 | - if ( isset( $config['view_helper_config']['form_editor']['light'] ) && is_array( $config['view_helper_config']['form_editor']['light'] ) ) { |
|
52 | - $helper->setOptions( $config['view_helper_config']['form_editor']['light'] ); |
|
51 | + if (isset($config['view_helper_config']['form_editor']['light']) && is_array($config['view_helper_config']['form_editor']['light'])) { |
|
52 | + $helper->setOptions($config['view_helper_config']['form_editor']['light']); |
|
53 | 53 | } |
54 | 54 | |
55 | - $helper->setOption( 'theme', 'modern' ); |
|
56 | - $helper->setOption( 'selector', 'div.tinymce_light' ); |
|
55 | + $helper->setOption('theme', 'modern'); |
|
56 | + $helper->setOption('selector', 'div.tinymce_light'); |
|
57 | 57 | |
58 | - if ( in_array( $lang, [ 'de', 'fr', 'it', 'es', 'hi', 'ar', 'ru', 'zh', 'tr' ] ) ) { |
|
59 | - $helper->setOption( 'language', $lang ); |
|
60 | - $helper->setOption( 'language_url', $basePath( '/js/tinymce-lang/' ) . $lang . '.js' ); |
|
58 | + if (in_array($lang, ['de', 'fr', 'it', 'es', 'hi', 'ar', 'ru', 'zh', 'tr'])) { |
|
59 | + $helper->setOption('language', $lang); |
|
60 | + $helper->setOption('language_url', $basePath('/js/tinymce-lang/').$lang.'.js'); |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | return $helper; |
@@ -14,31 +14,31 @@ |
||
14 | 14 | |
15 | 15 | class PdfServiceFactory implements FactoryInterface |
16 | 16 | { |
17 | - public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) |
|
18 | - { |
|
19 | - $Html2PdfConverter = $container->get('Html2PdfConverter'); |
|
20 | - if (!$Html2PdfConverter instanceof PdfInterface) { |
|
21 | - throw new \DomainException( |
|
22 | - sprintf( |
|
23 | - 'PdfConverter %s does not implements PdfInterface', |
|
24 | - get_class($Html2PdfConverter) |
|
25 | - ) |
|
26 | - ); |
|
27 | - } |
|
28 | - //$configArray = $serviceLocator->get('Config'); |
|
17 | + public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) |
|
18 | + { |
|
19 | + $Html2PdfConverter = $container->get('Html2PdfConverter'); |
|
20 | + if (!$Html2PdfConverter instanceof PdfInterface) { |
|
21 | + throw new \DomainException( |
|
22 | + sprintf( |
|
23 | + 'PdfConverter %s does not implements PdfInterface', |
|
24 | + get_class($Html2PdfConverter) |
|
25 | + ) |
|
26 | + ); |
|
27 | + } |
|
28 | + //$configArray = $serviceLocator->get('Config'); |
|
29 | 29 | |
30 | - $viewManager = $container->get('ViewManager'); |
|
31 | - $view = $viewManager->getView(); |
|
32 | - $viewEvents = $view->getEventManager(); |
|
33 | - $Html2PdfConverter->attach($viewEvents); |
|
30 | + $viewManager = $container->get('ViewManager'); |
|
31 | + $view = $viewManager->getView(); |
|
32 | + $viewEvents = $view->getEventManager(); |
|
33 | + $Html2PdfConverter->attach($viewEvents); |
|
34 | 34 | |
35 | - $application = $container->get('Application'); |
|
36 | - $MvcEvents = $application->getEventManager(); |
|
37 | - $Html2PdfConverter->attachMvc($MvcEvents); |
|
38 | - //$events->attach(ViewEvent::EVENT_RENDERER_POST, array($this, 'removeLayout'), 1); |
|
39 | - //$viewEvents->attach(ViewEvent::EVENT_RESPONSE, array($this, 'attachPDFtransformer'), 10); |
|
35 | + $application = $container->get('Application'); |
|
36 | + $MvcEvents = $application->getEventManager(); |
|
37 | + $Html2PdfConverter->attachMvc($MvcEvents); |
|
38 | + //$events->attach(ViewEvent::EVENT_RENDERER_POST, array($this, 'removeLayout'), 1); |
|
39 | + //$viewEvents->attach(ViewEvent::EVENT_RESPONSE, array($this, 'attachPDFtransformer'), 10); |
|
40 | 40 | |
41 | 41 | |
42 | - return $Html2PdfConverter; |
|
43 | - } |
|
42 | + return $Html2PdfConverter; |
|
43 | + } |
|
44 | 44 | } |
@@ -14,7 +14,7 @@ |
||
14 | 14 | |
15 | 15 | class PdfServiceFactory implements FactoryInterface |
16 | 16 | { |
17 | - public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) |
|
17 | + public function __invoke(ContainerInterface $container, $requestedName, array $options = null) |
|
18 | 18 | { |
19 | 19 | $Html2PdfConverter = $container->get('Html2PdfConverter'); |
20 | 20 | if (!$Html2PdfConverter instanceof PdfInterface) { |
@@ -25,13 +25,13 @@ |
||
25 | 25 | */ |
26 | 26 | class PaginatorServiceFactory implements FactoryInterface |
27 | 27 | { |
28 | - public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) |
|
29 | - { |
|
30 | - $configArray = $container->get('Config'); |
|
31 | - $configArray = isset($configArray['paginator_manager']) ? $configArray['paginator_manager'] : array(); |
|
32 | - $config = new PaginatorServiceConfig($configArray); |
|
33 | - $service = new PaginatorService($container,$config->toArray()); |
|
28 | + public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) |
|
29 | + { |
|
30 | + $configArray = $container->get('Config'); |
|
31 | + $configArray = isset($configArray['paginator_manager']) ? $configArray['paginator_manager'] : array(); |
|
32 | + $config = new PaginatorServiceConfig($configArray); |
|
33 | + $service = new PaginatorService($container,$config->toArray()); |
|
34 | 34 | |
35 | - return $service; |
|
36 | - } |
|
35 | + return $service; |
|
36 | + } |
|
37 | 37 | } |
@@ -25,12 +25,12 @@ |
||
25 | 25 | */ |
26 | 26 | class PaginatorServiceFactory implements FactoryInterface |
27 | 27 | { |
28 | - public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) |
|
28 | + public function __invoke(ContainerInterface $container, $requestedName, array $options = null) |
|
29 | 29 | { |
30 | 30 | $configArray = $container->get('Config'); |
31 | 31 | $configArray = isset($configArray['paginator_manager']) ? $configArray['paginator_manager'] : array(); |
32 | 32 | $config = new PaginatorServiceConfig($configArray); |
33 | - $service = new PaginatorService($container,$config->toArray()); |
|
33 | + $service = new PaginatorService($container, $config->toArray()); |
|
34 | 34 | |
35 | 35 | return $service; |
36 | 36 | } |