Completed
Pull Request — develop (#434)
by Carsten
06:27
created
module/Core/src/Core/Listener/AjaxRenderListener.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -77,7 +77,7 @@
 block discarded – undo
77 77
             }
78 78
             $resolver = $e->getApplication()->getServiceManager()->get('ViewResolver');
79 79
 
80
-            $template = $viewModel->getTemplate() . '.ajax';
80
+            $template = $viewModel->getTemplate().'.ajax';
81 81
             if ($resolver->resolve($template)) {
82 82
                 $viewModel->setTemplate($template);
83 83
             } else {
Please login to merge, or discard this patch.
module/Core/src/Core/Controller/Plugin/EntitySnapshot.php 2 patches
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -149,7 +149,7 @@  discard block
 block discarded – undo
149 149
                 $target->__invoke($data);
150 150
                 $className = get_class($this->entity);
151 151
                 // @TODO, have to be abstract
152
-                $snapShotMetaClassName = '\\' . $className . 'SnapshotMeta';
152
+                $snapShotMetaClassName = '\\'.$className.'SnapshotMeta';
153 153
                 $meta = new $snapShotMetaClassName;
154 154
                 $meta->setEntity($target);
155 155
                 $meta->setSourceId($this->entity->id);
@@ -177,7 +177,7 @@  discard block
 block discarded – undo
177 177
             if (empty($dataHead) || empty($targetClass)) {
178 178
                 return null;
179 179
             }
180
-            $repositorySnapshotMeta = $this->getRepositories()->getRepository($targetClass . "Meta");
180
+            $repositorySnapshotMeta = $this->getRepositories()->getRepository($targetClass."Meta");
181 181
             $snapshot = $repositorySnapshotMeta->findSnapshot($this->entity);
182 182
             // an snapshot has to be so simple that there is no need for a special hydrator
183 183
             $hydrator = new EntityHydrator();
@@ -247,8 +247,8 @@  discard block
 block discarded – undo
247 247
             // the snapshotgenerator is a service defined by the name of the entity
248 248
             // this is the highest means, all subsequent means just add what is not set
249 249
             $className = get_class($this->entity);
250
-            if ($serviceLocator->has('snapshotgenerator' . $className)) {
251
-                $generator = $this->serviceLocator->get('snapshotgenerator' . $className);
250
+            if ($serviceLocator->has('snapshotgenerator'.$className)) {
251
+                $generator = $this->serviceLocator->get('snapshotgenerator'.$className);
252 252
                 if (is_array($generator)) {
253 253
                     $this->options = ArrayUtils::merge($generator, $this->options);
254 254
                     $generator = null;
@@ -348,13 +348,13 @@  discard block
 block discarded – undo
348 348
                         }
349 349
                     } else {
350 350
                         if ($array1[$key] != $array2[$key]) {
351
-                            $result[$key] = array( $array1[$key], $array2[$key]);
351
+                            $result[$key] = array($array1[$key], $array2[$key]);
352 352
                         }
353 353
                     }
354 354
                     if (!empty($subResult)) {
355 355
                         foreach ($subResult as $subKey => $subValue) {
356 356
                             if (!empty($subKey) && is_string($subKey)) {
357
-                                $result[$key . '.' . $subKey] = $subValue;
357
+                                $result[$key.'.'.$subKey] = $subValue;
358 358
                             }
359 359
                         }
360 360
                     }
Please login to merge, or discard this patch.
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
     protected $generator;
51 51
 
52 52
     /**
53
-     * @param $serviceLocator
53
+     * @param \Interop\Container\ContainerInterface $serviceLocator
54 54
      * @return $this
55 55
      */
56 56
     public function setServiceLocator($serviceLocator)
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
     }
79 79
 
80 80
     /**
81
-     * @return mixed
81
+     * @return RepositoryInterface
82 82
      */
83 83
     public function getRepositories()
84 84
     {
Please login to merge, or discard this patch.
module/Core/src/Core/Controller/ContentController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@
 block discarded – undo
28 28
     public function indexAction()
29 29
     {
30 30
         $view = $this->params('view');
31
-        $view = 'content/' . $view;
31
+        $view = 'content/'.$view;
32 32
 
33 33
         $viewModel = new ViewModel();
34 34
         $viewModel->setTemplate($view);
Please login to merge, or discard this patch.
module/Core/src/Core/Mail/StringTemplateMessage.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
                 throw new \InvalidArgumentException(
40 40
                     sprintf(
41 41
                         'Expect an array or an instance of \Traversable, but received %s',
42
-                        is_object($variables) ? 'instance of ' . get_class($variables) : 'skalar'
42
+                        is_object($variables) ? 'instance of '.get_class($variables) : 'skalar'
43 43
                     )
44 44
                 );
45 45
             }
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
                 throw new \InvalidArgumentException(
70 70
                     sprintf(
71 71
                         'Expect an array or an instance of \Traversable, but received %s',
72
-                        is_object($callbacks) ? 'instance of ' . get_class($callbacks) : 'skalar'
72
+                        is_object($callbacks) ? 'instance of '.get_class($callbacks) : 'skalar'
73 73
                     )
74 74
                 );
75 75
             }
@@ -141,6 +141,6 @@  discard block
 block discarded – undo
141 141
     
142 142
     protected function getNamePattern($name)
143 143
     {
144
-        return '~##' . preg_quote($name) . '##~is';
144
+        return '~##'.preg_quote($name).'##~is';
145 145
     }
146 146
 }
