@@ -26,9 +26,9 @@ discard block |
||
26 | 26 | */ |
27 | 27 | class PaginationQueryFactory implements FactoryInterface |
28 | 28 | { |
29 | - public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) |
|
29 | + public function __invoke(ContainerInterface $container, $requestedName, array $options = null) |
|
30 | 30 | { |
31 | - $auth = $container->get('AuthenticationService'); |
|
31 | + $auth = $container->get('AuthenticationService'); |
|
32 | 32 | $filter = new PaginationQuery($auth); |
33 | 33 | return $filter; |
34 | 34 | } |
@@ -44,6 +44,6 @@ discard block |
||
44 | 44 | */ |
45 | 45 | public function createService(ContainerInterface $container) |
46 | 46 | { |
47 | - return $this($container,PaginationQuery::class); |
|
47 | + return $this($container, PaginationQuery::class); |
|
48 | 48 | } |
49 | 49 | } |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | * |
69 | 69 | * @param ApplicationEvent $e |
70 | 70 | */ |
71 | - public function prepareFormData(ApplicationEvent $e){ |
|
71 | + public function prepareFormData(ApplicationEvent $e) { |
|
72 | 72 | $target = $e->getTarget(); |
73 | 73 | if ($target->isPostRequest()) { |
74 | 74 | return; |
@@ -96,13 +96,13 @@ discard block |
||
96 | 96 | $key = 'mailRejectionText'; |
97 | 97 | break; |
98 | 98 | default: |
99 | - throw new \InvalidArgumentException('Unknown status value: ' .$status); |
|
99 | + throw new \InvalidArgumentException('Unknown status value: '.$status); |
|
100 | 100 | } |
101 | - $mailText = $settings->$key ? $settings->$key : ''; |
|
101 | + $mailText = $settings->$key ? $settings->$key : ''; |
|
102 | 102 | $mail->setBody($mailText); |
103 | 103 | $mail->setApplication($this->application); |
104 | 104 | $mailText = $mail->getBodyText(); |
105 | - $mailSubject = sprintf( |
|
105 | + $mailSubject = sprintf( |
|
106 | 106 | $this->translator->translate('Your application dated %s'), |
107 | 107 | strftime('%x', $this->application->getDateCreated()->getTimestamp()) |
108 | 108 | ); |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | * |
123 | 123 | * @param ApplicationEvent $event |
124 | 124 | */ |
125 | - public function sendMail(ApplicationEvent $event){ |
|
125 | + public function sendMail(ApplicationEvent $event) { |
|
126 | 126 | $event = $event->getTarget(); |
127 | 127 | if (!$event->isPostRequest()) { |
128 | 128 | return; |
@@ -169,7 +169,7 @@ discard block |
||
169 | 169 | $this->mailService->send($mail); |
170 | 170 | |
171 | 171 | |
172 | - $historyText = sprintf($this->translator->translate('Mail was sent to %s'), key($recipient) ?: $recipient[0] ); |
|
172 | + $historyText = sprintf($this->translator->translate('Mail was sent to %s'), key($recipient) ?: $recipient[0]); |
|
173 | 173 | $this->application->changeStatus($status, $historyText); |
174 | 174 | $event->setNotification($historyText); |
175 | 175 | } |
@@ -180,7 +180,7 @@ discard block |
||
180 | 180 | * |
181 | 181 | * @return AddressList |
182 | 182 | */ |
183 | - protected function getRecipient( Application $application, $status) { |
|
183 | + protected function getRecipient(Application $application, $status) { |
|
184 | 184 | |
185 | 185 | $recipient = Status::ACCEPTED == $status |
186 | 186 | ? $application->getJob()->getUser()->getInfo() |
@@ -189,7 +189,7 @@ discard block |
||
189 | 189 | $email = $recipient->getEmail(); |
190 | 190 | $name = $recipient->getDisplayName(false); |
191 | 191 | |
192 | - return $name ? [ $email => $name ] : [ $email ]; |
|
192 | + return $name ? [$email => $name] : [$email]; |
|
193 | 193 | } |
194 | 194 | |
195 | 195 | } |
196 | 196 | \ No newline at end of file |
@@ -30,7 +30,7 @@ |
||
30 | 30 | $auth = $container->get('AuthenticationService'); |
31 | 31 | $user = $auth->getUser(); |
32 | 32 | $options['user'] = $user; |
33 | - $mail = new Confirmation($options); |
|
33 | + $mail = new Confirmation($options); |
|
34 | 34 | |
35 | 35 | return $mail; |
36 | 36 | } |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | |
99 | 99 | echo "Generate keywords for $count applications ...\n"; |
100 | 100 | |
101 | - $progress = new ProgressBar($count); |
|
101 | + $progress = new ProgressBar($count); |
|
102 | 102 | |
103 | 103 | /** @var \Core\Repository\Filter\PropertyToKeywords $filter */ |
104 | 104 | $filter = $this->filterManager->get('Core/Repository/PropertyToKeywords'); |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | |
107 | 107 | /** @var \Applications\Entity\Application $application */ |
108 | 108 | foreach ($applications as $application) { |
109 | - $progress->update($i++, 'Application ' . $i . ' / ' . $count); |
|
109 | + $progress->update($i++, 'Application '.$i.' / '.$count); |
|
110 | 110 | $keywords = $filter->filter($application); |
111 | 111 | |
112 | 112 | $application->setKeywords($keywords); |
@@ -132,13 +132,13 @@ discard block |
||
132 | 132 | { |
133 | 133 | $applications = $this->fetchApplications(); |
134 | 134 | $count = count($applications); |
135 | - $i=0; |
|
136 | - echo "Calculate rating for " . $count . " applications ...\n"; |
|
135 | + $i = 0; |
|
136 | + echo "Calculate rating for ".$count." applications ...\n"; |
|
137 | 137 | |
138 | 138 | $progress = new ProgressBar($count); |
139 | 139 | /** @var \Applications\Entity\Application $application */ |
140 | 140 | foreach ($applications as $application) { |
141 | - $progress->update($i++, 'Application ' . $i . ' / ' . $count); |
|
141 | + $progress->update($i++, 'Application '.$i.' / '.$count); |
|
142 | 142 | $application->getRating(/* recalculate */ true); |
143 | 143 | } |
144 | 144 | $progress->update($i, 'Write to database...'); |
@@ -165,17 +165,17 @@ discard block |
||
165 | 165 | $documentManager = $this->documentManager; |
166 | 166 | |
167 | 167 | $count = count($applications); |
168 | - $i=0; |
|
168 | + $i = 0; |
|
169 | 169 | |
170 | - echo $count . " applications in Draft Mode and older than " . $days . " days will be deleted\n"; |
|
170 | + echo $count." applications in Draft Mode and older than ".$days." days will be deleted\n"; |
|
171 | 171 | |
172 | 172 | $progress = new ProgressBar($count); |
173 | 173 | |
174 | 174 | foreach ($applications as $application) { |
175 | - $progress->update($i++, 'Application ' . $i . ' / ' . $count); |
|
175 | + $progress->update($i++, 'Application '.$i.' / '.$count); |
|
176 | 176 | try { |
177 | 177 | $documentManager->remove($application); |
178 | - } catch (\Exception $e){ |
|
178 | + } catch (\Exception $e) { |
|
179 | 179 | // log something |
180 | 180 | $e->getCode(); |
181 | 181 | } |
@@ -199,17 +199,17 @@ discard block |
||
199 | 199 | |
200 | 200 | $table->appendRow(array('Module', 'Name', 'Description')); |
201 | 201 | |
202 | - $offset=strlen(getcwd())+1; |
|
203 | - $links=""; |
|
204 | - $github='https://github.com/cross-solution/YAWIK/blob/master/'; |
|
202 | + $offset = strlen(getcwd()) + 1; |
|
203 | + $links = ""; |
|
204 | + $github = 'https://github.com/cross-solution/YAWIK/blob/master/'; |
|
205 | 205 | |
206 | 206 | foreach ($config['view_manager']['template_map'] as $key => $absolute_filename) { |
207 | 207 | // strip the application_root plus an additional slash |
208 | - $filename=substr(realpath($absolute_filename), $offset); |
|
208 | + $filename = substr(realpath($absolute_filename), $offset); |
|
209 | 209 | if (preg_match('~module/([^/]+)~', $filename, $match)) { |
210 | - $module=$match[1]; |
|
210 | + $module = $match[1]; |
|
211 | 211 | } else { |
212 | - $module="not found ($key)"; |
|
212 | + $module = "not found ($key)"; |
|
213 | 213 | } |
214 | 214 | |
215 | 215 | $viewModel = new ViewModel(); |
@@ -218,17 +218,17 @@ discard block |
||
218 | 218 | $row = new Row(); |
219 | 219 | $row->appendColumn(new Column($module)); |
220 | 220 | if ($filename) { |
221 | - $row->appendColumn(new Column('`' . $key . '`_')); |
|
222 | - $links.='.. _'. $key .': '. $github.$filename .PHP_EOL; |
|
221 | + $row->appendColumn(new Column('`'.$key.'`_')); |
|
222 | + $links .= '.. _'.$key.': '.$github.$filename.PHP_EOL; |
|
223 | 223 | } else { |
224 | 224 | $row->appendColumn(new Column("WRONG CONFIGURATION")); |
225 | 225 | } |
226 | - $comment=""; |
|
226 | + $comment = ""; |
|
227 | 227 | if (file_exists($absolute_filename)) { |
228 | - $src=file_get_contents($absolute_filename); |
|
229 | - $comment="file exists"; |
|
228 | + $src = file_get_contents($absolute_filename); |
|
229 | + $comment = "file exists"; |
|
230 | 230 | if (preg_match("/{{rtd:\s*(.*)}}/", $src, $match)) { |
231 | - $comment=$match['1']; |
|
231 | + $comment = $match['1']; |
|
232 | 232 | } |
233 | 233 | } |
234 | 234 | $row->appendColumn(new Column($comment)); |
@@ -245,7 +245,7 @@ discard block |
||
245 | 245 | { |
246 | 246 | echo "Loading applications... "; |
247 | 247 | |
248 | - $filter = \Zend\Json\Json::decode($this->params('filter', '{}'), \Zend\Json\Json::TYPE_ARRAY); |
|
248 | + $filter = \Zend\Json\Json::decode($this->params('filter', '{}'), \Zend\Json\Json::TYPE_ARRAY); |
|
249 | 249 | $filter['$or'] = array( |
250 | 250 | array('attachments' => array('$exists' => 1)), |
251 | 251 | array('contact.image' => array('$exists' => 1)), |
@@ -259,7 +259,7 @@ discard block |
||
259 | 259 | return; |
260 | 260 | } |
261 | 261 | $progress = new ProgressBar($count); |
262 | - $i=0; |
|
262 | + $i = 0; |
|
263 | 263 | |
264 | 264 | foreach ($applications as $app) { |
265 | 265 | $progress->update($i++, "Process $i / $count"); |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | return $ob; |
73 | 73 | } |
74 | 74 | |
75 | - public function setContainer( ContainerInterface $container ) |
|
75 | + public function setContainer(ContainerInterface $container) |
|
76 | 76 | { |
77 | 77 | $this->config = $container->get('Config'); |
78 | 78 | $this->imageCacheManager = $container->get('Organizations\ImageFileCache\Manager'); |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | throw new \RuntimeException('Invalid application id.'); |
126 | 126 | } |
127 | 127 | |
128 | - $action = 'process'; |
|
128 | + $action = 'process'; |
|
129 | 129 | |
130 | 130 | $routeMatch->setParam('action', $action); |
131 | 131 | } else { |
@@ -209,14 +209,14 @@ discard block |
||
209 | 209 | |
210 | 210 | $container->setEntity($application); |
211 | 211 | $this->configureContainer($container); |
212 | - $this->formContainer = $container; |
|
212 | + $this->formContainer = $container; |
|
213 | 213 | } |
214 | 214 | |
215 | 215 | public function jobNotFoundAction() |
216 | 216 | { |
217 | 217 | $this->response->setStatusCode(410); |
218 | 218 | $model = new ViewModel( |
219 | - [ 'content' => /*@translate*/ 'Invalid apply id'] |
|
219 | + ['content' => /*@translate*/ 'Invalid apply id'] |
|
220 | 220 | ); |
221 | 221 | $model->setTemplate('applications/error/not-found'); |
222 | 222 | return $model; |
@@ -335,7 +335,7 @@ discard block |
||
335 | 335 | $postData = $form->getOption('use_post_array') ? $params->fromPost() : array(); |
336 | 336 | //@TODO: [ZF3] option use_files_array is false by default |
337 | 337 | //$filesData = $form->getOption('use_files_array') ? $params->fromFiles() : array(); |
338 | - $form->setData(array_merge($postData,$_FILES)); |
|
338 | + $form->setData(array_merge($postData, $_FILES)); |
|
339 | 339 | |
340 | 340 | if (!$form->isValid()) { |
341 | 341 | return new JsonModel( |
@@ -397,13 +397,13 @@ discard block |
||
397 | 397 | } |
398 | 398 | |
399 | 399 | if ('previewmail' == $this->params()->fromQuery('do')) { |
400 | - $this->mailer('Applications/CarbonCopy', [ 'application' => $application], true); |
|
400 | + $this->mailer('Applications/CarbonCopy', ['application' => $application], true); |
|
401 | 401 | $this->notification()->success(/*@translate*/ 'Mail has been send'); |
402 | 402 | return new JsonModel(); |
403 | 403 | } |
404 | 404 | |
405 | 405 | if ('sendmail' == $this->params()->fromQuery('do')) { |
406 | - $jobEntity = $application->getJob(); |
|
406 | + $jobEntity = $application->getJob(); |
|
407 | 407 | |
408 | 408 | $mailData = array( |
409 | 409 | 'application' => $application, |
@@ -434,8 +434,8 @@ discard block |
||
434 | 434 | |
435 | 435 | $repositories->store($application); |
436 | 436 | |
437 | - $events = $this->appEvents; |
|
438 | - $events->trigger(ApplicationEvent::EVENT_APPLICATION_POST_CREATE, $this, [ 'application' => $application ]); |
|
437 | + $events = $this->appEvents; |
|
438 | + $events->trigger(ApplicationEvent::EVENT_APPLICATION_POST_CREATE, $this, ['application' => $application]); |
|
439 | 439 | |
440 | 440 | $model = new ViewModel( |
441 | 441 | array( |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | $this->appOptions = $appOptions; |
72 | 72 | $this->appEvents = $appEvents; |
73 | 73 | $this->translator = $translator; |
74 | - $this->container = $container; |
|
74 | + $this->container = $container; |
|
75 | 75 | } |
76 | 76 | |
77 | 77 | /** |
@@ -169,7 +169,7 @@ discard block |
||
169 | 169 | |
170 | 170 | |
171 | 171 | |
172 | - $format=$this->params()->fromQuery('format'); |
|
172 | + $format = $this->params()->fromQuery('format'); |
|
173 | 173 | |
174 | 174 | if ($application->isDraft()) { |
175 | 175 | $list = false; |
@@ -297,7 +297,7 @@ discard block |
||
297 | 297 | && ($network = $this->params()->fromQuery('network')) |
298 | 298 | && ($data = $this->params()->fromPost('data')) |
299 | 299 | ) { |
300 | - $profileClass = '\\Auth\\Entity\\SocialProfiles\\' . $network; |
|
300 | + $profileClass = '\\Auth\\Entity\\SocialProfiles\\'.$network; |
|
301 | 301 | $profile = new $profileClass(); |
302 | 302 | $profile->setData(\Zend\Json\Json::decode($data, \Zend\Json\Json::TYPE_ARRAY)); |
303 | 303 | } else { |
@@ -366,7 +366,7 @@ discard block |
||
366 | 366 | |
367 | 367 | $event->setIsPostRequest($request->isPost()); |
368 | 368 | $event->setPostData($request->getPost()); |
369 | - $events->trigger($event->getName(),$event); |
|
369 | + $events->trigger($event->getName(), $event); |
|
370 | 370 | |
371 | 371 | $params = $event->getFormData(); |
372 | 372 | |
@@ -415,7 +415,7 @@ discard block |
||
415 | 415 | |
416 | 416 | $this->acl($application, 'forward'); |
417 | 417 | |
418 | - $translator = $this->translator; |
|
418 | + $translator = $this->translator; |
|
419 | 419 | |
420 | 420 | if (!$emailAddress) { |
421 | 421 | throw new \InvalidArgumentException('An email address must be supplied.'); |
@@ -455,7 +455,7 @@ discard block |
||
455 | 455 | public function deleteAction() |
456 | 456 | { |
457 | 457 | $id = $this->params('id'); |
458 | - $repositories= $this->repositories; |
|
458 | + $repositories = $this->repositories; |
|
459 | 459 | $repository = $repositories->get('Applications/Application'); |
460 | 460 | $application = $repository->find($id); |
461 | 461 | |
@@ -465,8 +465,8 @@ discard block |
||
465 | 465 | |
466 | 466 | $this->acl($application, 'delete'); |
467 | 467 | |
468 | - $events = $this->appEvents; |
|
469 | - $events->trigger(ApplicationEvent::EVENT_APPLICATION_PRE_DELETE, $this, [ 'application' => $application ]); |
|
468 | + $events = $this->appEvents; |
|
469 | + $events->trigger(ApplicationEvent::EVENT_APPLICATION_PRE_DELETE, $this, ['application' => $application]); |
|
470 | 470 | |
471 | 471 | $repositories->remove($application); |
472 | 472 |
@@ -100,7 +100,7 @@ |
||
100 | 100 | return $viewModel; |
101 | 101 | } |
102 | 102 | |
103 | - public function setContainer( ContainerInterface $container ) |
|
103 | + public function setContainer(ContainerInterface $container) |
|
104 | 104 | { |
105 | 105 | $this->repositories = $container->get('repositories'); |
106 | 106 | $this->formManager = $container->get('forms'); |
@@ -136,7 +136,7 @@ |
||
136 | 136 | * |
137 | 137 | * @return Forward |
138 | 138 | */ |
139 | - static public function factory(ContainerInterface $container,$requestedName,array $options=[]) |
|
139 | + static public function factory(ContainerInterface $container, $requestedName, array $options = []) |
|
140 | 140 | { |
141 | 141 | $ob = new self($options); |
142 | 142 | $ob->setContainer($container); |
@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | |
16 | 16 | use Zend\ServiceManager\Factory\InvokableFactory; |
17 | 17 | |
18 | -$doctrineConfig = include __DIR__ . '/doctrine.config.php'; |
|
18 | +$doctrineConfig = include __DIR__.'/doctrine.config.php'; |
|
19 | 19 | |
20 | 20 | |
21 | 21 | return array( |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | 'doctrine' => $doctrineConfig, |
24 | 24 | |
25 | 25 | 'options' => [ |
26 | - 'Core/MailServiceOptions' => [ 'class' => '\Core\Options\MailServiceOptions' ], |
|
26 | + 'Core/MailServiceOptions' => ['class' => '\Core\Options\MailServiceOptions'], |
|
27 | 27 | ], |
28 | 28 | |
29 | 29 | 'Core' => array( |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | 'name' => 'stream', |
44 | 44 | 'priority' => 1000, |
45 | 45 | 'options' => array( |
46 | - 'stream' => __DIR__ .'/../../../log/yawik.log', |
|
46 | + 'stream' => __DIR__.'/../../../log/yawik.log', |
|
47 | 47 | ), |
48 | 48 | ), |
49 | 49 | ), |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | 'name' => 'stream', |
55 | 55 | 'priority' => 1000, |
56 | 56 | 'options' => array( |
57 | - 'stream' => __DIR__ .'/../../../log/mails.log', |
|
57 | + 'stream' => __DIR__.'/../../../log/mails.log', |
|
58 | 58 | ), |
59 | 59 | ), |
60 | 60 | ), |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | 'mode' => true, // true = production|false = development|null = autodetect|IP address(es) csv/array |
72 | 72 | 'bar' => false, // bool = enabled|Toggle nette diagnostics bar. |
73 | 73 | 'strict' => true, // bool = cause immediate death|int = matched against error severity |
74 | - 'log' => __DIR__ . '/../../../log/tracy', // path to log directory (this directory keeps error.log, snoozing mailsent file & html exception trace files) |
|
74 | + 'log' => __DIR__.'/../../../log/tracy', // path to log directory (this directory keeps error.log, snoozing mailsent file & html exception trace files) |
|
75 | 75 | 'email' => null, // in production mode notifies the recipient |
76 | 76 | 'email_snooze' => 900 // interval for sending email in seconds |
77 | 77 | ], |
@@ -198,17 +198,17 @@ discard block |
||
198 | 198 | 'Core/JsonEntityHydrator' => 'Core\Entity\Hydrator\JsonEntityHydratorFactory', |
199 | 199 | 'Core/EntityHydrator' => 'Core\Entity\Hydrator\EntityHydratorFactory', |
200 | 200 | 'Core/Options' => 'Core\Factory\ModuleOptionsFactory', |
201 | - 'Core/DoctrineMongoODM/RepositoryEvents' => [\Core\Repository\DoctrineMongoODM\Event\RepositoryEventsSubscriber::class,'factory'], |
|
202 | - 'DefaultListeners' => ['Core\Listener\DefaultListener','factory'], |
|
203 | - 'templateProviderStrategy' => ['Core\Form\Hydrator\Strategy\TemplateProviderStrategy','factory'], |
|
204 | - 'Core/Listener/DeferredListenerAggregate' => [\Core\Listener\DeferredListenerAggregate::class,'factory'], |
|
201 | + 'Core/DoctrineMongoODM/RepositoryEvents' => [\Core\Repository\DoctrineMongoODM\Event\RepositoryEventsSubscriber::class, 'factory'], |
|
202 | + 'DefaultListeners' => ['Core\Listener\DefaultListener', 'factory'], |
|
203 | + 'templateProviderStrategy' => ['Core\Form\Hydrator\Strategy\TemplateProviderStrategy', 'factory'], |
|
204 | + 'Core/Listener/DeferredListenerAggregate' => [\Core\Listener\DeferredListenerAggregate::class, 'factory'], |
|
205 | 205 | 'Core/Listener/CreatePaginator' => 'Core\Listener\CreatePaginatorListener::factory', |
206 | 206 | 'Core/Locale' => 'Core\I18n\LocaleFactory', |
207 | 207 | 'mvctranslator' => \Zend\Mvc\I18n\TranslatorFactory::class, |
208 | 208 | \Core\Listener\AjaxRouteListener::class => \Core\Factory\Listener\AjaxRouteListenerFactory::class, |
209 | 209 | \Core\Listener\DeleteImageSetListener::class => \Core\Factory\Listener\DeleteImageSetListenerFactory::class, |
210 | 210 | 'Imagine' => \Core\Factory\Service\ImagineFactory::class, |
211 | - 'Core/Listener/Notification' => [\Core\Listener\NotificationListener::class,'factory'], |
|
211 | + 'Core/Listener/Notification' => [\Core\Listener\NotificationListener::class, 'factory'], |
|
212 | 212 | ), |
213 | 213 | 'abstract_factories' => array( |
214 | 214 | 'Core\Factory\OptionsAbstractFactory', |
@@ -230,17 +230,17 @@ discard block |
||
230 | 230 | 'translation_file_patterns' => array( |
231 | 231 | [ |
232 | 232 | 'type' => 'gettext', |
233 | - 'base_dir' => __DIR__ . '/../language', |
|
233 | + 'base_dir' => __DIR__.'/../language', |
|
234 | 234 | 'pattern' => '%s.mo', |
235 | 235 | ], |
236 | 236 | [ |
237 | 237 | 'type' => 'phparray', |
238 | - 'base_dir' => __DIR__ . '/../language', |
|
238 | + 'base_dir' => __DIR__.'/../language', |
|
239 | 239 | 'pattern' => 'Zend_Validate.%s.php', |
240 | 240 | ], |
241 | 241 | [ |
242 | 242 | 'type' => 'phparray', |
243 | - 'base_dir' => __DIR__ . '/../language', |
|
243 | + 'base_dir' => __DIR__.'/../language', |
|
244 | 244 | 'pattern' => 'Zend_Captcha.%s.php', |
245 | 245 | ] |
246 | 246 | ), |
@@ -268,9 +268,9 @@ discard block |
||
268 | 268 | ), |
269 | 269 | 'factories' => [ |
270 | 270 | // @TODO: improve this factory |
271 | - 'Core\Controller\Index' => [\Core\Controller\IndexController::class,'factory'], |
|
272 | - 'Core/Admin' => [\Core\Controller\AdminController::class,'factory'], |
|
273 | - 'Core\Controller\File' => [\Core\Controller\FileController::class,'factory'], |
|
271 | + 'Core\Controller\Index' => [\Core\Controller\IndexController::class, 'factory'], |
|
272 | + 'Core/Admin' => [\Core\Controller\AdminController::class, 'factory'], |
|
273 | + 'Core\Controller\File' => [\Core\Controller\FileController::class, 'factory'], |
|
274 | 274 | ], |
275 | 275 | 'abstract_factories' => [ |
276 | 276 | \Core\Factory\Controller\LazyControllerFactory::class |
@@ -285,9 +285,9 @@ discard block |
||
285 | 285 | 'Core/SearchForm' => 'Core\Factory\Controller\Plugin\SearchFormFactory', |
286 | 286 | 'listquery' => 'Core\Controller\Plugin\ListQuery::factory', |
287 | 287 | 'mail' => 'Core\Controller\Plugin\Mail::factory', |
288 | - 'Core/Mailer' => ['Core\Controller\Plugin\Mailer','factory'], |
|
289 | - 'Core/CreatePaginator' => [\Core\Controller\Plugin\CreatePaginator::class,'factory'], |
|
290 | - 'Core/PaginatorService' => [\Core\Controller\Plugin\CreatePaginatorService::class,'factory'], |
|
288 | + 'Core/Mailer' => ['Core\Controller\Plugin\Mailer', 'factory'], |
|
289 | + 'Core/CreatePaginator' => [\Core\Controller\Plugin\CreatePaginator::class, 'factory'], |
|
290 | + 'Core/PaginatorService' => [\Core\Controller\Plugin\CreatePaginatorService::class, 'factory'], |
|
291 | 291 | ), |
292 | 292 | 'invokables' => array( |
293 | 293 | 'Core/FileSender' => 'Core\Controller\Plugin\FileSender', |
@@ -317,32 +317,32 @@ discard block |
||
317 | 317 | 'exception_template' => 'error/index', |
318 | 318 | // Map template to files. Speeds up the lookup through the template stack. |
319 | 319 | 'template_map' => array( |
320 | - 'noscript-notice' => __DIR__ . '/../view/layout/_noscript-notice.phtml', |
|
321 | - 'layout/layout' => __DIR__ . '/../view/layout/layout.phtml', |
|
322 | - 'error/404' => __DIR__ . '/../view/error/404.phtml', |
|
323 | - 'error/403' => __DIR__ . '/../view/error/403.phtml', |
|
324 | - 'error/index' => __DIR__ . '/../view/error/index.phtml', |
|
325 | - 'main-navigation' => __DIR__ . '/../view/partial/main-navigation.phtml', |
|
326 | - 'pagination-control' => __DIR__ . '/../view/partial/pagination-control.phtml', |
|
327 | - 'core/loading-popup' => __DIR__ . '/../view/partial/loading-popup.phtml', |
|
328 | - 'core/notifications' => __DIR__ . '/../view/partial/notifications.phtml', |
|
329 | - 'form/core/buttons' => __DIR__ . '/../view/form/buttons.phtml', |
|
330 | - 'core/social-buttons' => __DIR__ . '/../view/partial/social-buttons.phtml', |
|
331 | - 'form/core/privacy' => __DIR__ . '/../view/form/privacy.phtml', |
|
332 | - 'core/form/permissions-fieldset' => __DIR__ . '/../view/form/permissions-fieldset.phtml', |
|
333 | - 'core/form/permissions-collection' => __DIR__ . '/../view/form/permissions-collection.phtml', |
|
334 | - 'core/form/container-view' => __DIR__ . '/../view/form/container.view.phtml', |
|
335 | - 'core/form/tree-manage.view' => __DIR__ . '/../view/form/tree-manage.view.phtml', |
|
336 | - 'core/form/tree-manage.form' => __DIR__ . '/../view/form/tree-manage.form.phtml', |
|
337 | - 'core/form/tree-add-item' => __DIR__ . '/../view/form/tree-add-item.phtml', |
|
338 | - 'mail/header' => __DIR__ . '/../view/mail/header.phtml', |
|
339 | - 'mail/footer' => __DIR__ . '/../view/mail/footer.phtml', |
|
340 | - 'mail/footer.en' => __DIR__ . '/../view/mail/footer.en.phtml', |
|
320 | + 'noscript-notice' => __DIR__.'/../view/layout/_noscript-notice.phtml', |
|
321 | + 'layout/layout' => __DIR__.'/../view/layout/layout.phtml', |
|
322 | + 'error/404' => __DIR__.'/../view/error/404.phtml', |
|
323 | + 'error/403' => __DIR__.'/../view/error/403.phtml', |
|
324 | + 'error/index' => __DIR__.'/../view/error/index.phtml', |
|
325 | + 'main-navigation' => __DIR__.'/../view/partial/main-navigation.phtml', |
|
326 | + 'pagination-control' => __DIR__.'/../view/partial/pagination-control.phtml', |
|
327 | + 'core/loading-popup' => __DIR__.'/../view/partial/loading-popup.phtml', |
|
328 | + 'core/notifications' => __DIR__.'/../view/partial/notifications.phtml', |
|
329 | + 'form/core/buttons' => __DIR__.'/../view/form/buttons.phtml', |
|
330 | + 'core/social-buttons' => __DIR__.'/../view/partial/social-buttons.phtml', |
|
331 | + 'form/core/privacy' => __DIR__.'/../view/form/privacy.phtml', |
|
332 | + 'core/form/permissions-fieldset' => __DIR__.'/../view/form/permissions-fieldset.phtml', |
|
333 | + 'core/form/permissions-collection' => __DIR__.'/../view/form/permissions-collection.phtml', |
|
334 | + 'core/form/container-view' => __DIR__.'/../view/form/container.view.phtml', |
|
335 | + 'core/form/tree-manage.view' => __DIR__.'/../view/form/tree-manage.view.phtml', |
|
336 | + 'core/form/tree-manage.form' => __DIR__.'/../view/form/tree-manage.form.phtml', |
|
337 | + 'core/form/tree-add-item' => __DIR__.'/../view/form/tree-add-item.phtml', |
|
338 | + 'mail/header' => __DIR__.'/../view/mail/header.phtml', |
|
339 | + 'mail/footer' => __DIR__.'/../view/mail/footer.phtml', |
|
340 | + 'mail/footer.en' => __DIR__.'/../view/mail/footer.en.phtml', |
|
341 | 341 | //'startpage' => __DIR__ . '/../view/layout/startpage.phtml', |
342 | 342 | ), |
343 | 343 | // Where to look for view templates not mapped above |
344 | 344 | 'template_path_stack' => array( |
345 | - __DIR__ . '/../view', |
|
345 | + __DIR__.'/../view', |
|
346 | 346 | ), |
347 | 347 | ), |
348 | 348 | 'view_helpers' => array( |