@@ -1,11 +1,11 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * YAWIK |
|
| 4 | - * |
|
| 5 | - * @filesource |
|
| 6 | - * @copyright (c) 2013 - 2016 Cross Solution (http://cross-solution.de) |
|
| 7 | - * @license MIT |
|
| 8 | - */ |
|
| 3 | + * YAWIK |
|
| 4 | + * |
|
| 5 | + * @filesource |
|
| 6 | + * @copyright (c) 2013 - 2016 Cross Solution (http://cross-solution.de) |
|
| 7 | + * @license MIT |
|
| 8 | + */ |
|
| 9 | 9 | |
| 10 | 10 | /** CheckRouteListener.php */ |
| 11 | 11 | namespace Acl\Listener; |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | * |
| 59 | 59 | * @param EventManagerInterface $events |
| 60 | 60 | * @param integer $priority |
| 61 | - */ |
|
| 61 | + */ |
|
| 62 | 62 | public function attach(EventManagerInterface $events) |
| 63 | 63 | { |
| 64 | 64 | $this->listeners[] = $events->attach(MvcEvent::EVENT_ROUTE, array($this, 'onRoute'), -10); |
@@ -112,7 +112,7 @@ discard block |
||
| 112 | 112 | $acl = $this->getAcl(); |
| 113 | 113 | |
| 114 | 114 | if ($acl->hasResource($resourceId) && !$acl->isAllowed($role, $resourceId, $privilege)) { |
| 115 | - /* |
|
| 115 | + /* |
|
| 116 | 116 | * Exceptions are only catched within the dispatch listener, so |
| 117 | 117 | * we have to set the exception manually in the event |
| 118 | 118 | * and trigger the DISPATCH_ERROR event. |
@@ -11,7 +11,7 @@ |
||
| 11 | 11 | return [ |
| 12 | 12 | 'navigation' => [ |
| 13 | 13 | 'default' => [ |
| 14 | - 'admin' => [ 'pages' => [ |
|
| 14 | + 'admin' => ['pages' => [ |
|
| 15 | 15 | 'users' => [ |
| 16 | 16 | 'label' => /*@translate*/ 'Users', |
| 17 | 17 | 'route' => 'lang/user-list', |
@@ -20,7 +20,7 @@ |
||
| 20 | 20 | { |
| 21 | 21 | |
| 22 | 22 | protected $sortPropertiesMap = [ |
| 23 | - 'name' => [ 'info.lastName', 'info.firstName', 'info.email' ], |
|
| 23 | + 'name' => ['info.lastName', 'info.firstName', 'info.email'], |
|
| 24 | 24 | ]; |
| 25 | 25 | |
| 26 | 26 | /** |
@@ -37,9 +37,9 @@ |
||
| 37 | 37 | $paginator = $this->paginator('Auth/User', $params); |
| 38 | 38 | $form = $this->getServiceLocator()->get('forms') |
| 39 | 39 | ->get('Core/TextSearch', [ |
| 40 | - 'placeholder' => /*@translate*/ 'Type name, email address, role, or login name', |
|
| 41 | - 'button_element' => 'text' |
|
| 42 | - ]); |
|
| 40 | + 'placeholder' => /*@translate*/ 'Type name, email address, role, or login name', |
|
| 41 | + 'button_element' => 'text' |
|
| 42 | + ]); |
|
| 43 | 43 | |
| 44 | 44 | $return = array( |
| 45 | 45 | 'by' => $params['by'], |
@@ -1,16 +1,16 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * YAWIK |
|
| 4 | - * Configuration file of the Core module |
|
| 5 | - * |
|
| 6 | - * This file intents to provide the configuration for all other modules |
|
| 7 | - * as well (convention over configuration). |
|
| 8 | - * Having said that, you may always overwrite or extend the configuration |
|
| 9 | - * in your own modules configuration file(s) (or via the config autoloading). |
|
| 10 | - * |
|
| 11 | - * @copyright (c) 2013 - 2016 Cross Solution (http://cross-solution.de) |
|
| 12 | - * @license MIT |
|
| 13 | - */ |
|
| 3 | + * YAWIK |
|
| 4 | + * Configuration file of the Core module |
|
| 5 | + * |
|
| 6 | + * This file intents to provide the configuration for all other modules |
|
| 7 | + * as well (convention over configuration). |
|
| 8 | + * Having said that, you may always overwrite or extend the configuration |
|
| 9 | + * in your own modules configuration file(s) (or via the config autoloading). |
|
| 10 | + * |
|
| 11 | + * @copyright (c) 2013 - 2016 Cross Solution (http://cross-solution.de) |
|
| 12 | + * @license MIT |
|
| 13 | + */ |
|
| 14 | 14 | |
| 15 | 15 | $doctrineConfig = include __DIR__ . '/doctrine.config.php'; |
| 16 | 16 | |
@@ -32,24 +32,24 @@ discard block |
||
| 32 | 32 | 'log' => array( |
| 33 | 33 | 'Core/Log' => array( |
| 34 | 34 | 'writers' => array( |
| 35 | - array( |
|
| 36 | - 'name' => 'stream', |
|
| 35 | + array( |
|
| 36 | + 'name' => 'stream', |
|
| 37 | 37 | 'priority' => 1000, |
| 38 | 38 | 'options' => array( |
| 39 | - 'stream' => __DIR__ .'/../../../log/yawik.log', |
|
| 39 | + 'stream' => __DIR__ .'/../../../log/yawik.log', |
|
| 40 | + ), |
|
| 40 | 41 | ), |
| 41 | - ), |
|
| 42 | 42 | ), |
| 43 | 43 | ), |
| 44 | 44 | 'Log/Core/Mail' => array( |
| 45 | 45 | 'writers' => array( |
| 46 | - array( |
|
| 47 | - 'name' => 'stream', |
|
| 46 | + array( |
|
| 47 | + 'name' => 'stream', |
|
| 48 | 48 | 'priority' => 1000, |
| 49 | 49 | 'options' => array( |
| 50 | - 'stream' => __DIR__ .'/../../../log/mails.log', |
|
| 50 | + 'stream' => __DIR__ .'/../../../log/mails.log', |
|
| 51 | + ), |
|
| 51 | 52 | ), |
| 52 | - ), |
|
| 53 | 53 | ), |
| 54 | 54 | ), |
| 55 | 55 | 'ErrorLogger' => array( |
@@ -234,17 +234,17 @@ discard block |
||
| 234 | 234 | // Defines the Core/Navigation. |
| 235 | 235 | 'navigation' => array( |
| 236 | 236 | 'default' => array( |
| 237 | - 'home' => array( |
|
| 238 | - 'label' => /*@translate*/ 'Home', |
|
| 239 | - 'route' => 'lang', |
|
| 240 | - 'visible' => false |
|
| 241 | - ), |
|
| 242 | - 'admin' => array( |
|
| 243 | - 'label ' => /*@translate*/ 'Admin', |
|
| 244 | - 'route' => 'lang/admin', |
|
| 245 | - 'resource' => 'route/lang/admin', |
|
| 246 | - 'order' => 200, |
|
| 247 | - ), |
|
| 237 | + 'home' => array( |
|
| 238 | + 'label' => /*@translate*/ 'Home', |
|
| 239 | + 'route' => 'lang', |
|
| 240 | + 'visible' => false |
|
| 241 | + ), |
|
| 242 | + 'admin' => array( |
|
| 243 | + 'label ' => /*@translate*/ 'Admin', |
|
| 244 | + 'route' => 'lang/admin', |
|
| 245 | + 'resource' => 'route/lang/admin', |
|
| 246 | + 'order' => 200, |
|
| 247 | + ), |
|
| 248 | 248 | ), |
| 249 | 249 | ), |
| 250 | 250 | // Configuration of the controller service manager (Which loads controllers) |
@@ -34,7 +34,7 @@ |
||
| 34 | 34 | $this->models = new PriorityList(); |
| 35 | 35 | } |
| 36 | 36 | |
| 37 | - public function addViewModel($name, $model, $priority=0) |
|
| 37 | + public function addViewModel($name, $model, $priority = 0) |
|
| 38 | 38 | { |
| 39 | 39 | $this->models->insert($name, $model, $priority); |
| 40 | 40 | |
@@ -107,10 +107,10 @@ |
||
| 107 | 107 | } |
| 108 | 108 | |
| 109 | 109 | if ($lazy) { |
| 110 | - $aggregate = $aggregate ?: $serviceLocator->get('Core/Listener/DeferredListenerAggregate'); |
|
| 111 | - $aggregate->setHook($event, $name, $method, $priority); |
|
| 110 | + $aggregate = $aggregate ?: $serviceLocator->get('Core/Listener/DeferredListenerAggregate'); |
|
| 111 | + $aggregate->setHook($event, $name, $method, $priority); |
|
| 112 | 112 | |
| 113 | - continue; |
|
| 113 | + continue; |
|
| 114 | 114 | } |
| 115 | 115 | |
| 116 | 116 | if ($serviceLocator->has($name)) { |
@@ -130,7 +130,7 @@ discard block |
||
| 130 | 130 | continue; |
| 131 | 131 | } |
| 132 | 132 | |
| 133 | - $callback = $method ? [ $listener, $method ] : $listener; |
|
| 133 | + $callback = $method ? [$listener, $method] : $listener; |
|
| 134 | 134 | $events->attach($event, $callback, $priority); |
| 135 | 135 | |
| 136 | 136 | } |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | { |
| 147 | 147 | $defaults = [ |
| 148 | 148 | 'service' => 'EventManager', |
| 149 | - 'identifiers' => [ $name ], |
|
| 149 | + 'identifiers' => [$name], |
|
| 150 | 150 | 'event' => '\Zend\EventManager\Event', |
| 151 | 151 | 'listeners' => [], |
| 152 | 152 | ]; |
@@ -1,11 +1,11 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * YAWIK |
|
| 4 | - * |
|
| 5 | - * @filesource |
|
| 6 | - * @license MIT |
|
| 7 | - * @copyright 2013 - 2016 Cross Solution <http://cross-solution.de> |
|
| 8 | - */ |
|
| 3 | + * YAWIK |
|
| 4 | + * |
|
| 5 | + * @filesource |
|
| 6 | + * @license MIT |
|
| 7 | + * @copyright 2013 - 2016 Cross Solution <http://cross-solution.de> |
|
| 8 | + */ |
|
| 9 | 9 | |
| 10 | 10 | /** */ |
| 11 | 11 | namespace Core\Form; |
@@ -66,23 +66,23 @@ discard block |
||
| 66 | 66 | { |
| 67 | 67 | $this->setName('search'); |
| 68 | 68 | $this->setAttributes([ |
| 69 | - 'data-handle-by' => 'native', |
|
| 70 | - 'method' => 'get', |
|
| 71 | - 'class' => 'form-inline search-form', |
|
| 72 | - ]); |
|
| 69 | + 'data-handle-by' => 'native', |
|
| 70 | + 'method' => 'get', |
|
| 71 | + 'class' => 'form-inline search-form', |
|
| 72 | + ]); |
|
| 73 | 73 | |
| 74 | 74 | $this->add([ |
| 75 | - 'type' => 'Text', |
|
| 76 | - 'name' => 'text', |
|
| 77 | - 'options' => [ |
|
| 78 | - 'label' => /*@translate*/ 'Search', |
|
| 79 | - 'use_formrow_helper' => false, |
|
| 80 | - ], |
|
| 81 | - 'attributes' => [ |
|
| 82 | - 'class' => 'form-control', |
|
| 83 | - 'placeholder' => $this->getOption('placeholder'), |
|
| 84 | - ] |
|
| 85 | - ]); |
|
| 75 | + 'type' => 'Text', |
|
| 76 | + 'name' => 'text', |
|
| 77 | + 'options' => [ |
|
| 78 | + 'label' => /*@translate*/ 'Search', |
|
| 79 | + 'use_formrow_helper' => false, |
|
| 80 | + ], |
|
| 81 | + 'attributes' => [ |
|
| 82 | + 'class' => 'form-control', |
|
| 83 | + 'placeholder' => $this->getOption('placeholder'), |
|
| 84 | + ] |
|
| 85 | + ]); |
|
| 86 | 86 | |
| 87 | 87 | |
| 88 | 88 | } |
@@ -1,11 +1,11 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * YAWIK |
|
| 4 | - * |
|
| 5 | - * @filesource |
|
| 6 | - * @license MIT |
|
| 7 | - * @copyright 2013 - 2016 Cross Solution <http://cross-solution.de> |
|
| 8 | - */ |
|
| 3 | + * YAWIK |
|
| 4 | + * |
|
| 5 | + * @filesource |
|
| 6 | + * @license MIT |
|
| 7 | + * @copyright 2013 - 2016 Cross Solution <http://cross-solution.de> |
|
| 8 | + */ |
|
| 9 | 9 | |
| 10 | 10 | /** */ |
| 11 | 11 | namespace Core\Form\View\Helper; |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | |
| 51 | 51 | $formContent = '<div class="row" style="padding: 0 15px;">'; $buttonsRendered = false; |
| 52 | 52 | $buttonsContent = '<input type="submit" class="btn btn-primary" name="submit" value="' . $this->getView()->translate('Search') . '">' |
| 53 | - . '<input type="reset" class="btn btn-default" name="clear" value="' . $this->getView()->translate('Clear') . '">'; |
|
| 53 | + . '<input type="reset" class="btn btn-default" name="clear" value="' . $this->getView()->translate('Clear') . '">'; |
|
| 54 | 54 | |
| 55 | 55 | |
| 56 | 56 | if (empty($colMap)) { |
@@ -84,9 +84,9 @@ discard block |
||
| 84 | 84 | |
| 85 | 85 | if ($element->getName() == $form->getOption('button_element')) { |
| 86 | 86 | $formContent.='<div class="input-group col-md-' . $col . '">' |
| 87 | - . $this->getView()->formElement($element) |
|
| 88 | - . '<div class="input-group-btn search-form-buttons" style="width: 0px;">' . $buttonsContent . '</div>' |
|
| 89 | - . '</div>'; |
|
| 87 | + . $this->getView()->formElement($element) |
|
| 88 | + . '<div class="input-group-btn search-form-buttons" style="width: 0px;">' . $buttonsContent . '</div>' |
|
| 89 | + . '</div>'; |
|
| 90 | 90 | $buttonsRendered = true; |
| 91 | 91 | } else { |
| 92 | 92 | $formContent .= '<div class="input-group col-md-' . $col . '">' . $this->getView()->formElement($element) . '</div>'; |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | $c = count($form); |
| 99 | 99 | $col = isset($colMap[$c]) ? $colMap[$c]: 12; |
| 100 | 100 | $formContent .= '<div class="input-group search-form-buttons col-md-' . $col . ' text-right">' |
| 101 | - . '<div class="btn-group">' . $buttonsContent .'</div></div>'; |
|
| 101 | + . '<div class="btn-group">' . $buttonsContent .'</div></div>'; |
|
| 102 | 102 | } |
| 103 | 103 | |
| 104 | 104 | return $this->openTag($form) . $formContent . $this->closeTag(); |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | * @param array $colMap |
| 31 | 31 | * @return Form|string |
| 32 | 32 | */ |
| 33 | - public function __invoke(FormInterface $form = null, $colMap=[]) |
|
| 33 | + public function __invoke(FormInterface $form = null, $colMap = []) |
|
| 34 | 34 | { |
| 35 | 35 | if (!$form) { |
| 36 | 36 | return $this; |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | return $this->render($form, $colMap); |
| 40 | 40 | } |
| 41 | 41 | |
| 42 | - public function render(FormInterface $form, $colMap=[]) |
|
| 42 | + public function render(FormInterface $form, $colMap = []) |
|
| 43 | 43 | { |
| 44 | 44 | if (method_exists($form, 'prepare')) { |
| 45 | 45 | $form->prepare(); |
@@ -58,14 +58,14 @@ discard block |
||
| 58 | 58 | $r = floor($c / 3); |
| 59 | 59 | |
| 60 | 60 | if (0 != $r) { |
| 61 | - for ($i=0; $i<$r; $i+=1) { |
|
| 61 | + for ($i = 0; $i < $r; $i += 1) { |
|
| 62 | 62 | $colMap[] = 4; |
| 63 | 63 | $colMap[] = 4; |
| 64 | 64 | $colMap[] = 4; |
| 65 | 65 | } |
| 66 | 66 | } |
| 67 | 67 | if ($l = $c % 3) { |
| 68 | - for ($i=0; $i<$l; $i+=1) { |
|
| 68 | + for ($i = 0; $i < $l; $i += 1) { |
|
| 69 | 69 | $colMap[] = 12 / $l; |
| 70 | 70 | } |
| 71 | 71 | } |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | $i += 1; |
| 84 | 84 | |
| 85 | 85 | if ($element->getName() == $form->getOption('button_element')) { |
| 86 | - $formContent.='<div class="input-group col-md-' . $col . '">' |
|
| 86 | + $formContent .= '<div class="input-group col-md-' . $col . '">' |
|
| 87 | 87 | . $this->getView()->formElement($element) |
| 88 | 88 | . '<div class="input-group-btn search-form-buttons" style="width: 0px;">' . $buttonsContent . '</div>' |
| 89 | 89 | . '</div>'; |
@@ -96,9 +96,9 @@ discard block |
||
| 96 | 96 | |
| 97 | 97 | if (!$buttonsRendered) { |
| 98 | 98 | $c = count($form); |
| 99 | - $col = isset($colMap[$c]) ? $colMap[$c]: 12; |
|
| 99 | + $col = isset($colMap[$c]) ? $colMap[$c] : 12; |
|
| 100 | 100 | $formContent .= '<div class="input-group search-form-buttons col-md-' . $col . ' text-right">' |
| 101 | - . '<div class="btn-group">' . $buttonsContent .'</div></div>'; |
|
| 101 | + . '<div class="btn-group">' . $buttonsContent . '</div></div>'; |
|
| 102 | 102 | } |
| 103 | 103 | |
| 104 | 104 | return $this->openTag($form) . $formContent . $this->closeTag(); |