Please login to merge, or discard this patch.
module/Core/src/Core/Mail/Message.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@
 block discarded – undo
26 26
             throw new \InvalidArgumentException(
27 27
                 sprintf(
28 28
                     'Expected $options to be an array or \Traversable, but received %s',
29
-                    (is_object($options) ? 'instance of ' . get_class($options) : 'skalar')
29
+                    (is_object($options) ? 'instance of '.get_class($options) : 'skalar')
30 30
                 )
31 31
             );
32 32
         }
Please login to merge, or discard this patch.
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -53,10 +53,10 @@
 block discarded – undo
53 53
 
54 54
         if ($emailOrAddressOrList instanceOf UserInterface) {
55 55
             parent::updateAddressList(
56
-                         $addressList,
57
-                         $emailOrAddressOrList->getInfo()->getEmail(),
58
-                         $emailOrAddressOrList->getInfo()->getDisplayName(false),
59
-                         $callingMethod
56
+                            $addressList,
57
+                            $emailOrAddressOrList->getInfo()->getEmail(),
58
+                            $emailOrAddressOrList->getInfo()->getDisplayName(false),
59
+                            $callingMethod
60 60
             );
61 61
             return;
62 62
         }
Please login to merge, or discard this patch.
module/Core/src/Core/Mail/MailServiceConfig.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -69,7 +69,7 @@
 block discarded – undo
69 69
                     $recipients->add($match[1]);
70 70
                 }
71 71
             } else {
72
-                trigger_error('invalid address format ("' . $recipient . '") in mails.develop.override_recipient', E_USER_WARNING);
72
+                trigger_error('invalid address format ("'.$recipient.'") in mails.develop.override_recipient', E_USER_WARNING);
73 73
             }
74 74
         }
75 75
         return $recipients;
Please login to merge, or discard this patch.
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -16,6 +16,9 @@  discard block
 block discarded – undo
16 16
 
17 17
 class MailServiceConfig extends Config
18 18
 {
19
+    /**
20
+     * @return \Zend\Mail\Transport\TransportInterface
21
+     */
19 22
     public function getTransport()
20 23
     {
21 24
         return isset($this->config['transport'])
@@ -40,6 +43,9 @@  discard block
 block discarded – undo
40 43
         return null;
41 44
     }
42 45
 
46
+    /**
47
+     * @return string
48
+     */
43 49
     public function getMailer()
44 50
     {
45 51
         return isset($this->data['mailer'])
Please login to merge, or discard this patch.
module/Auth/src/Auth/Entity/UserImage.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@
 block discarded – undo
29 29
      */
30 30
     public function getUri()
31 31
     {
32
-        return '/file/Auth.UserImage/' . $this->id;
32
+        return '/file/Auth.UserImage/'.$this->id;
33 33
     }
34 34
 
35 35
     /**
Please login to merge, or discard this patch.
module/Auth/src/Auth/Entity/Filter/CredentialFilter.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@
 block discarded – undo
9 9
     
10 10
     public function filter($value)
11 11
     {
12
-        $weird = sha1(md5($value) . md5(strrev($value)));
12
+        $weird = sha1(md5($value).md5(strrev($value)));
13 13
         return $weird;
14 14
     }
15 15
 }
Please login to merge, or discard this patch.
module/Auth/src/Auth/Entity/AnonymousUser.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -73,7 +73,7 @@
 block discarded – undo
73 73
     public function getId()
74 74
     {
75 75
         if (!$this->id) {
76
-            $this->setId('token:' . $this->getToken());
76
+            $this->setId('token:'.$this->getToken());
77 77
         }
78 78
         return $this->id;
79 79
     }
Please login to merge, or discard this patch.