Completed
Push — master ( 858bee...ca95b0 )
by Pavel
10s
created
src/AppBundle/Tests/Controller/Admin/QuestionControllerTest.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,10 +1,10 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Created by PhpStorm.
4
- * User: device
5
- * Date: 18.03.16
6
- * Time: 18:52
7
- */
3
+     * Created by PhpStorm.
4
+     * User: device
5
+     * Date: 18.03.16
6
+     * Time: 18:52
7
+     */
8 8
 
9 9
 namespace AppBundle\Tests\Controller\Admin;
10 10
 
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
             'PHP_AUTH_USER' => '[email protected]',
50 50
             'PHP_AUTH_PW'   => 'user',
51 51
         ));
52
-       $client->request('GET', '/admin/question/show/1');
52
+        $client->request('GET', '/admin/question/show/1');
53 53
         $this->assertEquals(200, $client->getResponse()->getStatusCode());
54 54
     }
55 55
 }
Please login to merge, or discard this patch.
src/AppBundle/Entity/ModuleUser.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1,10 +1,10 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Created by PhpStorm.
4
- * User: device
5
- * Date: 23.02.16
6
- * Time: 10:00
7
- */
3
+     * Created by PhpStorm.
4
+     * User: device
5
+     * Date: 23.02.16
6
+     * Time: 10:00
7
+     */
8 8
 
9 9
 namespace AppBundle\Entity;
10 10
 
Please login to merge, or discard this patch.
src/AppBundle/Form/UserType.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -38,8 +38,8 @@
 block discarded – undo
38 38
                             'class' => 'form-control',
39 39
                         ]
40 40
                     ],
41
-                    'first_options'  => ['label' => 'Password'],
42
-                    'second_options' => ['label' => 'Repeat Password'],
41
+                    'first_options'  => [ 'label' => 'Password' ],
42
+                    'second_options' => [ 'label' => 'Repeat Password' ],
43 43
                 ]
44 44
             );
45 45
     }
Please login to merge, or discard this patch.
src/AppBundle/Controller/Admin/MassActionController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
             $users = $em->getRepository('AppBundle:User')
27 27
                 ->findChoiceModules($module);
28 28
 
29
-            return new Response(json_encode(['users' => $users]));
29
+            return new Response(json_encode([ 'users' => $users ]));
30 30
         }
31 31
 
32 32
         if ($choice = $request->get('users_choice')) {
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
                 $moduleUser = new ModuleUser();
39 39
                 $moduleUser->setModule($moduleHidden);
40 40
                 $user = $em->getRepository('AppBundle:User')
41
-                    ->find($choice[$i]);
41
+                    ->find($choice[ $i ]);
42 42
                 $moduleUser->setUser($user);
43 43
                 $user->removeChosenModule($hiddenModule);
44 44
                 $em->persist($moduleUser);
Please login to merge, or discard this patch.
src/AppBundle/Controller/RegistrationController.php 2 patches
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -43,8 +43,9 @@
 block discarded – undo
43 43
     public function afterSocLogin()
44 44
     {
45 45
         $user = $this->getUser();
46
-        if (!$user->getPassword())
47
-            return $this->redirectToRoute('update_profile');
46
+        if (!$user->getPassword()) {
47
+                    return $this->redirectToRoute('update_profile');
48
+        }
48 49
 
49 50
         return $this->redirectToRoute('account');
50 51
     }
Please login to merge, or discard this 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
         $email = trim($request->get('email'));
108 108
 
109 109
         $user = $em->getRepository('AppBundle:User')
110
-            ->findOneBy(['email' => $email]);
110
+            ->findOneBy([ 'email' => $email ]);
111 111
 
112 112
         if ($user && $user->isAccountNonLocked() == true) {
113 113
             list($password, $hash) = $this->get('app.custom.mailer')->sendMailCheckWithRecovery($user->getEmail());
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
             return $this->redirectToRoute('homepage');
134 134
         } else {
135 135
 
136
-            return [];
136
+            return [ ];
137 137
         }
138 138
 
139 139
     }
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
         $em = $this->getDoctrine()->getManager();
148 148
 
149 149
         $user = $em->getRepository('AppBundle:User')
150
-            ->findOneBy(['hash' => $hash]);
150
+            ->findOneBy([ 'hash' => $hash ]);
151 151
 
152 152
         if ($user) {
153 153
             $user->setPassword($user->getTmpPassword());
Please login to merge, or discard this patch.
src/AppBundle/Repository/PassModuleRepository.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1,10 +1,10 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Created by PhpStorm.
4
- * User: device
5
- * Date: 23.02.16
6
- * Time: 10:41
7
- */
3
+     * Created by PhpStorm.
4
+     * User: device
5
+     * Date: 23.02.16
6
+     * Time: 10:41
7
+     */
8 8
 
9 9
 namespace AppBundle\Repository;
10 10
 
Please login to merge, or discard this patch.
src/AppBundle/Repository/UserRepository.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@
 block discarded – undo
24 24
     {
25 25
         return $this->createQueryBuilder('u')
26 26
             ->where('u.chosenModule LIKE :module')
27
-            ->setParameter('module', '%"'.$module.'"%')
27
+            ->setParameter('module', '%"' . $module . '"%')
28 28
             ->getQuery()
29 29
             ->getResult();
30 30
     }
Please login to merge, or discard this patch.
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@
 block discarded – undo
17 17
             ->andWhere('user.role <> :role')
18 18
             ->setParameter('role', $role)
19 19
             ->getQuery()
20
-         //   ->getResult()
20
+            //   ->getResult()
21 21
             ;
22 22
     }
23 23
 
Please login to merge, or discard this patch.
src/AppBundle/Entity/User.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
         $this->isLocked = false;
128 128
         $this->modulesUser = new ArrayCollection();
129 129
         $this->role = self::ROLE_USER;
130
-        $this->chosenModule = [];
130
+        $this->chosenModule = [ ];
131 131
     }
132 132
 
133 133
     /**
@@ -267,7 +267,7 @@  discard block
 block discarded – undo
267 267
      */
268 268
     public function getRoles()
269 269
     {
270
-        return [$this->role];
270
+        return [ $this->role ];
271 271
 
272 272
     }
273 273
 
@@ -321,7 +321,7 @@  discard block
 block discarded – undo
321 321
      */
322 322
     public function isAccountNonLocked()
323 323
     {
324
-        return $this->isLocked ? false : true ;
324
+        return $this->isLocked ? false : true;
325 325
     }
326 326
 
327 327
     /**
@@ -491,8 +491,8 @@  discard block
 block discarded – undo
491 491
 
492 492
     public function removeChosenModule($chosenModule)
493 493
     {
494
-        if(($key = array_search($chosenModule, $this->chosenModule)) !== false) {
495
-            unset($this->chosenModule[$key]);
494
+        if (($key = array_search($chosenModule, $this->chosenModule)) !== false) {
495
+            unset($this->chosenModule[ $key ]);
496 496
         }
497 497
 
498 498
         return $this;
Please login to merge, or discard this patch.
src/AppBundle/Form/UpdateUserSocialNetType.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -38,8 +38,8 @@
 block discarded – undo
38 38
                             'class' => 'form-control',
39 39
                         ]
40 40
                     ],
41
-                    'first_options'  => ['label' => 'Password'],
42
-                    'second_options' => ['label' => 'Repeat Password'],
41
+                    'first_options'  => [ 'label' => 'Password' ],
42
+                    'second_options' => [ 'label' => 'Repeat Password' ],
43 43
                 ]
44 44
             );
45 45
     }
Please login to merge, or discard this patch.