Completed
Pull Request — develop (#434)
by Carsten
06:27
created
module/Core/src/Core/Controller/Plugin/Mail.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -96,18 +96,18 @@  discard block
 block discarded – undo
96 96
         $replyTo = $this->stringFromMailHeader($this->getReplyTo());
97 97
         
98 98
         return str_pad($template, 30)
99
-                . 'to: ' . str_pad($to, 50)
100
-                . 'cc: ' . str_pad($cc, 50)
101
-                . 'bcc: ' . str_pad($bcc, 50)
102
-                . 'from: ' . str_pad($from, 50)
103
-                . 'replyTo: ' . str_pad($replyTo, 50)
99
+                . 'to: '.str_pad($to, 50)
100
+                . 'cc: '.str_pad($cc, 50)
101
+                . 'bcc: '.str_pad($bcc, 50)
102
+                . 'from: '.str_pad($from, 50)
103
+                . 'replyTo: '.str_pad($replyTo, 50)
104 104
                 //. str_pad(implode(',', ArrayUtils::iteratorToArray($this->getSender())),50)
105
-                . 'subject: ' . str_pad($this->getSubject(), 50);
105
+                . 'subject: '.str_pad($this->getSubject(), 50);
106 106
     }
107 107
     
108 108
     public function template($template)
109 109
     {
110
-        $controller =  get_class($this->controller);
110
+        $controller = get_class($this->controller);
111 111
         $services = $this->serviceManager;
112 112
         
113 113
         $event = new Event();
@@ -124,11 +124,11 @@  discard block
 block discarded – undo
124 124
         $controllerIdentifier = strtolower(substr($controller, 0, strpos($controller, '\\')));
125 125
         $viewResolver = $this->serviceManager->get('ViewResolver');
126 126
                 
127
-        $templateHalf = 'mail/' . $template;
127
+        $templateHalf = 'mail/'.$template;
128 128
         $resource = $viewResolver->resolve($templateHalf);
129 129
         
130 130
         if (empty($resource)) {
131
-            $templateFull = $controllerIdentifier . '/mail/' . $template;
131
+            $templateFull = $controllerIdentifier.'/mail/'.$template;
132 132
             $resource = $viewResolver->resolve($templateFull);
133 133
         }
134 134
         
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
                     unset($__vars[$key]);
156 156
                 }
157 157
             }
158
-            unset($__vars['content'],$__vars['controllerIdentifier'],$__vars['controller'],$__vars['resource'],$__vars['template'],$__vars['viewResolver']);
158
+            unset($__vars['content'], $__vars['controllerIdentifier'], $__vars['controller'], $__vars['resource'], $__vars['template'], $__vars['viewResolver']);
159 159
             $this->config = $__vars;
160 160
         }
161 161
     }
@@ -180,20 +180,20 @@  discard block
 block discarded – undo
180 180
         if (isset($this->config['from'])) {
181 181
             $from = $this->config['from'];
182 182
         } else {
183
-            $log->err('A from email address must be provided (Variable $from) in Template: ' . $template);
184
-              throw new \InvalidArgumentException('A from email address must be provided (Variable $from) in Template: ' . $template);
183
+            $log->err('A from email address must be provided (Variable $from) in Template: '.$template);
184
+              throw new \InvalidArgumentException('A from email address must be provided (Variable $from) in Template: '.$template);
185 185
         }
186 186
         if (isset($this->config['fromName'])) {
187 187
             $fromName = $this->config['fromName'];
188 188
         } else {
189
-            $log->err('A from name must be provided (Variable $fromName) in Template: ' . $template);
190
-              throw new \InvalidArgumentException('A from name must be provided (Variable $fromName) in Template: ' . $template);
189
+            $log->err('A from name must be provided (Variable $fromName) in Template: '.$template);
190
+              throw new \InvalidArgumentException('A from name must be provided (Variable $fromName) in Template: '.$template);
191 191
         }
192 192
         if (isset($this->config['subject'])) {
193 193
             $subject = $this->config['subject'];
194 194
         } else {
195
-            $log->err('A subject must be provided (Variable $subject) in Template: ' . $template);
196
-              throw new \InvalidArgumentException('A subject must be provided (Variable $subject) in Template: ' . $template);
195
+            $log->err('A subject must be provided (Variable $subject) in Template: '.$template);
196
+              throw new \InvalidArgumentException('A subject must be provided (Variable $subject) in Template: '.$template);
197 197
         }
198 198
         $this->setFrom($from, $fromName);
199 199
         $this->setSubject($subject);
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
215 215
             $erg = true;
216 216
             $log->info($this);
217 217
         } catch (\Exception $e) {
218
-            $log->err('Mail failure ' . $e->getMessage());
218
+            $log->err('Mail failure '.$e->getMessage());
219 219
         }
220 220
         return $erg;
221 221
     }
Please login to merge, or discard this patch.
module/Core/src/Core/Controller/Plugin/CreatePaginator.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
         /* @var CreatePaginatorEvent $event */
