zikula /
core
@@ -85,7 +85,7 @@ |
||
| 85 | 85 | |
| 86 | 86 | <info>--date</info> <comment>YYYYMMDDHHMMSS</comment> before deleting, filter user collection by date <comment>before</comment> this date. |
| 87 | 87 | |
| 88 | -EOT |
|
| 88 | +eot |
|
| 89 | 89 | ); |
| 90 | 90 | } |
| 91 | 91 | |
@@ -99,7 +99,7 @@ |
||
| 99 | 99 | } |
| 100 | 100 | if (isset($date)) { |
| 101 | 101 | $date = \DateTime::createFromFormat('YmdHis', $date, new \DateTimeZone('UTC')); |
| 102 | - $users = $users->filter(function (UserEntity $user) use ($date) { |
|
| 102 | + $users = $users->filter(function(UserEntity $user) use ($date) { |
|
| 103 | 103 | return $user->getRegistrationDate() < $date; |
| 104 | 104 | }); |
| 105 | 105 | } |
@@ -94,11 +94,11 @@ |
||
| 94 | 94 | <title>${subject}</title> |
| 95 | 95 | </head> |
| 96 | 96 | <body> |
| 97 | -<h1>Hi ${uName}!</h1> |
|
| 97 | +<h1>Hi ${uname}!</h1> |
|
| 98 | 98 | <p>Zikula has been successfully installed at <a href="${url}">${url}</a>. If you have further questions, |
| 99 | 99 | visit <a href="https://ziku.la">ziku.la</a></p> |
| 100 | 100 | </body> |
| 101 | -EOF; |
|
| 101 | +eof; |
|
| 102 | 102 | $email = (new Email()) |
| 103 | 103 | ->from($adminUser->getEmail()) |
| 104 | 104 | ->to($adminUser->getEmail()) |
@@ -90,7 +90,7 @@ |
||
| 90 | 90 | |
| 91 | 91 | <info>php %command.full_name% fabien</info> |
| 92 | 92 | |
| 93 | -EOT |
|
| 93 | +eot |
|
| 94 | 94 | ); |
| 95 | 95 | } |
| 96 | 96 | |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | $qb->from('ZikulaUsersModule:UserEntity', 'u'); |
| 76 | 76 | $qb->andWhere($qb->expr()->eq('tbl.user', 'u.uid')); |
| 77 | 77 | $qb->andWhere($qb->expr()->eq('tbl.user', ':uid')) |
| 78 | - ->setParameter('uid', $uid); |
|
| 78 | + ->setParameter('uid', $uid); |
|
| 79 | 79 | } |
| 80 | 80 | } |
| 81 | 81 | |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | $i = 1; |
| 85 | 85 | foreach ($filters as $w_key => $w_value) { |
| 86 | 86 | $qb->andWhere($qb->expr()->eq('tbl.' . $w_key, '?' . $i)) |
| 87 | - ->setParameter($i, $w_value); |
|
| 87 | + ->setParameter($i, $w_value); |
|
| 88 | 88 | $i++; |
| 89 | 89 | } |
| 90 | 90 | } |
@@ -107,12 +107,12 @@ discard block |
||
| 107 | 107 | |
| 108 | 108 | if ('uid' === $fieldName) { |
| 109 | 109 | $qb->select('DISTINCT(u.uname)') |
| 110 | - ->from('ZikulaUsersModule:UserEntity', 'u') |
|
| 111 | - ->where($qb->expr()->eq('tbl.user', 'u.uid')) |
|
| 112 | - ->addOrderBy('u.uname', 'ASC'); |
|
| 110 | + ->from('ZikulaUsersModule:UserEntity', 'u') |
|
| 111 | + ->where($qb->expr()->eq('tbl.user', 'u.uid')) |
|
| 112 | + ->addOrderBy('u.uname', 'ASC'); |
|
| 113 | 113 | } else { |
| 114 | 114 | $qb->select('DISTINCT(tbl.' . $fieldName . ')') |
| 115 | - ->addOrderBy('tbl.' . $fieldName, 'ASC'); |
|
| 115 | + ->addOrderBy('tbl.' . $fieldName, 'ASC'); |
|
| 116 | 116 | } |
| 117 | 117 | |
| 118 | 118 | return $qb->getQuery()->getResult(); |
@@ -45,12 +45,12 @@ discard block |
||
| 45 | 45 | |
| 46 | 46 | if (null !== $groupType) { |
| 47 | 47 | $qb->where('g.gtype = :gtype') |
| 48 | - ->setParameter('gtype', $groupType); |
|
| 48 | + ->setParameter('gtype', $groupType); |
|
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | if (null !== $excludedState) { |
| 52 | 52 | $qb->andWhere('g.state != :state') |
| 53 | - ->setParameter('state', $excludedState); |
|
| 53 | + ->setParameter('state', $excludedState); |
|
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | $query = $qb->getQuery(); |
@@ -139,7 +139,7 @@ discard block |
||
| 139 | 139 | // already another group by that name. |
| 140 | 140 | if (is_numeric($excludedGroupId) && $excludedGroupId > 0) { |
| 141 | 141 | $qb->andWhere($qb->expr()->neq('g.gid', ':ggid')) |
| 142 | - ->setParameter('ggid', $excludedGroupId); |
|
| 142 | + ->setParameter('ggid', $excludedGroupId); |
|
| 143 | 143 | } |
| 144 | 144 | |
| 145 | 145 | $query = $qb->getQuery(); |
@@ -122,7 +122,8 @@ |
||
| 122 | 122 | $form = $this->createForm(DefaultLoginType::class, ['uid' => $uid]); |
| 123 | 123 | $loginFormEvent = new LoginFormPostCreatedEvent($form); |
| 124 | 124 | $eventDispatcher->dispatch($loginFormEvent); |
| 125 | - if ($form->count() > 3) { // count > 3 means that the LoginFormPostCreatedEvent event added some form children |
|
| 125 | + if ($form->count() > 3) { |
|
| 126 | +// count > 3 means that the LoginFormPostCreatedEvent event added some form children |
|
| 126 | 127 | $form->handleRequest($request); |
| 127 | 128 | if ($form->isSubmitted() && $form->isValid()) { |
| 128 | 129 | $uid = $form->get('uid')->getData(); |
@@ -138,7 +138,7 @@ |
||
| 138 | 138 | $bag->add(['C' => 2]); |
| 139 | 139 | $bag->add(['A' => 5]); |
| 140 | 140 | $bag->add(['A' => 7]); |
| 141 | - $this->assertEquals(3, $bag->allWithWeight()['A']); // asset listed at lowest weight submitted |
|
| 141 | + $this->assertEquals(3, $bag->allWithWeight()['A']); // asset listed at lowest weight submitted |
|
| 142 | 142 | $expected = [ |
| 143 | 143 | 'B' => 1, |
| 144 | 144 | 'C' => 2, |
@@ -111,7 +111,8 @@ |
||
| 111 | 111 | return $mapping->getUid(); |
| 112 | 112 | } elseif ($passwordEncoder->isPasswordValid($mapping->getPass(), $data['pass'], null)) { |
| 113 | 113 | // new way |
| 114 | - if ($passwordEncoder->needsRehash($mapping->getPass())) { // check to update hash to newer algo |
|
| 114 | + if ($passwordEncoder->needsRehash($mapping->getPass())) { |
|
| 115 | +// check to update hash to newer algo |
|
| 115 | 116 | $this->updatePassword($mapping, $data['pass']); |
| 116 | 117 | } |
| 117 | 118 | |
