@@ -44,8 +44,8 @@ |
||
44 | 44 | // the following process should be unnecessary because cascade = all but MySQL 5.7 not working with that (#3726) |
45 | 45 | $qb = $this->_em->createQueryBuilder(); |
46 | 46 | $qb->delete('Zikula\UsersModule\Entity\UserAttributeEntity', 'a') |
47 | - ->where('a.user = :userId') |
|
48 | - ->setParameter('userId', $user->getUid()); |
|
47 | + ->where('a.user = :userId') |
|
48 | + ->setParameter('userId', $user->getUid()); |
|
49 | 49 | $query = $qb->getQuery(); |
50 | 50 | $query->execute(); |
51 | 51 | // end of theoretically unrequired process |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | 'mapped' => false, |
92 | 92 | 'required' => false |
93 | 93 | ]) |
94 | - ->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) use ($options) { |
|
94 | + ->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $event) use ($options) { |
|
95 | 95 | // ensure all display name and description exist for all locales |
96 | 96 | /** @var CategoryEntity $category */ |
97 | 97 | $category = $event->getData(); |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | |
116 | 116 | $event->setData($category); |
117 | 117 | }) |
118 | - ->addEventListener(FormEvents::SUBMIT, function (FormEvent $event) use ($options) { |
|
118 | + ->addEventListener(FormEvents::SUBMIT, function(FormEvent $event) use ($options) { |
|
119 | 119 | // ensure all locales have a display name |
120 | 120 | /** @var CategoryEntity $category */ |
121 | 121 | $category = $event->getData(); |
@@ -54,7 +54,7 @@ |
||
54 | 54 | $containsUpgrade = 'upgrade' == $routeInfo['_route']; |
55 | 55 | $containsLogin = 'Zikula\\UsersModule\\Controller\\AccessController::loginAction' == $routeInfo['_controller']; |
56 | 56 | $containsDoc = 'doc' == $routeInfo['_route']; |
57 | - $containsWdt = '_wdt' == $routeInfo['_route']; |
|
57 | + $containsWdt = '_wdt' == $routeInfo['_route']; |
|
58 | 58 | $containsProfiler = false !== strpos($routeInfo['_route'], '_profiler'); |
59 | 59 | $containsRouter = 'fos_js_routing_js' == $routeInfo['_route']; |
60 | 60 | $doNotRedirect = $containsProfiler || $containsWdt || $containsRouter || $request->isXmlHttpRequest(); |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | |
33 | 33 | if ('' != $sessionId) { |
34 | 34 | $qb->where('tbl.sesid = :sid') |
35 | - ->setParameter('sid', $sessionId); |
|
35 | + ->setParameter('sid', $sessionId); |
|
36 | 36 | } |
37 | 37 | |
38 | 38 | $query = $qb->getQuery(); |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | $i = 1; |
56 | 56 | foreach ($filters as $w_key => $w_value) { |
57 | 57 | $qb->andWhere($qb->expr()->eq('tbl.' . $w_key, '?' . $i)) |
58 | - ->setParameter($i, $w_value); |
|
58 | + ->setParameter($i, $w_value); |
|
59 | 59 | $i++; |
60 | 60 | } |
61 | 61 | } |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | |
92 | 92 | if ('' != $sessionId) { |
93 | 93 | $qb->orWhere('tbl.sesid = :sid') |
94 | - ->setParameter('sid', $sessionId); |
|
94 | + ->setParameter('sid', $sessionId); |
|
95 | 95 | } |
96 | 96 | |
97 | 97 | $query = $qb->getQuery(); |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | $qb->from('ZikulaUsersModule:UserEntity', 'u'); |
109 | 109 | $qb->andWhere($qb->expr()->eq('tbl.user', 'u.uid')); |
110 | 110 | $qb->andWhere($qb->expr()->eq('tbl.user', ':uid')) |
111 | - ->setParameter('uid', $uid); |
|
111 | + ->setParameter('uid', $uid); |
|
112 | 112 | } |
113 | 113 | } |
114 | 114 | |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | $i = 1; |
118 | 118 | foreach ($filters as $w_key => $w_value) { |
119 | 119 | $qb->andWhere($qb->expr()->eq('tbl.' . $w_key, '?' . $i)) |
120 | - ->setParameter($i, $w_value); |
|
120 | + ->setParameter($i, $w_value); |
|
121 | 121 | $i++; |
122 | 122 | } |
123 | 123 | } |
@@ -144,12 +144,12 @@ discard block |
||
144 | 144 | |
145 | 145 | if ('uid' == $fieldName) { |
146 | 146 | $qb->select('DISTINCT(u.' . $fieldName . ')') |
147 | - ->from('ZikulaUsersModule:UserEntity', 'u') |
|
148 | - ->where($qb->expr()->eq('tbl.user', 'u.uid')) |
|
149 | - ->addOrderBy('u.uname', 'ASC'); |
|
147 | + ->from('ZikulaUsersModule:UserEntity', 'u') |
|
148 | + ->where($qb->expr()->eq('tbl.user', 'u.uid')) |
|
149 | + ->addOrderBy('u.uname', 'ASC'); |
|
150 | 150 | } else { |
151 | 151 | $qb->select('DISTINCT(tbl.' . $fieldName . ')') |
152 | - ->addOrderBy('tbl.' . $fieldName, 'ASC'); |
|
152 | + ->addOrderBy('tbl.' . $fieldName, 'ASC'); |
|
153 | 153 | } |
154 | 154 | |
155 | 155 | $query = $qb->getQuery(); |
@@ -12,17 +12,15 @@ |
||
12 | 12 | |
13 | 13 | namespace Zikula\RoutesModule\Controller; |
14 | 14 | |
15 | -use Zikula\RoutesModule\Controller\Base\AbstractRouteController; |
|
16 | - |
|
17 | 15 | use RuntimeException; |
18 | - |
|
19 | 16 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; |
20 | 17 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
21 | 18 | use Symfony\Component\HttpFoundation\Request; |
22 | -use Symfony\Component\Security\Core\Exception\AccessDeniedException; |
|
23 | 19 | use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; |
24 | -use Zikula\ThemeModule\Engine\Annotation\Theme; |
|
20 | +use Symfony\Component\Security\Core\Exception\AccessDeniedException; |
|
21 | +use Zikula\RoutesModule\Controller\Base\AbstractRouteController; |
|
25 | 22 | use Zikula\RoutesModule\Entity\RouteEntity; |
23 | +use Zikula\ThemeModule\Engine\Annotation\Theme; |
|
26 | 24 | |
27 | 25 | /** |
28 | 26 | * Route controller class providing navigation and interaction functionality. |
@@ -97,7 +97,7 @@ |
||
97 | 97 | |
98 | 98 | /** |
99 | 99 | * Instances where final number is even will have permission (e.g. '1::2' is true, but '1::3' is false) |
100 | - * @return \PHPUnit_Framework_MockObject_MockObject |
|
100 | + * @return PermissionApiInterface |
|
101 | 101 | */ |
102 | 102 | private function createEvenPermissionApi() |
103 | 103 | { |