@@ -79,87 +79,87 @@ discard block |
||
| 79 | 79 | */ |
| 80 | 80 | protected $options; |
| 81 | 81 | |
| 82 | - public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) { |
|
| 83 | - /* @var $formElementManager \Zend\Form\FormElementManager\FormElementManagerV3Polyfill */ |
|
| 84 | - $formElementManager = $container->get('FormElementManager'); |
|
| 85 | - $options=null; |
|
| 86 | - if ($this->options) { |
|
| 87 | - $options = $container->get($this->options); |
|
| 88 | - } |
|
| 82 | + public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) { |
|
| 83 | + /* @var $formElementManager \Zend\Form\FormElementManager\FormElementManagerV3Polyfill */ |
|
| 84 | + $formElementManager = $container->get('FormElementManager'); |
|
| 85 | + $options=null; |
|
| 86 | + if ($this->options) { |
|
| 87 | + $options = $container->get($this->options); |
|
| 88 | + } |
|
| 89 | 89 | |
| 90 | - // Retrieve configuration. |
|
| 91 | - if ($this->configKey) { |
|
| 92 | - $config = $container->get('config'); |
|
| 93 | - $config = isset($config['form_elements_config']['file_upload_factories'][$this->configKey]) |
|
| 94 | - ? $config['form_elements_config']['file_upload_factories'][$this->configKey] |
|
| 95 | - : array(); |
|
| 96 | - $this->config = $config; |
|
| 97 | - } |
|
| 90 | + // Retrieve configuration. |
|
| 91 | + if ($this->configKey) { |
|
| 92 | + $config = $container->get('config'); |
|
| 93 | + $config = isset($config['form_elements_config']['file_upload_factories'][$this->configKey]) |
|
| 94 | + ? $config['form_elements_config']['file_upload_factories'][$this->configKey] |
|
| 95 | + : array(); |
|
| 96 | + $this->config = $config; |
|
| 97 | + } |
|
| 98 | 98 | |
| 99 | 99 | |
| 100 | - $form = new Form(); |
|
| 101 | - $formElementManager->injectFactory($formElementManager,$form); |
|
| 102 | - $form->add( |
|
| 103 | - array( |
|
| 104 | - 'type' => $this->fileElement, |
|
| 105 | - 'name' => $this->fileName, |
|
| 106 | - 'options' => array( |
|
| 107 | - /* @TODO: [ZF3] set this value to false will make upload field invisible in organization and user profile profile */ |
|
| 108 | - 'use_formrow_helper' => true, |
|
| 109 | - ), |
|
| 110 | - 'attributes' => array( |
|
| 111 | - 'class' => 'hide', |
|
| 112 | - ), |
|
| 113 | - ) |
|
| 114 | - ); |
|
| 115 | - /* @var $element \Core\Form\Element\FileUpload */ |
|
| 116 | - $element = $form->get($this->fileName); |
|
| 117 | - $element->setIsMultiple($this->multiple); |
|
| 100 | + $form = new Form(); |
|
| 101 | + $formElementManager->injectFactory($formElementManager,$form); |
|
| 102 | + $form->add( |
|
| 103 | + array( |
|
| 104 | + 'type' => $this->fileElement, |
|
| 105 | + 'name' => $this->fileName, |
|
| 106 | + 'options' => array( |
|
| 107 | + /* @TODO: [ZF3] set this value to false will make upload field invisible in organization and user profile profile */ |
|
| 108 | + 'use_formrow_helper' => true, |
|
| 109 | + ), |
|
| 110 | + 'attributes' => array( |
|
| 111 | + 'class' => 'hide', |
|
| 112 | + ), |
|
| 113 | + ) |
|
| 114 | + ); |
|
| 115 | + /* @var $element \Core\Form\Element\FileUpload */ |
|
| 116 | + $element = $form->get($this->fileName); |
|
| 117 | + $element->setIsMultiple($this->multiple); |
|
| 118 | 118 | |
| 119 | - $user = $container->get('AuthenticationService')->getUser(); |
|
| 119 | + $user = $container->get('AuthenticationService')->getUser(); |
|
| 120 | 120 | |
| 121 | - if (isset($this->config['hydrator']) && $this->config['hydrator']) { |
|
| 122 | - /** @noinspection PhpUndefinedVariableInspection */ |
|
| 123 | - $hydrator = $container->get('HydratorManager')->get($this->config['hydrator']); |
|
| 124 | - } else { |
|
| 125 | - /* @var $fileEntity \Core\Entity\FileInterface */ |
|
| 126 | - $fileEntity = new $this->fileEntityClass(); |
|
| 127 | - if ($user instanceof AnonymousUser) { |
|
| 128 | - $fileEntity->getPermissions()->grant($user, 'all'); |
|
| 129 | - } else { |
|
| 130 | - $fileEntity->setUser($user); |
|
| 131 | - } |
|
| 121 | + if (isset($this->config['hydrator']) && $this->config['hydrator']) { |
|
| 122 | + /** @noinspection PhpUndefinedVariableInspection */ |
|
| 123 | + $hydrator = $container->get('HydratorManager')->get($this->config['hydrator']); |
|
| 124 | + } else { |
|
| 125 | + /* @var $fileEntity \Core\Entity\FileInterface */ |
|
| 126 | + $fileEntity = new $this->fileEntityClass(); |
|
| 127 | + if ($user instanceof AnonymousUser) { |
|
| 128 | + $fileEntity->getPermissions()->grant($user, 'all'); |
|
| 129 | + } else { |
|
| 130 | + $fileEntity->setUser($user); |
|
| 131 | + } |
|
| 132 | 132 | |
| 133 | - $strategy = new FileUploadStrategy($fileEntity); |
|
| 134 | - if ($this->multiple) { |
|
| 135 | - $hydrator = new FileCollectionUploadHydrator($this->fileName, $strategy); |
|
| 136 | - $form->add( |
|
| 137 | - array( |
|
| 138 | - 'type' => 'button', |
|
| 139 | - 'name' => 'remove', |
|
| 140 | - 'options' => array( |
|
| 141 | - 'label' => /*@translate*/ 'Remove all', |
|
| 142 | - ), |
|
| 143 | - 'attributes' => array( |
|
| 144 | - 'class' => 'fu-remove-all btn btn-danger btn-xs pull-right' |
|
| 145 | - ), |
|
| 146 | - ) |
|
| 147 | - ); |
|
| 148 | - } else { |
|
| 149 | - $hydrator = new EntityHydrator(); |
|
| 150 | - $hydrator->addStrategy($this->fileName, $strategy); |
|
| 151 | - } |
|
| 152 | - } |
|
| 133 | + $strategy = new FileUploadStrategy($fileEntity); |
|
| 134 | + if ($this->multiple) { |
|
| 135 | + $hydrator = new FileCollectionUploadHydrator($this->fileName, $strategy); |
|
| 136 | + $form->add( |
|
| 137 | + array( |
|
| 138 | + 'type' => 'button', |
|
| 139 | + 'name' => 'remove', |
|
| 140 | + 'options' => array( |
|
| 141 | + 'label' => /*@translate*/ 'Remove all', |
|
| 142 | + ), |
|
| 143 | + 'attributes' => array( |
|
| 144 | + 'class' => 'fu-remove-all btn btn-danger btn-xs pull-right' |
|
| 145 | + ), |
|
| 146 | + ) |
|
| 147 | + ); |
|
| 148 | + } else { |
|
| 149 | + $hydrator = new EntityHydrator(); |
|
| 150 | + $hydrator->addStrategy($this->fileName, $strategy); |
|
| 151 | + } |
|
| 152 | + } |
|
| 153 | 153 | |
| 154 | - $form->setHydrator($hydrator); |
|
| 155 | - $form->setOptions(array('use_files_array' => true)); |
|
| 154 | + $form->setHydrator($hydrator); |
|
| 155 | + $form->setOptions(array('use_files_array' => true)); |
|
| 156 | 156 | |
| 157 | - $this->configureForm($form, $options); |
|
| 158 | - return $form; |
|
| 159 | - } |
|
| 157 | + $this->configureForm($form, $options); |
|
| 158 | + return $form; |
|
| 159 | + } |
|
| 160 | 160 | |
| 161 | 161 | |
| 162 | - /** |
|
| 162 | + /** |
|
| 163 | 163 | * The configuration from the FileUploadFactory configuration |
| 164 | 164 | * |
| 165 | 165 | * @param ServiceLocatorInterface $serviceLocator |
@@ -167,7 +167,7 @@ discard block |
||
| 167 | 167 | */ |
| 168 | 168 | public function createService(ServiceLocatorInterface $serviceLocator) |
| 169 | 169 | { |
| 170 | - return $this($serviceLocator,static::class); |
|
| 170 | + return $this($serviceLocator,static::class); |
|
| 171 | 171 | } |
| 172 | 172 | |
| 173 | 173 | /** |
@@ -79,10 +79,10 @@ discard block |
||
| 79 | 79 | */ |
| 80 | 80 | protected $options; |
| 81 | 81 | |
| 82 | - public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) { |
|
| 82 | + public function __invoke(ContainerInterface $container, $requestedName, array $options = null) { |
|
| 83 | 83 | /* @var $formElementManager \Zend\Form\FormElementManager\FormElementManagerV3Polyfill */ |
| 84 | 84 | $formElementManager = $container->get('FormElementManager'); |
| 85 | - $options=null; |
|
| 85 | + $options = null; |
|
| 86 | 86 | if ($this->options) { |
| 87 | 87 | $options = $container->get($this->options); |
| 88 | 88 | } |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | |
| 99 | 99 | |
| 100 | 100 | $form = new Form(); |
| 101 | - $formElementManager->injectFactory($formElementManager,$form); |
|
| 101 | + $formElementManager->injectFactory($formElementManager, $form); |
|
| 102 | 102 | $form->add( |
| 103 | 103 | array( |
| 104 | 104 | 'type' => $this->fileElement, |
@@ -167,7 +167,7 @@ discard block |
||
| 167 | 167 | */ |
| 168 | 168 | public function createService(ServiceLocatorInterface $serviceLocator) |
| 169 | 169 | { |
| 170 | - return $this($serviceLocator,static::class); |
|
| 170 | + return $this($serviceLocator, static::class); |
|
| 171 | 171 | } |
| 172 | 172 | |
| 173 | 173 | /** |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | $renderer->headscript()->appendFile($renderer->basePath('Core/js/jquery.summary-form.js')); |
| 68 | 68 | |
| 69 | 69 | $label = $form->getLabel(); |
| 70 | - $labelContent = $label ? '<div class="sf-headline"><h3>' . $this->getView()->translate($label) . '</h3></div>' : ''; |
|
| 70 | + $labelContent = $label ? '<div class="sf-headline"><h3>'.$this->getView()->translate($label).'</h3></div>' : ''; |
|
| 71 | 71 | $formContent = $this->renderForm($form, $layout, $parameter); |
| 72 | 72 | $summaryContent = $this->renderSummary($form); |
| 73 | 73 | |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | . '%s' |
| 109 | 109 | . '</div>'; |
| 110 | 110 | |
| 111 | - $id = str_replace('.','-',$form->getAttribute('name')); |
|
| 111 | + $id = str_replace('.', '-', $form->getAttribute('name')); |
|
| 112 | 112 | $content = sprintf( |
| 113 | 113 | $markup, |
| 114 | 114 | $id, |
@@ -132,8 +132,8 @@ discard block |
||
| 132 | 132 | public function renderForm(SummaryFormInterface $form, $layout = Form::LAYOUT_HORIZONTAL, $parameter = array()) |
| 133 | 133 | { |
| 134 | 134 | /* @var $form SummaryFormInterface|\Core\Form\SummaryForm */ |
| 135 | - $renderer = $this->getView(); /* @var $renderer \Zend\View\Renderer\PhpRenderer */ |
|
| 136 | - $formHelper = $renderer->plugin('form'); /* @var $formHelper \Core\Form\View\Helper\Form */ |
|
| 135 | + $renderer = $this->getView(); /* @var $renderer \Zend\View\Renderer\PhpRenderer */ |
|
| 136 | + $formHelper = $renderer->plugin('form'); /* @var $formHelper \Core\Form\View\Helper\Form */ |
|
| 137 | 137 | $fieldset = $form->getBaseFieldset(); |
| 138 | 138 | $resetPartial = false; |
| 139 | 139 | |
@@ -167,7 +167,7 @@ discard block |
||
| 167 | 167 | $form->prepare(); |
| 168 | 168 | $baseFieldset = $form->getBaseFieldset(); |
| 169 | 169 | if (!isset($baseFieldset)) { |
| 170 | - throw new \InvalidArgumentException('For the Form ' . get_class($form) . ' there is no Basefieldset'); |
|
| 170 | + throw new \InvalidArgumentException('For the Form '.get_class($form).' there is no Basefieldset'); |
|
| 171 | 171 | } |
| 172 | 172 | |
| 173 | 173 | $dataAttributesMarkup = ''; |
@@ -180,7 +180,7 @@ discard block |
||
| 180 | 180 | } |
| 181 | 181 | } |
| 182 | 182 | |
| 183 | - $markup = '<div class="panel panel-default" style="min-height: 100px;"' . $dataAttributesMarkup . '> |
|
| 183 | + $markup = '<div class="panel panel-default" style="min-height: 100px;"'.$dataAttributesMarkup.'> |
|
| 184 | 184 | <div class="panel-body"><div class="sf-controls">%s</div>%s</div></div>'; |
| 185 | 185 | |
| 186 | 186 | $view = $this->getView(); |
@@ -193,9 +193,9 @@ discard block |
||
| 193 | 193 | |
| 194 | 194 | if (($controlButtons = $form->getOption('control_buttons')) !== null) |
| 195 | 195 | { |
| 196 | - $buttonMarkup .= PHP_EOL . implode(PHP_EOL, array_map(function (array $buttonSpec) use ($view) { |
|
| 197 | - return '<button type="button" class="btn btn-default btn-xs' . (isset($buttonSpec['class']) ? ' ' . $buttonSpec['class'] : '') . '">' |
|
| 198 | - . (isset($buttonSpec['icon']) ? '<span class="yk-icon yk-icon-' . $buttonSpec['icon'] . '"></span> ' : '') |
|
| 196 | + $buttonMarkup .= PHP_EOL.implode(PHP_EOL, array_map(function(array $buttonSpec) use ($view) { |
|
| 197 | + return '<button type="button" class="btn btn-default btn-xs'.(isset($buttonSpec['class']) ? ' '.$buttonSpec['class'] : '').'">' |
|
| 198 | + . (isset($buttonSpec['icon']) ? '<span class="yk-icon yk-icon-'.$buttonSpec['icon'].'"></span> ' : '') |
|
| 199 | 199 | . $view->translate($buttonSpec['label']) |
| 200 | 200 | . '</button>'; |
| 201 | 201 | }, $controlButtons)); |
@@ -235,10 +235,10 @@ discard block |
||
| 235 | 235 | } |
| 236 | 236 | |
| 237 | 237 | if ($element instanceof ViewPartialProviderInterface) { |
| 238 | - $renderer = $this->getView(); /* @var $renderer \Zend\View\Renderer\PhpRenderer */ |
|
| 238 | + $renderer = $this->getView(); /* @var $renderer \Zend\View\Renderer\PhpRenderer */ |
|
| 239 | 239 | $origPartial = $element->getViewPartial(); |
| 240 | 240 | $partial = "$origPartial.view"; |
| 241 | - $partialParams = array( |
|
| 241 | + $partialParams = array( |
|
| 242 | 242 | 'element' => $element |
| 243 | 243 | ); |
| 244 | 244 | if (!$renderer->resolver($partial)) { |
@@ -254,7 +254,7 @@ discard block |
||
| 254 | 254 | |
| 255 | 255 | if ($element instanceof FieldsetInterface) { |
| 256 | 256 | if (!$element instanceof FormInterface && $label) { |
| 257 | - $markup .= '<h4>' . $label . '</h4>'; |
|
| 257 | + $markup .= '<h4>'.$label.'</h4>'; |
|
| 258 | 258 | } |
| 259 | 259 | foreach ($element as $el) { |
| 260 | 260 | $markup .= $this->renderSummaryElement($el); |
@@ -285,11 +285,11 @@ discard block |
||
| 285 | 285 | if (!is_array($optVal) || !array_key_exists($optionKey, $optVal['options'])) { continue; } |
| 286 | 286 | |
| 287 | 287 | $optGroupLabel = isset($optVal['label']) ? $translator->translate($optVal['label']) : $optKey; |
| 288 | - $multiOptions[] = $optGroupLabel . ' | ' . $translator->translate($optVal['options'][$optionKey]); |
|
| 288 | + $multiOptions[] = $optGroupLabel.' | '.$translator->translate($optVal['options'][$optionKey]); |
|
| 289 | 289 | } |
| 290 | 290 | } |
| 291 | 291 | |
| 292 | - $elementValue = '<ul><li>' . join('</li><li>' , $multiOptions) . '</li></ul>'; |
|
| 292 | + $elementValue = '<ul><li>'.join('</li><li>', $multiOptions).'</li></ul>'; |
|
| 293 | 293 | |
| 294 | 294 | } else { |
| 295 | 295 | $elementValue = $translator->translate($options[$elementValue]); |
@@ -304,10 +304,10 @@ discard block |
||
| 304 | 304 | $markup .= '<div class="row">'; |
| 305 | 305 | $col = 12; |
| 306 | 306 | if ($label) { |
| 307 | - $markup .= '<div class="col-md-3 yk-label"><label>' . $label . '</label></div>'; |
|
| 307 | + $markup .= '<div class="col-md-3 yk-label"><label>'.$label.'</label></div>'; |
|
| 308 | 308 | $col = 9; |
| 309 | 309 | } |
| 310 | - $markup .= '<div class="col-md-' . $col . '">' . $elementValue . '</div>' |
|
| 310 | + $markup .= '<div class="col-md-'.$col.'">'.$elementValue.'</div>' |
|
| 311 | 311 | . '</div>'; |
| 312 | 312 | return $markup; |
| 313 | 313 | } |
@@ -24,31 +24,31 @@ |
||
| 24 | 24 | */ |
| 25 | 25 | class InjectHeadscriptInitializer implements InitializerInterface |
| 26 | 26 | { |
| 27 | - public function __invoke( ContainerInterface $container, $instance ) { |
|
| 28 | - /* @var $serviceLocator \Zend\Form\FormElementManager\FormElementManagerV3Polyfill */ |
|
| 27 | + public function __invoke( ContainerInterface $container, $instance ) { |
|
| 28 | + /* @var $serviceLocator \Zend\Form\FormElementManager\FormElementManagerV3Polyfill */ |
|
| 29 | 29 | |
| 30 | - if (!$instance instanceof HeadscriptProviderInterface) { |
|
| 31 | - return; |
|
| 32 | - } |
|
| 30 | + if (!$instance instanceof HeadscriptProviderInterface) { |
|
| 31 | + return; |
|
| 32 | + } |
|
| 33 | 33 | |
| 34 | - $scripts = $instance->getHeadscripts(); |
|
| 34 | + $scripts = $instance->getHeadscripts(); |
|
| 35 | 35 | |
| 36 | - if (!is_array($scripts) || empty($scripts)) { |
|
| 37 | - return; |
|
| 38 | - } |
|
| 36 | + if (!is_array($scripts) || empty($scripts)) { |
|
| 37 | + return; |
|
| 38 | + } |
|
| 39 | 39 | |
| 40 | - /* @var $basepath \Zend\View\Helper\BasePath |
|
| 40 | + /* @var $basepath \Zend\View\Helper\BasePath |
|
| 41 | 41 | * @var $headscript \Zend\View\Helper\HeadScript */ |
| 42 | - $helpers = $container->get('ViewHelperManager'); |
|
| 43 | - $basepath = $helpers->get('basepath'); |
|
| 44 | - $headscript = $helpers->get('headscript'); |
|
| 42 | + $helpers = $container->get('ViewHelperManager'); |
|
| 43 | + $basepath = $helpers->get('basepath'); |
|
| 44 | + $headscript = $helpers->get('headscript'); |
|
| 45 | 45 | |
| 46 | - foreach ($scripts as $script) { |
|
| 47 | - $headscript->appendFile($basepath($script)); |
|
| 48 | - } |
|
| 49 | - } |
|
| 46 | + foreach ($scripts as $script) { |
|
| 47 | + $headscript->appendFile($basepath($script)); |
|
| 48 | + } |
|
| 49 | + } |
|
| 50 | 50 | |
| 51 | - /** |
|
| 51 | + /** |
|
| 52 | 52 | * Injects scripts to the headscript view helper. |
| 53 | 53 | * |
| 54 | 54 | * If the created instance implements {@link HeadscriptProviderInterface}, |
@@ -24,7 +24,7 @@ |
||
| 24 | 24 | */ |
| 25 | 25 | class InjectHeadscriptInitializer implements InitializerInterface |
| 26 | 26 | { |
| 27 | - public function __invoke( ContainerInterface $container, $instance ) { |
|
| 27 | + public function __invoke(ContainerInterface $container, $instance) { |
|
| 28 | 28 | /* @var $serviceLocator \Zend\Form\FormElementManager\FormElementManagerV3Polyfill */ |
| 29 | 29 | |
| 30 | 30 | if (!$instance instanceof HeadscriptProviderInterface) { |
@@ -21,15 +21,15 @@ |
||
| 21 | 21 | */ |
| 22 | 22 | class Initializer implements InitializerInterface |
| 23 | 23 | { |
| 24 | - public function __invoke( ContainerInterface $container, $instance ) |
|
| 25 | - { |
|
| 26 | - if ($instance instanceof FormContainer) { |
|
| 27 | - $instance->setFormElementManager($container->get('FormElementManager')); |
|
| 28 | - } |
|
| 29 | - } |
|
| 24 | + public function __invoke( ContainerInterface $container, $instance ) |
|
| 25 | + { |
|
| 26 | + if ($instance instanceof FormContainer) { |
|
| 27 | + $instance->setFormElementManager($container->get('FormElementManager')); |
|
| 28 | + } |
|
| 29 | + } |
|
| 30 | 30 | |
| 31 | 31 | |
| 32 | - /** |
|
| 32 | + /** |
|
| 33 | 33 | * @see \Zend\ServiceManager\InitializerInterface::initialize() |
| 34 | 34 | */ |
| 35 | 35 | public function initialize($instance, ServiceLocatorInterface $serviceLocator) |
@@ -21,7 +21,7 @@ |
||
| 21 | 21 | */ |
| 22 | 22 | class Initializer implements InitializerInterface |
| 23 | 23 | { |
| 24 | - public function __invoke( ContainerInterface $container, $instance ) |
|
| 24 | + public function __invoke(ContainerInterface $container, $instance) |
|
| 25 | 25 | { |
| 26 | 26 | if ($instance instanceof FormContainer) { |
| 27 | 27 | $instance->setFormElementManager($container->get('FormElementManager')); |
@@ -98,9 +98,9 @@ discard block |
||
| 98 | 98 | } |
| 99 | 99 | $instance->setTranslatorEnabled(true); |
| 100 | 100 | } |
| 101 | - if($instance instanceof ContainerAwareInterface){ |
|
| 102 | - $instance->setContainer($context); |
|
| 103 | - } |
|
| 101 | + if($instance instanceof ContainerAwareInterface){ |
|
| 102 | + $instance->setContainer($context); |
|
| 103 | + } |
|
| 104 | 104 | } |
| 105 | 105 | ); |
| 106 | 106 | |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | // if (method_exists($instance, 'setServiceLocator')) { |
| 111 | 111 | // //$instance->setServiceLocator($this); |
| 112 | 112 | // } |
| 113 | - // } |
|
| 113 | + // } |
|
| 114 | 114 | //); |
| 115 | 115 | |
| 116 | 116 | $this->addInitializer( |
@@ -159,13 +159,13 @@ discard block |
||
| 159 | 159 | */ |
| 160 | 160 | public function setFrom($email, $name = null) |
| 161 | 161 | { |
| 162 | - if(is_array($email)){ |
|
| 163 | - $this->from = [$email['email'] => $email['name']]; |
|
| 164 | - }else{ |
|
| 165 | - $this->from = is_object($email) || null === $name |
|
| 166 | ||
| 167 | - : array($email => $name); |
|
| 168 | - } |
|
| 162 | + if(is_array($email)){ |
|
| 163 | + $this->from = [$email['email'] => $email['name']]; |
|
| 164 | + }else{ |
|
| 165 | + $this->from = is_object($email) || null === $name |
|
| 166 | ||
| 167 | + : array($email => $name); |
|
| 168 | + } |
|
| 169 | 169 | |
| 170 | 170 | return $this; |
| 171 | 171 | } |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | ); |
| 72 | 72 | |
| 73 | 73 | protected $factories = array( |
| 74 | - 'htmltemplate' => [HTMLTemplateMessage::class,'factory'], |
|
| 74 | + 'htmltemplate' => [HTMLTemplateMessage::class, 'factory'], |
|
| 75 | 75 | ); |
| 76 | 76 | |
| 77 | 77 | /** |
@@ -86,10 +86,10 @@ discard block |
||
| 86 | 86 | */ |
| 87 | 87 | public function __construct($container, $configuration = []) |
| 88 | 88 | { |
| 89 | - parent::__construct($container,$configuration); |
|
| 89 | + parent::__construct($container, $configuration); |
|
| 90 | 90 | |
| 91 | 91 | $this->addInitializer( |
| 92 | - function ($context,$instance){ |
|
| 92 | + function($context, $instance) { |
|
| 93 | 93 | if ($instance instanceof TranslatorAwareInterface) { |
| 94 | 94 | $translator = $context->get('translator'); |
| 95 | 95 | $instance->setTranslator($translator); |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | } |
| 99 | 99 | $instance->setTranslatorEnabled(true); |
| 100 | 100 | } |
| 101 | - if($instance instanceof ContainerAwareInterface){ |
|
| 101 | + if ($instance instanceof ContainerAwareInterface) { |
|
| 102 | 102 | $instance->setContainer($context); |
| 103 | 103 | } |
| 104 | 104 | } |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | //); |
| 115 | 115 | |
| 116 | 116 | $this->addInitializer( |
| 117 | - function ($context,$instance){ |
|
| 117 | + function($context, $instance) { |
|
| 118 | 118 | if (method_exists($instance, 'init')) { |
| 119 | 119 | $instance->init(); |
| 120 | 120 | } |
@@ -159,9 +159,9 @@ discard block |
||
| 159 | 159 | */ |
| 160 | 160 | public function setFrom($email, $name = null) |
| 161 | 161 | { |
| 162 | - if(is_array($email)){ |
|
| 162 | + if (is_array($email)) { |
|
| 163 | 163 | $this->from = [$email['email'] => $email['name']]; |
| 164 | - }else{ |
|
| 164 | + } else { |
|
| 165 | 165 | $this->from = is_object($email) || null === $name |
| 166 | 166 | |
| 167 | 167 | : array($email => $name); |
@@ -208,11 +208,11 @@ discard block |
||
| 208 | 208 | if ($this->overrideRecipient instanceof AddressList) { |
| 209 | 209 | $originalRecipient = $headers->get('to')->toString(); |
| 210 | 210 | if ($headers->has('cc')) { |
| 211 | - $originalRecipient .= '; ' . $headers->get('cc')->toString(); |
|
| 211 | + $originalRecipient .= '; '.$headers->get('cc')->toString(); |
|
| 212 | 212 | $headers->removeHeader('cc'); |
| 213 | 213 | } |
| 214 | 214 | if ($headers->has('bcc')) { |
| 215 | - $originalRecipient .= '; ' . $headers->get('bcc')->toString(); |
|
| 215 | + $originalRecipient .= '; '.$headers->get('bcc')->toString(); |
|
| 216 | 216 | $headers->removeHeader('bcc'); |
| 217 | 217 | } |
| 218 | 218 | $headers->addHeaderLine('X-Original-Recipients', $originalRecipient); |
@@ -161,7 +161,7 @@ |
||
| 161 | 161 | { |
| 162 | 162 | if(is_array($email)){ |
| 163 | 163 | $this->from = [$email['email'] => $email['name']]; |
| 164 | - }else{ |
|
| 164 | + } else{ |
|
| 165 | 165 | $this->from = is_object($email) || null === $name |
| 166 | 166 | |
| 167 | 167 | : array($email => $name); |
@@ -20,40 +20,40 @@ |
||
| 20 | 20 | |
| 21 | 21 | class MailServiceFactory implements FactoryInterface |
| 22 | 22 | { |
| 23 | - public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) |
|
| 24 | - { |
|
| 25 | - $config = $container->get('Config'); |
|
| 26 | - $mails = isset($config['mails']) ? $config['mails'] : []; |
|
| 23 | + public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) |
|
| 24 | + { |
|
| 25 | + $config = $container->get('Config'); |
|
| 26 | + $mails = isset($config['mails']) ? $config['mails'] : []; |
|
| 27 | 27 | |
| 28 | - /* @var \Auth\Options\ModuleOptions $authOptions */ |
|
| 29 | - $authOptions = $container->get('Auth/Options'); |
|
| 28 | + /* @var \Auth\Options\ModuleOptions $authOptions */ |
|
| 29 | + $authOptions = $container->get('Auth/Options'); |
|
| 30 | 30 | |
| 31 | - /* @var \Core\Options\MailServiceOptions $mailServiceOptions */ |
|
| 32 | - $mailServiceOptions = $container->get('Core/MailServiceOptions'); |
|
| 31 | + /* @var \Core\Options\MailServiceOptions $mailServiceOptions */ |
|
| 32 | + $mailServiceOptions = $container->get('Core/MailServiceOptions'); |
|
| 33 | 33 | |
| 34 | - $configArray = [ |
|
| 35 | - 'from' => [ |
|
| 36 | - 'name' => $authOptions->getFromName(), |
|
| 37 | - 'email' => $authOptions->getFromEmail() |
|
| 38 | - ], |
|
| 39 | - ]; |
|
| 34 | + $configArray = [ |
|
| 35 | + 'from' => [ |
|
| 36 | + 'name' => $authOptions->getFromName(), |
|
| 37 | + 'email' => $authOptions->getFromEmail() |
|
| 38 | + ], |
|
| 39 | + ]; |
|
| 40 | 40 | |
| 41 | - if ($mailServiceOptions->getTransportClass() == 'smtp') { |
|
| 42 | - $configArray['transport'] = new Smtp($mailServiceOptions); |
|
| 43 | - } |
|
| 41 | + if ($mailServiceOptions->getTransportClass() == 'smtp') { |
|
| 42 | + $configArray['transport'] = new Smtp($mailServiceOptions); |
|
| 43 | + } |
|
| 44 | 44 | |
| 45 | - $configArray = array_merge($configArray, $mails); |
|
| 45 | + $configArray = array_merge($configArray, $mails); |
|
| 46 | 46 | |
| 47 | - $config = new MailServiceConfig($configArray); |
|
| 48 | - $service = new MailService($container,$config->toArray()); |
|
| 49 | - $config->configureServiceManager($service); |
|
| 50 | - foreach($config->toArray() as $name=>$value){ |
|
| 51 | - $method = 'set'.$name; |
|
| 52 | - if(method_exists($service,$method)){ |
|
| 53 | - call_user_func([$service,$method],$value); |
|
| 54 | - } |
|
| 55 | - } |
|
| 47 | + $config = new MailServiceConfig($configArray); |
|
| 48 | + $service = new MailService($container,$config->toArray()); |
|
| 49 | + $config->configureServiceManager($service); |
|
| 50 | + foreach($config->toArray() as $name=>$value){ |
|
| 51 | + $method = 'set'.$name; |
|
| 52 | + if(method_exists($service,$method)){ |
|
| 53 | + call_user_func([$service,$method],$value); |
|
| 54 | + } |
|
| 55 | + } |
|
| 56 | 56 | |
| 57 | - return $service; |
|
| 58 | - } |
|
| 57 | + return $service; |
|
| 58 | + } |
|
| 59 | 59 | } |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | |
| 21 | 21 | class MailServiceFactory implements FactoryInterface |
| 22 | 22 | { |
| 23 | - public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) |
|
| 23 | + public function __invoke(ContainerInterface $container, $requestedName, array $options = null) |
|
| 24 | 24 | { |
| 25 | 25 | $config = $container->get('Config'); |
| 26 | 26 | $mails = isset($config['mails']) ? $config['mails'] : []; |
@@ -45,12 +45,12 @@ discard block |
||
| 45 | 45 | $configArray = array_merge($configArray, $mails); |
| 46 | 46 | |
| 47 | 47 | $config = new MailServiceConfig($configArray); |
| 48 | - $service = new MailService($container,$config->toArray()); |
|
| 48 | + $service = new MailService($container, $config->toArray()); |
|
| 49 | 49 | $config->configureServiceManager($service); |
| 50 | - foreach($config->toArray() as $name=>$value){ |
|
| 50 | + foreach ($config->toArray() as $name=>$value) { |
|
| 51 | 51 | $method = 'set'.$name; |
| 52 | - if(method_exists($service,$method)){ |
|
| 53 | - call_user_func([$service,$method],$value); |
|
| 52 | + if (method_exists($service, $method)) { |
|
| 53 | + call_user_func([$service, $method], $value); |
|
| 54 | 54 | } |
| 55 | 55 | } |
| 56 | 56 | |
@@ -219,10 +219,10 @@ |
||
| 219 | 219 | ], |
| 220 | 220 | |
| 221 | 221 | 'input_filters' => [ |
| 222 | - 'aliases' => [ |
|
| 223 | - 'Cv/Employment' => Employment::class, |
|
| 224 | - 'Cv/Education' => Education::class |
|
| 225 | - ], |
|
| 222 | + 'aliases' => [ |
|
| 223 | + 'Cv/Employment' => Employment::class, |
|
| 224 | + 'Cv/Education' => Education::class |
|
| 225 | + ], |
|
| 226 | 226 | 'invokables' => [ |
| 227 | 227 | 'Cv/Employment' => Employment::class, |
| 228 | 228 | 'Cv/Education' => Education::class |
@@ -23,7 +23,7 @@ discard block |
||
| 23 | 23 | * for multiple paths. |
| 24 | 24 | * example https://github.com/doctrine/DoctrineORMModule |
| 25 | 25 | */ |
| 26 | - 'paths' => [ __DIR__ . '/../src/Cv/Entity'], |
|
| 26 | + 'paths' => [__DIR__.'/../src/Cv/Entity'], |
|
| 27 | 27 | ], |
| 28 | 28 | ], |
| 29 | 29 | 'eventmanager' => [ |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | 'translation_file_patterns' => [ |
| 45 | 45 | [ |
| 46 | 46 | 'type' => 'gettext', |
| 47 | - 'base_dir' => __DIR__ . '/../language', |
|
| 47 | + 'base_dir' => __DIR__.'/../language', |
|
| 48 | 48 | 'pattern' => '%s.mo', |
| 49 | 49 | ], |
| 50 | 50 | ], |
@@ -154,7 +154,7 @@ discard block |
||
| 154 | 154 | 'factories' => [ |
| 155 | 155 | \Cv\Controller\IndexController::class => \Zend\ServiceManager\Factory\InvokableFactory::class, |
| 156 | 156 | 'Cv/View' => 'Cv\Factory\Controller\ViewControllerFactory', |
| 157 | - 'Cv\Controller\Manage' => [ManageController::class,'factory'], |
|
| 157 | + 'Cv\Controller\Manage' => [ManageController::class, 'factory'], |
|
| 158 | 158 | ], |
| 159 | 159 | 'aliases' => [ |
| 160 | 160 | 'Cv/Index' => \Cv\Controller\IndexController::class, |
@@ -169,7 +169,7 @@ discard block |
||
| 169 | 169 | 'resume-recruiter' => [ |
| 170 | 170 | 'label' => /*@translate*/ 'Talent-Pool', |
| 171 | 171 | 'route' => 'lang/cvs', |
| 172 | - 'active_on' => [ 'lang/cvs/edit', 'lang/cvs/view' ], |
|
| 172 | + 'active_on' => ['lang/cvs/edit', 'lang/cvs/view'], |
|
| 173 | 173 | 'resource' => 'navigation/resume-recruiter', |
| 174 | 174 | 'order' => 10, |
| 175 | 175 | 'query' => [ |
@@ -200,15 +200,15 @@ discard block |
||
| 200 | 200 | |
| 201 | 201 | // Map template to files. Speeds up the lookup through the template stack. |
| 202 | 202 | 'template_map' => [ |
| 203 | - 'cv/form/employment.view' => __DIR__ . '/../view/cv/form/employment.view.phtml', |
|
| 204 | - 'cv/form/employment.form' => __DIR__ . '/../view/cv/form/employment.form.phtml', |
|
| 205 | - 'cv/form/education.view' => __DIR__ . '/../view/cv/form/education.view.phtml', |
|
| 206 | - 'cv/form/education.form' => __DIR__ . '/../view/cv/form/education.form.phtml' |
|
| 203 | + 'cv/form/employment.view' => __DIR__.'/../view/cv/form/employment.view.phtml', |
|
| 204 | + 'cv/form/employment.form' => __DIR__.'/../view/cv/form/employment.form.phtml', |
|
| 205 | + 'cv/form/education.view' => __DIR__.'/../view/cv/form/education.view.phtml', |
|
| 206 | + 'cv/form/education.form' => __DIR__.'/../view/cv/form/education.form.phtml' |
|
| 207 | 207 | ], |
| 208 | 208 | |
| 209 | 209 | // Where to look for view templates not mapped above |
| 210 | 210 | 'template_path_stack' => [ |
| 211 | - __DIR__ . '/../view', |
|
| 211 | + __DIR__.'/../view', |
|
| 212 | 212 | ], |
| 213 | 213 | ], |
| 214 | 214 | |
@@ -24,12 +24,12 @@ |
||
| 24 | 24 | */ |
| 25 | 25 | class PaginationQueryFactory implements FactoryInterface |
| 26 | 26 | { |
| 27 | - public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) |
|
| 28 | - { |
|
| 29 | - $auth = $container->get('AuthenticationService'); |
|
| 30 | - $user = $auth->hasIdentity() ? $auth->getUser() : null; |
|
| 31 | - $filter = new PaginationQuery($user); |
|
| 27 | + public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) |
|
| 28 | + { |
|
| 29 | + $auth = $container->get('AuthenticationService'); |
|
| 30 | + $user = $auth->hasIdentity() ? $auth->getUser() : null; |
|
| 31 | + $filter = new PaginationQuery($user); |
|
| 32 | 32 | |
| 33 | - return $filter; |
|
| 34 | - } |
|
| 33 | + return $filter; |
|
| 34 | + } |
|
| 35 | 35 | } |
@@ -24,7 +24,7 @@ |
||
| 24 | 24 | */ |
| 25 | 25 | class PaginationQueryFactory implements FactoryInterface |
| 26 | 26 | { |
| 27 | - public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) |
|
| 27 | + public function __invoke(ContainerInterface $container, $requestedName, array $options = null) |
|
| 28 | 28 | { |
| 29 | 29 | $auth = $container->get('AuthenticationService'); |
| 30 | 30 | $user = $auth->hasIdentity() ? $auth->getUser() : null; |
@@ -12,7 +12,7 @@ |
||
| 12 | 12 | |
| 13 | 13 | use Cv\Controller\ViewController; |
| 14 | 14 | use Interop\Container\ContainerInterface; |
| 15 | -use Zend\ServiceManager\Factory\FactoryInterface;; |
|
| 15 | +use Zend\ServiceManager\Factory\FactoryInterface; ; |
|
| 16 | 16 | |
| 17 | 17 | /** |
| 18 | 18 | * ${CARET} |