108 108
 	    $events = $this->serviceManager->get('Core/CreatePaginator/Events');
109 109
 
110
-	    $event = $events->getEvent(CreatePaginatorEvent::EVENT_CREATE_PAGINATOR,$this,[
110
+	    $event = $events->getEvent(CreatePaginatorEvent::EVENT_CREATE_PAGINATOR, $this, [
111 111
             'paginatorParams' => $params,
112 112
             'paginators' => $paginators,
113 113
             'paginatorName' => $paginatorName
@@ -116,9 +116,9 @@  discard block
 block discarded – undo
116 116
 
117 117
         $paginator = $event->getPaginator();
118 118
 
119
-        if(!$paginator instanceof Paginator){
119
+        if (!$paginator instanceof Paginator) {
120 120
             // no paginator created by listener, so let's create default paginator
121
-            $paginator = $paginators->get($paginatorName,$params);
121
+            $paginator = $paginators->get($paginatorName, $params);
122 122
         }
123 123
         $paginator->setCurrentPageNumber(isset($params['page']) ? $params['page'] : 1)
124 124
                   ->setItemCountPerPage(isset($params['count']) ? $params['count'] : 10)
Please login to merge, or discard this patch.
module/Core/src/Core/Controller/Plugin/Service/EntitySnapshotFactory.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@
 block discarded – undo
27 27
 	 *
28 28
 	 * @return EntitySnapshot
29 29
 	 */
30
-	public function __invoke( ContainerInterface $container, $requestedName, array $options = null )
30
+	public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
31 31
 	{
32 32
 		$entitySnapshotPlugin = new EntitySnapshot();
33 33
 		// @TODO actually we just need...
Please login to merge, or discard this patch.
module/Core/src/Core/Controller/Plugin/Service/NotificationFactory.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -21,14 +21,14 @@  discard block
 block discarded – undo
21 21
 
22 22
 class NotificationFactory implements FactoryInterface
23 23
 {
24
-	public function __invoke( ContainerInterface $container, $requestedName, array $options = null )
24
+	public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
25 25
 	{
26 26
 		$pluginManager = $container->get('ControllerPluginManager');
27 27
 		$flashMessenger = $pluginManager->get('FlashMessenger');
28 28
 		$translator = $container->get('translator');
29 29
 		
30 30
 		$notificationListener = $container->get('Core/Listener/Notification');
31
-		$notification   = new Notification($flashMessenger);
31
+		$notification = new Notification($flashMessenger);
32 32
 		$notification->setListener($notificationListener);
33 33
 		$notification->setTranslator($translator);
34 34
 		
@@ -38,6 +38,6 @@  discard block
 block discarded – undo
38 38
 	public function createService(ServiceLocatorInterface $serviceLocator)
39 39
     {
40 40
         /* @var \Zend\Mvc\Controller\PluginManager $serviceLocator */
41
-        return $this($serviceLocator,Notification::class);
41
+        return $this($serviceLocator, Notification::class);
42 42
     }
43 43
 }
Please login to merge, or discard this patch.
module/Core/src/Core/Controller/IndexController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
 	 */
37 37
 	private $moduleManager;
38 38
 	
39
-	public function __construct($defaultListener,$config,$moduleManager)
39
+	public function __construct($defaultListener, $config, $moduleManager)
40 40
 	{
41 41
 		$this->defaultListener = $defaultListener;
42 42
 		$this->config = $config;
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
     {
51 51
     	// @TODO: [ZF3] check if attach the default listener is really work
52 52
         parent::attachDefaultListeners();
53
-        $events          = $this->getEventManager();
53
+        $events = $this->getEventManager();
54 54
         $this->defaultListener->attach($events);
55 55
         return $this;
56 56
     }
@@ -155,6 +155,6 @@  discard block
 block discarded – undo
155 155
     {
156 156
 	    $defaultListener = $container->get('DefaultListeners');
157 157
 	    $config = $container->get('config');
158
-	    return new static($defaultListener,$config,$container->get('ModuleManager'));
158
+	    return new static($defaultListener, $config, $container->get('ModuleManager'));
159 159
     }
160 160
 }
Please login to merge, or discard this patch.
module/Core/src/Core/Controller/AdminController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@
 block discarded – undo
53 53
          * @var AdminControllerEvent $event */
54 54
         $events = $this->adminControllerEvents;
55 55
         $event  = $events->getEvent(AdminControllerEvent::EVENT_DASHBOARD, $this);
56
-        $events->trigger($event,$this);
56
+        $events->trigger($event, $this);
57 57
 
58 58
         $model = new ViewModel();
59 59
         $widgets = [];
Please login to merge, or discard this patch.
module/Core/src/Core/Form/FileUploadFactory.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -79,10 +79,10 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
     /**
Please login to merge, or discard this patch.
module/Core/src/Core/Form/View/Helper/SummaryForm.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
     }
Please login to merge, or discard this patch.
module/Core/src/Core/Form/Service/InjectHeadscriptInitializer.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@
 block discarded – undo
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) {
Please login to merge, or discard this patch.