Completed
Push — develop ( 321e68...dce9ea )
by Carsten
09:20
created
module/Settings/src/Settings/Form/Factory/SettingsFieldsetFactory.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -27,8 +27,8 @@
 block discarded – undo
27 27
     {
28 28
         /* @var SettingsFieldset $ob */
29 29
         $class = class_exists($requestedName) ? $requestedName : SettingsFieldset::class;
30
-    	$ob = new $class($container->get('FormElementManager'));
31
-    	$ob->setName($requestedName);
30
+        $ob = new $class($container->get('FormElementManager'));
31
+        $ob->setName($requestedName);
32 32
         return $ob;
33 33
     }
34 34
 }
Please login to merge, or discard this patch.
module/Auth/config/module.config.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
         'aliases' => [
81 81
             'assertions' => 'Acl\AssertionManager',
82 82
             'Auth/UserTokenGenerator' => 'Auth\Service\UserUniqueTokenGenerator',
83
-	        'acl' => 'Acl'
83
+            'acl' => 'Acl'
84 84
         ]
85 85
     ],
86 86
 
@@ -91,8 +91,8 @@  discard block
 block discarded – undo
91 91
             'Auth/SocialProfiles' => 'Auth\Controller\SocialProfilesController',
92 92
         ],
93 93
         'factories' => [
94
-	        'Auth\Controller\Manage' => [ManageController::class,'factory'],
95
-	        'Auth/ManageGroups' => [ManageGroupsController::class,'factory'],
94
+            'Auth\Controller\Manage' => [ManageController::class,'factory'],
95
+            'Auth/ManageGroups' => [ManageGroupsController::class,'factory'],
96 96
             'Auth\Controller\ForgotPassword' => 'Auth\Factory\Controller\ForgotPasswordControllerFactory',
97 97
             'Auth\Controller\GotoResetPassword' => 'Auth\Factory\Controller\GotoResetPasswordControllerFactory',
98 98
             'Auth\Controller\Register' => 'Auth\Factory\Controller\RegisterControllerFactory',
@@ -116,10 +116,10 @@  discard block
 block discarded – undo
116 116
         'shared' => [
117 117
             'OAuth' => false,
118 118
         ],
119
-	    'aliases' => [
120
-	    	'acl' => 'Acl',
121
-		    'auth' => 'Auth'
122
-	    ]
119
+        'aliases' => [
120
+            'acl' => 'Acl',
121
+            'auth' => 'Auth'
122
+        ]
123 123
     ],
124 124
     'hybridauth' => [
125 125
         "Facebook" => [
@@ -224,7 +224,7 @@  discard block
 block discarded – undo
224 224
                     'Auth/Users' => 'switch',
225 225
                 ],
226 226
                 'deny' => [
227
-                   // 'route/lang/auth',
227
+                    // 'route/lang/auth',
228 228
                     'route/auth-provider',
229 229
                     'route/auth-extern',
230 230
                     'route/lang/forgot-password',
@@ -311,7 +311,7 @@  discard block
 block discarded – undo
311 311
         'factories' => [
312 312
             'auth' => '\Auth\Factory\View\Helper\AuthFactory',
313 313
             'acl'  => '\Acl\Factory\View\Helper\AclFactory',
314
-         ],
314
+            ],
315 315
     ],
316 316
     
317 317
     'form_elements' => [
Please login to merge, or discard this patch.
module/Auth/src/Acl/Listener/CheckPermissionsListener.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -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, $priority=1)
63 63
     {
64 64
         $this->listeners[] = $events->attach(MvcEvent::EVENT_ROUTE, array($this, 'onRoute'), -10);
@@ -80,11 +80,11 @@  discard block
 block discarded – undo
80 80
         }
81 81
     }
82 82
 	
83
-	/**
84
-	 * @param MvcEvent $event
85
-	 *
86
-	 * @return array|\ArrayAccess|mixed|object
87
-	 */
83
+    /**
84
+     * @param MvcEvent $event
85
+     *
86
+     * @return array|\ArrayAccess|mixed|object
87
+     */
88 88
     public function onRoute(MvcEvent $event)
