@@ -70,7 +70,7 @@ |
||
70 | 70 | /** |
71 | 71 | * Test des entités |
72 | 72 | * |
73 | - * @return array |
|
73 | + * @return string|null |
|
74 | 74 | */ |
75 | 75 | private function testEntities() |
76 | 76 | { |
@@ -186,7 +186,7 @@ discard block |
||
186 | 186 | protected function setOrder($name, $field, $type = 'ASC') |
187 | 187 | { |
188 | 188 | $this->getRequest()->getSession()->set( |
189 | - 'sort.' . $name, |
|
189 | + 'sort.'.$name, |
|
190 | 190 | array('field' => $field, 'type' => $type) |
191 | 191 | ); |
192 | 192 | } |
@@ -199,7 +199,7 @@ discard block |
||
199 | 199 | { |
200 | 200 | $session = $this->getRequest()->getSession(); |
201 | 201 | |
202 | - return $session->has('sort.' . $name) ? $session->get('sort.' . $name) : null; |
|
202 | + return $session->has('sort.'.$name) ? $session->get('sort.'.$name) : null; |
|
203 | 203 | } |
204 | 204 | |
205 | 205 | /** |
@@ -210,7 +210,7 @@ discard block |
||
210 | 210 | { |
211 | 211 | $alias = current($qb->getDQLPart('from'))->getAlias(); |
212 | 212 | if (is_array($order = $this->getOrder($name))) { |
213 | - $qb->orderBy($alias . '.' . $order['field'], $order['type']); |
|
213 | + $qb->orderBy($alias.'.'.$order['field'], $order['type']); |
|
214 | 214 | } |
215 | 215 | } |
216 | 216 |
@@ -22,7 +22,7 @@ |
||
22 | 22 | if ($item->getUri() === $request->getRequestUri()) { |
23 | 23 | // URL's completely match |
24 | 24 | return true; |
25 | - } elseif ($item->getUri() !== $request->getBaseUrl() . '/' && |
|
25 | + } elseif ($item->getUri() !== $request->getBaseUrl().'/' && |
|
26 | 26 | substr($request->getRequestUri(), 0, strlen($item->getUri())) |
27 | 27 | === $item->getUri()) { |
28 | 28 | // URL isn't just "/" and the first part of the URL match |