@@ -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( |
@@ -207,11 +207,11 @@ discard block |
||
| 207 | 207 | // Defines the Core/Navigation. |
| 208 | 208 | 'navigation' => array( |
| 209 | 209 | 'default' => array( |
| 210 | - 'home' => array( |
|
| 211 | - 'label' => /*@translate*/ 'Home', |
|
| 212 | - 'route' => 'lang', |
|
| 213 | - 'visible' => false |
|
| 214 | - ), |
|
| 210 | + 'home' => array( |
|
| 211 | + 'label' => /*@translate*/ 'Home', |
|
| 212 | + 'route' => 'lang', |
|
| 213 | + 'visible' => false |
|
| 214 | + ), |
|
| 215 | 215 | ), |
| 216 | 216 | ), |
| 217 | 217 | // Configuration of the controller service manager (Which loads controllers) |
@@ -22,6 +22,9 @@ |
||
| 22 | 22 | */ |
| 23 | 23 | trait EntityTrait |
| 24 | 24 | { |
| 25 | + /** |
|
| 26 | + * @param string $property |
|
| 27 | + */ |
|
| 25 | 28 | public function notEmpty($property, array $args=[]) |
| 26 | 29 | { |
| 27 | 30 | $method = "get$property"; |
@@ -22,7 +22,7 @@ discard block |
||
| 22 | 22 | */ |
| 23 | 23 | trait EntityTrait |
| 24 | 24 | { |
| 25 | - public function notEmpty($property, array $args=[]) |
|
| 25 | + public function notEmpty($property, array $args = []) |
|
| 26 | 26 | { |
| 27 | 27 | $method = "get$property"; |
| 28 | 28 | |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | } |
| 32 | 32 | |
| 33 | 33 | $value = count($args) |
| 34 | - ? call_user_func_array([ $this, $method ], $args) |
|
| 34 | + ? call_user_func_array([$this, $method], $args) |
|
| 35 | 35 | : $this->$method(); |
| 36 | 36 | |
| 37 | 37 | if (null === $value) { // is_scalar does not consider 'null' to be scalar value. |
@@ -146,6 +146,9 @@ |
||
| 146 | 146 | return $events; |
| 147 | 147 | } |
| 148 | 148 | |
| 149 | + /** |
|
| 150 | + * @param ServiceLocatorInterface $services |
|
| 151 | + */ |
|
| 149 | 152 | protected function getConfig($services, $name) |
| 150 | 153 | { |
| 151 | 154 | $defaults = [ |
@@ -98,17 +98,17 @@ discard block |
||
| 98 | 98 | $options = []; |
| 99 | 99 | |
| 100 | 100 | } else if (is_int($options)) { |
| 101 | - $options = [ 'priority' => $options ]; |
|
| 101 | + $options = ['priority' => $options]; |
|
| 102 | 102 | |
| 103 | 103 | } else if (is_string($options)) { |
| 104 | - $options = [ 'method' => $options ]; |
|
| 104 | + $options = ['method' => $options]; |
|
| 105 | 105 | |
| 106 | 106 | } else if (!is_array($options)) { |
| 107 | - $options = [ 'lazy' => (bool) $options ]; |
|
| 107 | + $options = ['lazy' => (bool) $options]; |
|
| 108 | 108 | |
| 109 | 109 | } |
| 110 | 110 | |
| 111 | - $options = array_merge([ 'method' => null, 'priority' => 0, 'lazy' => false ], $options); |
|
| 111 | + $options = array_merge(['method' => null, 'priority' => 0, 'lazy' => false], $options); |
|
| 112 | 112 | |
| 113 | 113 | if ($options['lazy'] && !$isAggregate) { |
| 114 | 114 | $aggregate = $aggregate ?: $serviceLocator->get('Core/Listener/DeferredListenerAggregate'); |
@@ -132,7 +132,7 @@ discard block |
||
| 132 | 132 | if ($isAggregate) { |
| 133 | 133 | $listener->attach($events); |
| 134 | 134 | } else { |
| 135 | - $callback = $options['method'] ? [ $listener, $options['method'] ] : $listener; |
|
| 135 | + $callback = $options['method'] ? [$listener, $options['method']] : $listener; |
|
| 136 | 136 | $events->attach($event, $callback, $options['priority']); |
| 137 | 137 | } |
| 138 | 138 | |
@@ -150,7 +150,7 @@ discard block |
||
| 150 | 150 | { |
| 151 | 151 | $defaults = [ |
| 152 | 152 | 'service' => 'EventManager', |
| 153 | - 'identifiers' => [ $name ], |
|
| 153 | + 'identifiers' => [$name], |
|
| 154 | 154 | 'event' => '\Zend\EventManager\Event', |
| 155 | 155 | 'listeners' => [], |
| 156 | 156 | ]; |
@@ -54,8 +54,7 @@ |
||
| 54 | 54 | if (method_exists($events, 'setEventPrototype')) { |
| 55 | 55 | $event = $serviceLocator->has($config['event']) ? $serviceLocator->get($config['event']) : new $config['event'](); |
| 56 | 56 | $events->setEventPrototype($event); |
| 57 | - } |
|
| 58 | - else { |
|
| 57 | + } else { |
|
| 59 | 58 | $events->setEventClass($config['event']); |
| 60 | 59 | } |
| 61 | 60 | |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | /** |
| 99 | 99 | * Gets an iterator to iterate over the enabled formulars. |
| 100 | 100 | * |
| 101 | - * @return \ArrayIterator |
|
| 101 | + * @return PriorityList |
|
| 102 | 102 | * @see IteratorAggregate::getIterator() |
| 103 | 103 | */ |
| 104 | 104 | public function getIterator() |
@@ -633,7 +633,7 @@ discard block |
||
| 633 | 633 | } |
| 634 | 634 | |
| 635 | 635 | /** |
| 636 | - * @param $data |
|
| 636 | + * @param \Zend\Stdlib\ParametersInterface $data |
|
| 637 | 637 | * @return $this |
| 638 | 638 | */ |
| 639 | 639 | public function setData($data) |
@@ -499,7 +499,7 @@ discard block |
||
| 499 | 499 | } |
| 500 | 500 | $this->activeForms = array_filter( |
| 501 | 501 | $this->activeForms, |
| 502 | - function ($item) use ($key) { |
|
| 502 | + function($item) use ($key) { |
|
| 503 | 503 | return !in_array($item, $key); |
| 504 | 504 | } |
| 505 | 505 | ); |
@@ -513,7 +513,7 @@ discard block |
||
| 513 | 513 | * @param EntityInterface $entity |
| 514 | 514 | * @return self |
| 515 | 515 | */ |
| 516 | - public function setEntity(EntityInterface $entity, $key='*') |
|
| 516 | + public function setEntity(EntityInterface $entity, $key = '*') |
|
| 517 | 517 | { |
| 518 | 518 | $this->entities[$key] = $entity; |
| 519 | 519 | |
@@ -531,7 +531,7 @@ discard block |
||
| 531 | 531 | * |
| 532 | 532 | * @return \Core\Entity\EntityInterface |
| 533 | 533 | */ |
| 534 | - public function getEntity($key='*') |
|
| 534 | + public function getEntity($key = '*') |
|
| 535 | 535 | { |
| 536 | 536 | return isset($this->entities[$key]) ? $this->entities[$key] : null; |
| 537 | 537 | } |
@@ -734,10 +734,10 @@ discard block |
||
| 734 | 734 | $actualKey = $this->getActiveFormActual(); |
| 735 | 735 | if (isset($actualKey)) { |
| 736 | 736 | $forms = array_keys($this->forms); |
| 737 | - $formsFlip = array_flip($forms); |
|
| 737 | + $formsFlip = array_flip($forms); |
|
| 738 | 738 | $index = $formsFlip[$actualKey]; |
| 739 | 739 | if (0 < $index) { |
| 740 | - $key = $forms[$index-1]; |
|
| 740 | + $key = $forms[$index - 1]; |
|
| 741 | 741 | } |
| 742 | 742 | } |
| 743 | 743 | return $key; |
@@ -754,10 +754,10 @@ discard block |
||
| 754 | 754 | $actualKey = $this->getActiveFormActual(); |
| 755 | 755 | if (isset($actualKey)) { |
| 756 | 756 | $forms = array_keys($this->forms); |
| 757 | - $formsFlip = array_flip($forms); |
|
| 757 | + $formsFlip = array_flip($forms); |
|
| 758 | 758 | $index = $formsFlip[$actualKey]; |
| 759 | 759 | if ($index < count($forms) - 1) { |
| 760 | - $key = $forms[$index+1]; |
|
| 760 | + $key = $forms[$index + 1]; |
|
| 761 | 761 | } |
| 762 | 762 | } |
| 763 | 763 | return $key; |
@@ -779,7 +779,7 @@ discard block |
||
| 779 | 779 | $options['use_files_array'] = false; |
| 780 | 780 | } |
| 781 | 781 | |
| 782 | - $formName = (($name = $this->getName()) ? $name . '.' : '') . $form['name']; |
|
| 782 | + $formName = (($name = $this->getName()) ? $name . '.' : '') . $form['name']; |
|
| 783 | 783 | $action = '?form=' . $formName; |
| 784 | 784 | |
| 785 | 785 | return $action; |
@@ -73,6 +73,9 @@ |
||
| 73 | 73 | |
| 74 | 74 | } |
| 75 | 75 | |
| 76 | + /** |
|
| 77 | + * @param string $layout |
|
| 78 | + */ |
|
| 76 | 79 | public function renderElement($element, $layout, $parameter) |
| 77 | 80 | { |
| 78 | 81 | $parameterPartial = $parameter; |
@@ -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 | /** Core forms view helpers */ |
| 11 | 11 | namespace Core\Form\View\Helper; |
@@ -83,8 +83,8 @@ discard block |
||
| 83 | 83 | if ($element instanceof ViewPartialProviderInterface) { |
| 84 | 84 | $parameterPartial = array_merge(array('element' => $element, 'layout' => $layout), $parameterPartial); |
| 85 | 85 | $content .= $this->getView()->partial( |
| 86 | - $element->getViewPartial(), |
|
| 87 | - $parameterPartial |
|
| 86 | + $element->getViewPartial(), |
|
| 87 | + $parameterPartial |
|
| 88 | 88 | ); |
| 89 | 89 | |
| 90 | 90 | } elseif ($element instanceof ViewHelperProviderInterface) { |
@@ -96,9 +96,9 @@ |
||
| 96 | 96 | } elseif ($element instanceof SummaryForm) { |
| 97 | 97 | $content .= $this->getView()->summaryForm($element); |
| 98 | 98 | } elseif ($element instanceof Container) { |
| 99 | - $content.= $this->render($element, $layout, $parameter); |
|
| 99 | + $content .= $this->render($element, $layout, $parameter); |
|
| 100 | 100 | } else { |
| 101 | - $content.= $this->getView()->form($element, $layout, $parameter); |
|
| 101 | + $content .= $this->getView()->form($element, $layout, $parameter); |
|
| 102 | 102 | } |
| 103 | 103 | |
| 104 | 104 | return $content; |
@@ -52,6 +52,9 @@ |
||
| 52 | 52 | return $this->scripts; |
| 53 | 53 | } |
| 54 | 54 | |
| 55 | + /** |
|
| 56 | + * @param string $key |
|
| 57 | + */ |
|
| 55 | 58 | public function setForm($key, $spec, $enabled = true) |
| 56 | 59 | { |
| 57 | 60 | if (is_object($spec)) { |
@@ -49,7 +49,7 @@ |
||
| 49 | 49 | * Detach all our listeners from the event manager |
| 50 | 50 | * |
| 51 | 51 | * @param SharedEventManagerInterface $events |
| 52 | - * @return void |
|
| 52 | + * @return boolean |
|
| 53 | 53 | */ |
| 54 | 54 | public function detachShared(SharedEventManagerInterface $events) |
| 55 | 55 | { |
@@ -141,7 +141,7 @@ |
||
| 141 | 141 | } |
| 142 | 142 | |
| 143 | 143 | if ($method && method_exists($listener, $method)) { |
| 144 | - return call_user_func_array([ $listener, $method ], $args); |
|
| 144 | + return call_user_func_array([$listener, $method], $args); |
|
| 145 | 145 | } |
| 146 | 146 | |
| 147 | 147 | if (is_callable($listener)) { |
@@ -27,7 +27,7 @@ |
||
| 27 | 27 | * |
| 28 | 28 | * @param ServiceLocatorInterface $serviceLocator |
| 29 | 29 | * |
| 30 | - * @return mixed |
|
| 30 | + * @return Job |
|
| 31 | 31 | */ |
| 32 | 32 | public function createService(ServiceLocatorInterface $serviceLocator) |
| 33 | 33 | { |
@@ -79,7 +79,6 @@ |
||
| 79 | 79 | /** |
| 80 | 80 | * Sets the invoice address. |
| 81 | 81 | * |
| 82 | - * @param InvoiceAddressInterface $invoice |
|
| 83 | 82 | * |
| 84 | 83 | * @return self |
| 85 | 84 | */ |