89 89
     {
90 90
         if ($event->isError()) {
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
 
116 116
 
117 117
         if ($resourceId && !$acl->isAllowed($role, $resourceId, $privilege)) {
118
-           /*
118
+            /*
119 119
             * Exceptions are only catched within the dispatch listener, so
120 120
             * we have to set the exception manually in the event
121 121
             * and trigger the DISPATCH_ERROR event.
Please login to merge, or discard this patch.
module/Auth/src/Acl/Assertion/AbstractEventManagerAwareAssertion.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -96,18 +96,18 @@
 block discarded – undo
96 96
 
97 97
         $event = new AssertionEvent(null, $this);
98 98
         $event->setAcl($acl)
99
-              ->setRole($role)
100
-              ->setResource($resource)
101
-              ->setPrivilege($privilege);
99
+                ->setRole($role)
100
+                ->setResource($resource)
101
+                ->setPrivilege($privilege);
102 102
         
103 103
         $events = $this->getEventManager();
104 104
 
105 105
         $callback = function ($r) {
106
-	        return false === $r;
106
+            return false === $r;
107 107
         };
108 108
         
109 109
         $results = $events->triggerUntil(
110
-        	$callback,
110
+            $callback,
111 111
             $event->getName(),
112 112
             $event
113 113
         );
Please login to merge, or discard this patch.
module/Auth/src/Acl/Assertion/AssertionManagerFactory.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -20,15 +20,15 @@
 block discarded – undo
20 20
  */
21 21
 class AssertionManagerFactory implements FactoryInterface
22 22
 {
23
-	public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) {
24
-		$configContainer = $container->get('Config');
25
-		$configArray = isset($configContainer['acl']['assertions'])
26
-			? $configContainer['acl']['assertions']
27
-			: array();
23
+    public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) {
24
+        $configContainer = $container->get('Config');
25
+        $configArray = isset($configContainer['acl']['assertions'])
26
+            ? $configContainer['acl']['assertions']
27
+            : array();
28 28
 
29
-		$manager     = new AssertionManager($container, $configArray);
29
+        $manager     = new AssertionManager($container, $configArray);
30 30
 		
31
-		$manager->configure(['shared_by_default'=>false]);
32
-		return $manager;
33
-	}
31
+        $manager->configure(['shared_by_default'=>false]);
32
+        return $manager;
33
+    }
34 34
 }
Please login to merge, or discard this patch.
module/Auth/src/Acl/Assertion/AssertionManager.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -25,10 +25,10 @@  discard block
 block discarded – undo
25 25
  */
26 26
 class AssertionManager extends AbstractPluginManager
27 27
 {
28
-	/**
29
-	 * @var ContainerInterface
30
-	 */
31
-	protected $container;
28
+    /**
29
+     * @var ContainerInterface
30
+     */
31
+    protected $container;
32 32
 	
33 33
     /**
34 34
      * Creates an instance.
@@ -58,20 +58,20 @@  discard block
 block discarded – undo
58 58
      */
59 59
     public function injectEventManager($assertion, $serviceLocator)
60 60
     {
61
-    	//@TODO: [ZF3] check if ACL working properly
61
+        //@TODO: [ZF3] check if ACL working properly
62 62
         /* @var $serviceLocator AssertionManager */
63 63
 
64 64
         if (!$assertion instanceof EventManagerAwareInterface) {
65 65
             return;
66 66
         }
67 67
         /* @var EventManager $events */
68
-	    $container = $this->container;
68
+        $container = $this->container;
69 69
         $events = $assertion->getEventManager();
70 70
         if (!$events instanceof EventManagerInterface) {
71 71
             $events = $container->get('EventManager'); /* @var $events \Zend\EventManager\EventManagerInterface */
72 72
             $assertion->setEventManager($events);
73 73
         } else {
74
-        	//@TODO: [ZF3] setSharedManager method now is removed
74
+            //@TODO: [ZF3] setSharedManager method now is removed
75 75
             //$sharedEvents = $container->get('SharedEventManager'); /* @var $sharedEvents \Zend\EventManager\SharedEventManagerInterface */
76 76
             //$events->setSharedManager($sharedEvents);
77 77
         }
Please login to merge, or discard this patch.
module/Auth/src/Auth/Adapter/ExternalApplication.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -42,9 +42,9 @@
 block discarded – undo
42 42
         $this->setApplicationKey($applicationKey);
43 43
     }
44 44
 	
45
-	/**
46
-	 * @param ContainerInterface $serviceManager
47
-	 */
45
+    /**
46
+     * @param ContainerInterface $serviceManager
47
+     */
48 48
     public function setServiceLocator(ContainerInterface $serviceManager)
49 49
     {
50 50
         $this->serviceManager = $serviceManager;
Please login to merge, or discard this patch.
module/Auth/src/Auth/Listener/MailForgotPassword.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -51,8 +51,8 @@
 block discarded – undo
51 51
      */
52 52
     public function __invoke(AuthEvent $event)
53 53
     {
54
-    	/* @TODO: [ZF3] $e->getUser() is not worked anymore we should using $e->getTarget()->getUser() */
55
-    	$target     = $event->getTarget();
54
+        /* @TODO: [ZF3] $e->getUser() is not worked anymore we should using $e->getTarget()->getUser() */
55
+        $target     = $event->getTarget();
56 56
         $siteName   = $this->coreOptions->getSiteName();
57 57
         /* @var \Auth\Entity\User $user */
58 58
         $user                    = $target->getUser();
Please login to merge, or discard this patch.
module/Auth/src/Auth/Factory/ModuleOptionsFactory.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -22,15 +22,15 @@
 block discarded – undo
22 22
  */
23 23
 class ModuleOptionsFactory implements FactoryInterface
24 24
 {
25
-	/**
26
-	 * Create an ModuleOptions options
27
-	 *
28
-	 * @param ContainerInterface $container
29
-	 * @param string $requestedName
30
-	 * @param array|null $options
31
-	 *
32
-	 * @return ModuleOptions
33
-	 */
25
+    /**
26
+     * Create an ModuleOptions options
27
+     *
28
+     * @param ContainerInterface $container
29
+     * @param string $requestedName
30
+     * @param array|null $options
31
+     *
32
+     * @return ModuleOptions
33
+     */
34 34
     public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
35 35
     {
36 36
         $config = $container->get('Config');
Please login to merge, or discard this patch.