@@ -15,7 +15,6 @@ |
||
15 | 15 | namespace AppBundle\Controller; |
16 | 16 | |
17 | 17 | use Symfony\Component\HttpFoundation\Request; |
18 | -use Symfony\Component\Translation\Translator; |
|
19 | 18 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; |
20 | 19 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; |
21 | 20 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
@@ -171,7 +171,7 @@ discard block |
||
171 | 171 | */ |
172 | 172 | protected function setOrder($name, $field, $type = 'ASC') |
173 | 173 | { |
174 | - $this->getRequest()->getSession()->set('sort.' . $name, array('field' => $field, 'type' => $type)); |
|
174 | + $this->getRequest()->getSession()->set('sort.'.$name, array('field' => $field, 'type' => $type)); |
|
175 | 175 | } |
176 | 176 | |
177 | 177 | /** |
@@ -182,7 +182,7 @@ discard block |
||
182 | 182 | { |
183 | 183 | $session = $this->getRequest()->getSession(); |
184 | 184 | |
185 | - return $session->has('sort.' . $name) ? $session->get('sort.' . $name) : null; |
|
185 | + return $session->has('sort.'.$name) ? $session->get('sort.'.$name) : null; |
|
186 | 186 | } |
187 | 187 | |
188 | 188 | /** |
@@ -193,7 +193,7 @@ discard block |
||
193 | 193 | { |
194 | 194 | $alias = current($qb->getDQLPart('from'))->getAlias(); |
195 | 195 | if (is_array($order = $this->getOrder($name))) { |
196 | - $qb->orderBy($alias . '.' . $order['field'], $order['type']); |
|
196 | + $qb->orderBy($alias.'.'.$order['field'], $order['type']); |
|
197 | 197 | } |
198 | 198 | } |
199 | 199 |
@@ -147,7 +147,7 @@ |
||
147 | 147 | /** |
148 | 148 | * Get familylog. |
149 | 149 | * |
150 | - * @return FamilyLog |
|
150 | + * @return string |
|
151 | 151 | */ |
152 | 152 | public function getFamilylog() |
153 | 153 | { |
@@ -249,9 +249,9 @@ |
||
249 | 249 | |
250 | 250 | public function getIndentedName() { |
251 | 251 | if ($this->parent !== null) { |
252 | - return " >> " . $this->name; |
|
252 | + return " >> ".$this->name; |
|
253 | 253 | } else { |
254 | - return "- " . $this->name; |
|
254 | + return "- ".$this->name; |
|
255 | 255 | } |
256 | 256 | } |
257 | 257 | } |