@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | public function getConsoleBanner(Console $console) |
| 40 | 40 | { |
| 41 | 41 | $version = `git describe 2>/dev/null`; |
| 42 | - $name = 'YAWIK ' . trim($version); |
|
| 42 | + $name = 'YAWIK '.trim($version); |
|
| 43 | 43 | $width = $console->getWidth(); |
| 44 | 44 | return sprintf( |
| 45 | 45 | "==%1\$s==\n%2\$s%3\$s\n**%1\$s**\n", |
@@ -82,12 +82,12 @@ discard block |
||
| 82 | 82 | } |
| 83 | 83 | |
| 84 | 84 | if (!\Zend\Console\Console::isConsole()) { |
| 85 | - $redirectCallback = function () use ($e) { |
|
| 85 | + $redirectCallback = function() use ($e) { |
|
| 86 | 86 | $routeMatch = $e->getRouteMatch(); |
| 87 | 87 | $lang = $routeMatch ? $routeMatch->getParam('lang', 'en') : 'en'; |
| 88 | - $uri = $e->getRouter()->getBaseUrl() . '/' . $lang . '/error'; |
|
| 88 | + $uri = $e->getRouter()->getBaseUrl().'/'.$lang.'/error'; |
|
| 89 | 89 | |
| 90 | - header('Location: ' . $uri); |
|
| 90 | + header('Location: '.$uri); |
|
| 91 | 91 | }; |
| 92 | 92 | |
| 93 | 93 | if (!$tracyConfig['enabled']) { |
@@ -125,7 +125,7 @@ discard block |
||
| 125 | 125 | |
| 126 | 126 | $eventManager->attach( |
| 127 | 127 | MvcEvent::EVENT_DISPATCH_ERROR, |
| 128 | - function ($event) { |
|
| 128 | + function($event) { |
|
| 129 | 129 | $application = $event->getApplication(); |
| 130 | 130 | if ($application::ERROR_EXCEPTION == $event->getError()) { |
| 131 | 131 | $ex = $event->getParam('exception'); |
@@ -139,7 +139,7 @@ discard block |
||
| 139 | 139 | ); |
| 140 | 140 | $eventManager->attach( |
| 141 | 141 | MvcEvent::EVENT_DISPATCH, |
| 142 | - function ($event) use ($eventManager) { |
|
| 142 | + function($event) use ($eventManager) { |
|
| 143 | 143 | $eventManager->trigger('postDispatch', $event); |
| 144 | 144 | }, |
| 145 | 145 | -150 |
@@ -154,7 +154,7 @@ discard block |
||
| 154 | 154 | */ |
| 155 | 155 | public function getConfig() |
| 156 | 156 | { |
| 157 | - $config = include __DIR__ . '/config/module.config.php'; |
|
| 157 | + $config = include __DIR__.'/config/module.config.php'; |
|
| 158 | 158 | return $config; |
| 159 | 159 | } |
| 160 | 160 | |
@@ -167,13 +167,13 @@ discard block |
||
| 167 | 167 | { |
| 168 | 168 | return array( |
| 169 | 169 | 'Zend\Loader\ClassMapAutoloader' => [ |
| 170 | - __DIR__ . '/src/autoload_classmap.php' |
|
| 170 | + __DIR__.'/src/autoload_classmap.php' |
|
| 171 | 171 | ], |
| 172 | 172 | 'Zend\Loader\StandardAutoloader' => array( |
| 173 | 173 | 'namespaces' => array( |
| 174 | - __NAMESPACE__ => __DIR__ . '/src/' . __NAMESPACE__, |
|
| 175 | - 'CoreTest' => __DIR__ . '/test/' . 'CoreTest', |
|
| 176 | - 'CoreTestUtils' => __DIR__ . '/test/CoreTestUtils', |
|
| 174 | + __NAMESPACE__ => __DIR__.'/src/'.__NAMESPACE__, |
|
| 175 | + 'CoreTest' => __DIR__.'/test/'.'CoreTest', |
|
| 176 | + 'CoreTestUtils' => __DIR__.'/test/CoreTestUtils', |
|
| 177 | 177 | ), |
| 178 | 178 | ), |
| 179 | 179 | ); |
@@ -12,7 +12,7 @@ discard block |
||
| 12 | 12 | * @license MIT |
| 13 | 13 | */ |
| 14 | 14 | |
| 15 | -$doctrineConfig = include __DIR__ . '/doctrine.config.php'; |
|
| 15 | +$doctrineConfig = include __DIR__.'/doctrine.config.php'; |
|
| 16 | 16 | |
| 17 | 17 | |
| 18 | 18 | return array( |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | 'doctrine' => $doctrineConfig, |
| 21 | 21 | |
| 22 | 22 | 'options' => [ |
| 23 | - 'Core/MailServiceOptions' => [ 'class' => '\Core\Options\MailServiceOptions' ], |
|
| 23 | + 'Core/MailServiceOptions' => ['class' => '\Core\Options\MailServiceOptions'], |
|
| 24 | 24 | ], |
| 25 | 25 | |
| 26 | 26 | 'Core' => array( |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | 'name' => 'stream', |
| 41 | 41 | 'priority' => 1000, |
| 42 | 42 | 'options' => array( |
| 43 | - 'stream' => __DIR__ .'/../../../log/yawik.log', |
|
| 43 | + 'stream' => __DIR__.'/../../../log/yawik.log', |
|
| 44 | 44 | ), |
| 45 | 45 | ), |
| 46 | 46 | ), |
@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | 'name' => 'stream', |
| 52 | 52 | 'priority' => 1000, |
| 53 | 53 | 'options' => array( |
| 54 | - 'stream' => __DIR__ .'/../../../log/mails.log', |
|
| 54 | + 'stream' => __DIR__.'/../../../log/mails.log', |
|
| 55 | 55 | ), |
| 56 | 56 | ), |
| 57 | 57 | ), |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | 'ErrorLogger' => array( |
| 60 | 60 | 'service' => 'Core/ErrorLogger', |
| 61 | 61 | 'config' => array( |
| 62 | - 'stream' => __DIR__ . '/../../../log/error.log', |
|
| 62 | + 'stream' => __DIR__.'/../../../log/error.log', |
|
| 63 | 63 | 'log_errors' => true, |
| 64 | 64 | 'log_exceptions' => true, |
| 65 | 65 | ), |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | 'mode' => true, // true = production|false = development|null = autodetect|IP address(es) csv/array |
| 78 | 78 | 'bar' => false, // bool = enabled|Toggle nette diagnostics bar. |
| 79 | 79 | 'strict' => true, // bool = cause immediate death|int = matched against error severity |
| 80 | - 'log' => __DIR__ . '/../../../log/tracy', // path to log directory (this directory keeps error.log, snoozing mailsent file & html exception trace files) |
|
| 80 | + 'log' => __DIR__.'/../../../log/tracy', // path to log directory (this directory keeps error.log, snoozing mailsent file & html exception trace files) |
|
| 81 | 81 | 'email' => null, // in production mode notifies the recipient |
| 82 | 82 | 'email_snooze' => 900 // interval for sending email in seconds |
| 83 | 83 | ], |
@@ -231,17 +231,17 @@ discard block |
||
| 231 | 231 | 'translation_file_patterns' => array( |
| 232 | 232 | [ |
| 233 | 233 | 'type' => 'gettext', |
| 234 | - 'base_dir' => __DIR__ . '/../language', |
|
| 234 | + 'base_dir' => __DIR__.'/../language', |
|
| 235 | 235 | 'pattern' => '%s.mo', |
| 236 | 236 | ], |
| 237 | 237 | [ |
| 238 | 238 | 'type' => 'phparray', |
| 239 | - 'base_dir' => __DIR__ . '/../language', |
|
| 239 | + 'base_dir' => __DIR__.'/../language', |
|
| 240 | 240 | 'pattern' => 'Zend_Validate.%s.php', |
| 241 | 241 | ], |
| 242 | 242 | [ |
| 243 | 243 | 'type' => 'phparray', |
| 244 | - 'base_dir' => __DIR__ . '/../language', |
|
| 244 | + 'base_dir' => __DIR__.'/../language', |
|
| 245 | 245 | 'pattern' => 'Zend_Captcha.%s.php', |
| 246 | 246 | ] |
| 247 | 247 | ), |
@@ -310,32 +310,32 @@ discard block |
||
| 310 | 310 | 'exception_template' => 'error/index', |
| 311 | 311 | // Map template to files. Speeds up the lookup through the template stack. |
| 312 | 312 | 'template_map' => array( |
| 313 | - 'noscript-notice' => __DIR__ . '/../view/layout/_noscript-notice.phtml', |
|
| 314 | - 'layout/layout' => __DIR__ . '/../view/layout/layout.phtml', |
|
| 315 | - 'error/404' => __DIR__ . '/../view/error/404.phtml', |
|
| 316 | - 'error/403' => __DIR__ . '/../view/error/403.phtml', |
|
| 317 | - 'error/index' => __DIR__ . '/../view/error/index.phtml', |
|
| 318 | - 'main-navigation' => __DIR__ . '/../view/partial/main-navigation.phtml', |
|
| 319 | - 'pagination-control' => __DIR__ . '/../view/partial/pagination-control.phtml', |
|
| 320 | - 'core/loading-popup' => __DIR__ . '/../view/partial/loading-popup.phtml', |
|
| 321 | - 'core/notifications' => __DIR__ . '/../view/partial/notifications.phtml', |
|
| 322 | - 'form/core/buttons' => __DIR__ . '/../view/form/buttons.phtml', |
|
| 323 | - 'core/social-buttons' => __DIR__ . '/../view/partial/social-buttons.phtml', |
|
| 324 | - 'form/core/privacy' => __DIR__ . '/../view/form/privacy.phtml', |
|
| 325 | - 'core/form/permissions-fieldset' => __DIR__ . '/../view/form/permissions-fieldset.phtml', |
|
| 326 | - 'core/form/permissions-collection' => __DIR__ . '/../view/form/permissions-collection.phtml', |
|
| 327 | - 'core/form/container-view' => __DIR__ . '/../view/form/container.view.phtml', |
|
| 328 | - 'core/form/tree-manage.view' => __DIR__ . '/../view/form/tree-manage.view.phtml', |
|
| 329 | - 'core/form/tree-manage.form' => __DIR__ . '/../view/form/tree-manage.form.phtml', |
|
| 330 | - 'core/form/tree-add-item' => __DIR__ . '/../view/form/tree-add-item.phtml', |
|
| 331 | - 'mail/header' => __DIR__ . '/../view/mail/header.phtml', |
|
| 332 | - 'mail/footer' => __DIR__ . '/../view/mail/footer.phtml', |
|
| 333 | - 'mail/footer.en' => __DIR__ . '/../view/mail/footer.en.phtml', |
|
| 313 | + 'noscript-notice' => __DIR__.'/../view/layout/_noscript-notice.phtml', |
|
| 314 | + 'layout/layout' => __DIR__.'/../view/layout/layout.phtml', |
|
| 315 | + 'error/404' => __DIR__.'/../view/error/404.phtml', |
|
| 316 | + 'error/403' => __DIR__.'/../view/error/403.phtml', |
|
| 317 | + 'error/index' => __DIR__.'/../view/error/index.phtml', |
|
| 318 | + 'main-navigation' => __DIR__.'/../view/partial/main-navigation.phtml', |
|
| 319 | + 'pagination-control' => __DIR__.'/../view/partial/pagination-control.phtml', |
|
| 320 | + 'core/loading-popup' => __DIR__.'/../view/partial/loading-popup.phtml', |
|
| 321 | + 'core/notifications' => __DIR__.'/../view/partial/notifications.phtml', |
|
| 322 | + 'form/core/buttons' => __DIR__.'/../view/form/buttons.phtml', |
|
| 323 | + 'core/social-buttons' => __DIR__.'/../view/partial/social-buttons.phtml', |
|
| 324 | + 'form/core/privacy' => __DIR__.'/../view/form/privacy.phtml', |
|
| 325 | + 'core/form/permissions-fieldset' => __DIR__.'/../view/form/permissions-fieldset.phtml', |
|
| 326 | + 'core/form/permissions-collection' => __DIR__.'/../view/form/permissions-collection.phtml', |
|
| 327 | + 'core/form/container-view' => __DIR__.'/../view/form/container.view.phtml', |
|
| 328 | + 'core/form/tree-manage.view' => __DIR__.'/../view/form/tree-manage.view.phtml', |
|
| 329 | + 'core/form/tree-manage.form' => __DIR__.'/../view/form/tree-manage.form.phtml', |
|
| 330 | + 'core/form/tree-add-item' => __DIR__.'/../view/form/tree-add-item.phtml', |
|
| 331 | + 'mail/header' => __DIR__.'/../view/mail/header.phtml', |
|
| 332 | + 'mail/footer' => __DIR__.'/../view/mail/footer.phtml', |
|
| 333 | + 'mail/footer.en' => __DIR__.'/../view/mail/footer.en.phtml', |
|
| 334 | 334 | //'startpage' => __DIR__ . '/../view/layout/startpage.phtml', |
| 335 | 335 | ), |
| 336 | 336 | // Where to look for view templates not mapped above |
| 337 | 337 | 'template_path_stack' => array( |
| 338 | - __DIR__ . '/../view', |
|
| 338 | + __DIR__.'/../view', |
|
| 339 | 339 | ), |
| 340 | 340 | ), |
| 341 | 341 | 'view_helpers' => array( |