Completed
Branch develop (7585df)
by Carsten
11:01
created
module/Applications/src/Applications/Repository/Subscriber.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@
 block discarded – undo
25 25
      */
26 26
     public function findByUri($uri, $create = false)
27 27
     {
28
-        $subscriber = $this->findOneBy(array( "uri" => $uri ));
28
+        $subscriber = $this->findOneBy(array("uri" => $uri));
29 29
         if (!isset($subscriber) && $create) {
30 30
             $subscriber = $this->create();
31 31
             $subscriber->uri = $uri;
Please login to merge, or discard this patch.
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * YAWIK
4
- *
5
- * @filesource
6
- * @copyright (c) 2013-2015 Cross Solution (http://cross-solution.de)
7
- * @license   MIT
8
- */
3
+     * YAWIK
4
+     *
5
+     * @filesource
6
+     * @copyright (c) 2013-2015 Cross Solution (http://cross-solution.de)
7
+     * @license   MIT
8
+     */
9 9
 
10 10
 /** SettingsEntityResolverFactory.php */
11 11
 namespace Settings\Repository;
Please login to merge, or discard this patch.
module/Auth/Module.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
 
92 92
         $eventManager->attach(
93 93
             MvcEvent::EVENT_ROUTE,
94
-            function (MvcEvent $e) use ($services) {
94
+            function(MvcEvent $e) use ($services) {
95 95
             /** @var CheckPermissionsListener $checkPermissionsListener */
96 96
                 $checkPermissionsListener = $services->get('Auth/CheckPermissionsListener');
97 97
                 $checkPermissionsListener->onRoute($e);
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
 
102 102
         $eventManager->attach(
103 103
             MvcEvent::EVENT_DISPATCH,
104
-            function (MvcEvent $e) use ($services) {
104
+            function(MvcEvent $e) use ($services) {
105 105
             /** @var CheckPermissionsListener $checkPermissionsListener */
106 106
                 $checkPermissionsListener = $services->get('Auth/CheckPermissionsListener');
107 107
                 $checkPermissionsListener->onDispatch($e);
Please login to merge, or discard this patch.
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * YAWIK
4
- * Auth Module Bootstrap
5
- *
6
- * @copyright (c) 2013-2015 Cross Solution (http://cross-solution.de)
7
- * @license   MIT
8
- */
3
+     * YAWIK
4
+     * Auth Module Bootstrap
5
+     *
6
+     * @copyright (c) 2013-2015 Cross Solution (http://cross-solution.de)
7
+     * @license   MIT
8
+     */
9 9
 
10 10
 namespace Jobs;
11 11
 
Please login to merge, or discard this patch.
module/Auth/config/module.config.php 2 patches
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
                  * for multiple paths.
24 24
                  * example https://github.com/doctrine/DoctrineORMModule
25 25
                  */
26
-                'paths' => array( __DIR__ . '/../src/Auth/Entity'),
26
+                'paths' => array(__DIR__ . '/../src/Auth/Entity'),
27 27
             ),
28 28
         ),
29 29
     ),
@@ -97,35 +97,35 @@  discard block
 block discarded – undo
97 97
         )
98 98
     ),
99 99
     'hybridauth' => array(
100
-        "Facebook" => array (
100
+        "Facebook" => array(
101 101
             "enabled" => true,
102
-            "keys"    => array ( "id" => "", "secret" => "" ),
102
+            "keys"    => array("id" => "", "secret" => ""),
103 103
             "scope"      => 'email, user_about_me, user_birthday, user_hometown, user_website',
104 104
             "display" => 'popup',
105 105
         ),
106
-        "LinkedIn" => array (
106
+        "LinkedIn" => array(
107 107
             "enabled" => true,
108
-            "keys"    => array ( "key" => "", "secret" => "" ),
108
+            "keys"    => array("key" => "", "secret" => ""),
109 109
         ),
110
-        "XING" => array (
110
+        "XING" => array(
111 111
             "enabled" => true,
112 112
             // This is a hack due to bad design of HybridAuth
113 113
             // There's no simpler way to include "additional-providers"
114
-            "wrapper" => array (
114
+            "wrapper" => array(
115 115
                 'class' => 'Hybrid_Providers_XING',
116 116
                 'path' => __FILE__,
117 117
             ),
118
-            "keys"    => array ( "key" => "", "secret" => "" ),
118
+            "keys"    => array("key" => "", "secret" => ""),
119 119
         ),
120
-        "Github" => array (
120
+        "Github" => array(
121 121
             "enabled" => true,
122 122
             // This is a hack due to bad design of HybridAuth
123 123
             // There's no simpler way to include "additional-providers"
124
-            "wrapper" => array (
124
+            "wrapper" => array(
125 125
                 'class' => 'Hybrid_Providers_Github',
126 126
                 'path' => __FILE__,
127 127
             ),
128
-            "keys"    => array ( "key" => "", "secret" => "" ),
128
+            "keys"    => array("key" => "", "secret" => ""),
129 129
         ),
130 130
 
131 131
     ),
Please login to merge, or discard this patch.
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -234,12 +234,12 @@  discard block
 block discarded – undo
234 234
                 'options' => array(
235 235
                     'route' => '/login/:provider',
236 236
                     'constraints' => array(
237
-                       // 'provider' => '.+',
237
+                        // 'provider' => '.+',
238 238
                     ),
239 239
                     'defaults' => array(
240 240
                         'controller' => 'Auth\Controller\Index',
241 241
                         'action' => 'login'
242
-                     ),
242
+                        ),
243 243
                 ),
244 244
             ),
245 245
             'auth-hauth' => array(
@@ -398,7 +398,7 @@  discard block
 block discarded – undo
398 398
                     'route/lang/my-password'
399 399
                 ),
400 400
                 'deny' => array(
401
-                   // 'route/lang/auth',
401
+                    // 'route/lang/auth',
402 402
                     'route/auth-provider',
403 403
                     'route/auth-extern',
404 404
                     'route/lang/forgot-password',
@@ -497,7 +497,7 @@  discard block
 block discarded – undo
497 497
         'factories' => array(
498 498
             'auth' => '\Auth\Factory\View\Helper\AuthFactory',
499 499
             'acl'  => '\Acl\Factory\View\Helper\AclFactory',
500
-         ),
500
+            ),
501 501
     ),
502 502
     
503 503
     'form_elements' => array(
Please login to merge, or discard this patch.
module/Auth/src/Acl/Assertion/AbstractEventManagerAwareAssertion.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -105,7 +105,7 @@
 block discarded – undo
105 105
 
106 106
         $results = $events->trigger(
107 107
             $event,
108
-            function ($r) {
108
+            function($r) {
109 109
                 return false === $r;
110 110
             }
111 111
         );
Please login to merge, or discard this patch.
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * YAWIK
4
- *
5
- * @filesource
6
- * @license MIT
7
- * @copyright  2013 - 2015 Cross Solution <http://cross-solution.de>
8
- */
3
+     * YAWIK
4
+     *
5
+     * @filesource
6
+     * @license MIT
7
+     * @copyright  2013 - 2015 Cross Solution <http://cross-solution.de>
8
+     */
9 9
   
10 10
 /** */
11 11
 namespace Acl\Assertion;
@@ -97,9 +97,9 @@  discard block
 block discarded – undo
97 97
 
98 98
         $event = new AssertionEvent(null, $this);
99 99
         $event->setAcl($acl)
100
-              ->setRole($role)
101
-              ->setResource($resource)
102
-              ->setPrivilege($privilege);
100
+                ->setRole($role)
101
+                ->setResource($resource)
102
+                ->setPrivilege($privilege);
103 103
 
104 104
         $events = $this->getEventManager();
105 105
 
Please login to merge, or discard this patch.
module/Auth/src/Acl/Controller/Plugin/Acl.php 2 patches
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * YAWIK
4
- *
5
- * @filesource
6
- * @copyright (c) 2013-2015 Cross Solution (http://cross-solution.de)
7
- * @license   MIT
8
- */
3
+     * YAWIK
4
+     *
5
+     * @filesource
6
+     * @copyright (c) 2013-2015 Cross Solution (http://cross-solution.de)
7
+     * @license   MIT
8
+     */
9 9
 
10 10
 /** Acl.php */
11 11
 namespace Acl\Controller\Plugin;
@@ -138,14 +138,14 @@  discard block
 block discarded – undo
138 138
         if (!$this->test($resource, $privilege)) {
139 139
             $msg = null === $privilege
140 140
                  ? sprintf(
141
-                     'You are not allowed to access resource "%s"',
142
-                     is_object($resource) ? $resource->getResourceId() : $resource
143
-                 )
141
+                        'You are not allowed to access resource "%s"',
142
+                        is_object($resource) ? $resource->getResourceId() : $resource
143
+                    )
144 144
                  : sprintf(
145
-                     'You are not allowed to execute operation "%s" on resource "%s"',
146
-                     $privilege,
147
-                     is_object($resource) ? $resource->getResourceId() : $resource
148
-                 );
145
+                        'You are not allowed to execute operation "%s" on resource "%s"',
146
+                        $privilege,
147
+                        is_object($resource) ? $resource->getResourceId() : $resource
148
+                    );
149 149
             
150 150
             if ($resource instanceof FileInterface && 0 == strpos($resource->type, 'image/')) {
151 151
                 throw new UnauthorizedImageAccessException(str_replace('resource', 'image', $msg));
Please login to merge, or discard this patch.
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -155,8 +155,8 @@
 block discarded – undo
155 155
     }
156 156
 
157 157
     /**
158
-     * @param null $resource
159
-     * @param null $privilege
158
+     * @param null|string $resource
159
+     * @param null|string $privilege
160 160
      * @param string $mode
161 161
      * @return $this|bool
162 162
      */
Please login to merge, or discard this patch.
module/Auth/src/Acl/Listener/CheckPermissionsListener.php 3 patches
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * YAWIK
4
- *
5
- * @filesource
6
- * @copyright (c) 2013-2015 Cross Solution (http://cross-solution.de)
7
- * @license   MIT
8
- */
3
+     * YAWIK
4
+     *
5
+     * @filesource
6
+     * @copyright (c) 2013-2015 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
 block discarded – undo
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
 block discarded – undo
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.
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -123,7 +123,7 @@
 block discarded – undo
123 123
             $eventManager = $event->getTarget()->getEventManager();
124 124
             $results = $eventManager->trigger(MvcEvent::EVENT_DISPATCH_ERROR, $event);
125 125
             if (count($results)) {
126
-                $return  = $results->last();
126
+                $return = $results->last();
127 127
             } else {
128 128
                 $return = $e->getParams();
129 129
             }
Please login to merge, or discard this patch.
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -29,7 +29,6 @@
 block discarded – undo
29 29
      * Attach to an event manager
30 30
      *
31 31
      * @param  EventManagerInterface $events
32
-     * @param  integer $priority
33 32
      */
34 33
     public function attach(EventManagerInterface $events)
35 34
     {
Please login to merge, or discard this patch.
module/Auth/src/Auth/Adapter/ExternalApplication.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -130,7 +130,7 @@
 block discarded – undo
130 130
         $loginSuccess = false;
131 131
         $loginResult = array();
132 132
         
133
-        if (0 < $applicationIdIndex &&  strlen($identity) - strlen($applicationId) == $applicationIdIndex) {
133
+        if (0 < $applicationIdIndex && strlen($identity) - strlen($applicationId) == $applicationIdIndex) {
134 134
             $this->serviceManager->get('Core/Log')->debug('User ' . $login . ', login with correct suffix: ');
135 135
             // the login ends with the applicationID, therefore use the secret key
136 136
             // the external login must be the form 'xxxxx@yyyy' where yyyy is the matching suffix to the external application key
Please login to merge, or discard this patch.
module/Auth/src/Auth/Controller/ManageController.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@
 block discarded – undo
40 40
     public function profileAction()
41 41
     {
42 42
         $services = $this->getServiceLocator();
43
-        $container= $services->get('forms')->get('Auth/userprofilecontainer');
43
+        $container = $services->get('forms')->get('Auth/userprofilecontainer');
44 44
         $user     = $services->get('AuthenticationService')->getUser();
45 45
         
46 46
         $container->setEntity($user);
Please login to merge, or discard this patch.
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * YAWIK
4
- *
5
- * @filesource
6
- * @copyright (c) 2013-2015 Cross Solution (http://cross-solution.de)
7
- * @license   MIT
8
- */
3
+     * YAWIK
4
+     *
5
+     * @filesource
6
+     * @copyright (c) 2013-2015 Cross Solution (http://cross-solution.de)
7
+     * @license   MIT
8
+     */
9 9
 
10 10
 /** SettingsEntityResolverFactory.php */
11 11
 namespace Settings\Repository;
Please login to merge, or discard this patch.
module/Auth/src/Auth/Controller/ManageGroupsController.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
          */
49 49
         $events->attach(
50 50
             MvcEvent::EVENT_DISPATCH,
51
-            function ($event) {
51
+            function($event) {
52 52
                 $routeMatch = $event->getRouteMatch();
53 53
                 $action     = $routeMatch->getParam('action');
54 54
             
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
          */
69 69
         $events->attach(
70 70
             MvcEvent::EVENT_DISPATCH,
71
-            function ($event) {
71
+            function($event) {
72 72
                 $model = $event->getResult();
73 73
                 if (!$model instanceof ViewModel || $model->terminate()) {
74 74
                     return;
@@ -198,7 +198,7 @@  discard block
 block discarded – undo
198 198
             $users = $repository->findByQuery($query);
199 199
         
200 200
             $userFilter = $services->get('filtermanager')->get('Auth/Entity/UserToSearchResult');
201
-            $filterFunc = function ($user) use ($userFilter) {
201
+            $filterFunc = function($user) use ($userFilter) {
202 202
                 return $userFilter->filter($user);
203 203
             };
204 204
             $result     = array_values(array_map($filterFunc, $users->toArray()));
Please login to merge, or discard this patch.
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * YAWIK
4
- *
5
- * @filesource
6
- * @copyright (c) 2013-2015 Cross Solution (http://cross-solution.de)
7
- * @license   MIT
8
- */
3
+     * YAWIK
4
+     *
5
+     * @filesource
6
+     * @copyright (c) 2013-2015 Cross Solution (http://cross-solution.de)
7
+     * @license   MIT
8
+     */
9 9
 
10 10
 /** SettingsEntityResolverFactory.php */
11 11
 namespace Settings\Repository;
Please login to merge, or discard this patch.