@@ -186,7 +186,7 @@ |
||
186 | 186 | } |
187 | 187 | |
188 | 188 | /** |
189 | - * @param QueryBuilder $qb |
|
189 | + * @param \Doctrine\ORM\QueryBuilder $qb |
|
190 | 190 | * @param string $name |
191 | 191 | */ |
192 | 192 | protected function addQueryBuilderSort(\Doctrine\ORM\QueryBuilder $qb, $name) |
@@ -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 |
@@ -1,17 +1,17 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * SubFamilyLogController controller des sous-familles logistiques. |
|
4 | - * |
|
5 | - * PHP Version 5 |
|
6 | - * |
|
7 | - * @author Quétier Laurent <[email protected]> |
|
8 | - * @copyright 2014 Dev-Int GLSR |
|
9 | - * @license http://opensource.org/licenses/gpl-license.php GNU Public License |
|
10 | - * |
|
11 | - * @version since 1.0.0 |
|
12 | - * |
|
13 | - * @link https://github.com/Dev-Int/glsr |
|
14 | - */ |
|
3 | + * SubFamilyLogController controller des sous-familles logistiques. |
|
4 | + * |
|
5 | + * PHP Version 5 |
|
6 | + * |
|
7 | + * @author Quétier Laurent <[email protected]> |
|
8 | + * @copyright 2014 Dev-Int GLSR |
|
9 | + * @license http://opensource.org/licenses/gpl-license.php GNU Public License |
|
10 | + * |
|
11 | + * @version since 1.0.0 |
|
12 | + * |
|
13 | + * @link https://github.com/Dev-Int/glsr |
|
14 | + */ |
|
15 | 15 | namespace AppBundle\Controller\Settings\Divers; |
16 | 16 | |
17 | 17 | use Symfony\Component\HttpFoundation\Request; |
@@ -216,7 +216,7 @@ |
||
216 | 216 | * @param string $name route/entity name |
217 | 217 | * @param string $route route name, if different from entity name |
218 | 218 | * @param array $params possible route parameters |
219 | - * @return Response |
|
219 | + * @return \Symfony\Component\HttpFoundation\RedirectResponse|null |
|
220 | 220 | */ |
221 | 221 | protected function saveFilter(FormInterface $form, $name, $route = null, array $params = null) |
222 | 222 | { |
@@ -183,7 +183,7 @@ discard block |
||
183 | 183 | */ |
184 | 184 | protected function setOrder($name, $field, $type = 'ASC') |
185 | 185 | { |
186 | - $this->getRequest()->getSession()->set('sort.' . $name, array('field' => $field, 'type' => $type)); |
|
186 | + $this->getRequest()->getSession()->set('sort.'.$name, array('field' => $field, 'type' => $type)); |
|
187 | 187 | } |
188 | 188 | |
189 | 189 | /** |
@@ -194,7 +194,7 @@ discard block |
||
194 | 194 | { |
195 | 195 | $session = $this->getRequest()->getSession(); |
196 | 196 | |
197 | - return $session->has('sort.' . $name) ? $session->get('sort.' . $name) : null; |
|
197 | + return $session->has('sort.'.$name) ? $session->get('sort.'.$name) : null; |
|
198 | 198 | } |
199 | 199 | |
200 | 200 | /** |
@@ -205,7 +205,7 @@ discard block |
||
205 | 205 | { |
206 | 206 | $alias = current($qb->getDQLPart('from'))->getAlias(); |
207 | 207 | if (is_array($order = $this->getOrder($name))) { |
208 | - $qb->orderBy($alias . '.' . $order['field'], $order['type']); |
|
208 | + $qb->orderBy($alias.'.'.$order['field'], $order['type']); |
|
209 | 209 | } |
210 | 210 | } |
211 | 211 | |
@@ -223,11 +223,11 @@ discard block |
||
223 | 223 | $request = $this->getRequest(); |
224 | 224 | $url = $this->generateUrl($route ?: $name, is_null($params) ? array() : $params); |
225 | 225 | if ($request->query->has('submit-filter') && $form->handleRequest($request)->isValid()) { |
226 | - $request->getSession()->set('filter.' . $name, $request->query->get($form->getName())); |
|
226 | + $request->getSession()->set('filter.'.$name, $request->query->get($form->getName())); |
|
227 | 227 | |
228 | 228 | return $this->redirect($url); |
229 | 229 | } elseif ($request->query->has('reset-filter')) { |
230 | - $request->getSession()->set('filter.' . $name, null); |
|
230 | + $request->getSession()->set('filter.'.$name, null); |
|
231 | 231 | |
232 | 232 | return $this->redirect($url); |
233 | 233 | } |
@@ -262,7 +262,7 @@ discard block |
||
262 | 262 | */ |
263 | 263 | protected function getFilter($name) |
264 | 264 | { |
265 | - return $this->getRequest()->getSession()->get('filter.' . $name); |
|
265 | + return $this->getRequest()->getSession()->get('filter.'.$name); |
|
266 | 266 | } |
267 | 267 | |
268 | 268 | /** |
@@ -1,17 +1,17 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * UserController controller des utilisateurs. |
|
4 | - * |
|
5 | - * PHP Version 5 |
|
6 | - * |
|
7 | - * @author Quétier Laurent <[email protected]> |
|
8 | - * @copyright 2014 Dev-Int GLSR |
|
9 | - * @license http://opensource.org/licenses/gpl-license.php GNU Public License |
|
10 | - * |
|
11 | - * @version since 1.0.0 |
|
12 | - * |
|
13 | - * @link https://github.com/Dev-Int/glsr |
|
14 | - */ |
|
3 | + * UserController controller des utilisateurs. |
|
4 | + * |
|
5 | + * PHP Version 5 |
|
6 | + * |
|
7 | + * @author Quétier Laurent <[email protected]> |
|
8 | + * @copyright 2014 Dev-Int GLSR |
|
9 | + * @license http://opensource.org/licenses/gpl-license.php GNU Public License |
|
10 | + * |
|
11 | + * @version since 1.0.0 |
|
12 | + * |
|
13 | + * @link https://github.com/Dev-Int/glsr |
|
14 | + */ |
|
15 | 15 | namespace AppBundle\Controller; |
16 | 16 | |
17 | 17 | use Symfony\Component\HttpFoundation\Request; |
@@ -332,7 +332,7 @@ discard block |
||
332 | 332 | /** |
333 | 333 | * Get supplier. |
334 | 334 | * |
335 | - * @return Supplier |
|
335 | + * @return string |
|
336 | 336 | */ |
337 | 337 | public function getSupplier() |
338 | 338 | { |
@@ -356,7 +356,7 @@ discard block |
||
356 | 356 | /** |
357 | 357 | * Get unit_storage. |
358 | 358 | * |
359 | - * @return UnitStorage |
|
359 | + * @return string |
|
360 | 360 | */ |
361 | 361 | public function getUnitStorage() |
362 | 362 | { |
@@ -393,7 +393,7 @@ discard block |
||
393 | 393 | /** |
394 | 394 | * Get zone_storages. |
395 | 395 | * |
396 | - * @return \Doctrine\Common\Collections\Collection |
|
396 | + * @return string |
|
397 | 397 | */ |
398 | 398 | public function getZoneStorages() |
399 | 399 | { |
@@ -417,7 +417,7 @@ discard block |
||
417 | 417 | /** |
418 | 418 | * Get family_log. |
419 | 419 | * |
420 | - * @return FamilyLog |
|
420 | + * @return string |
|
421 | 421 | */ |
422 | 422 | public function getFamilyLog() |
423 | 423 | { |
@@ -441,7 +441,7 @@ discard block |
||
441 | 441 | /** |
442 | 442 | * Get sub_family_log. |
443 | 443 | * |
444 | - * @return SubFamilyLog |
|
444 | + * @return string |
|
445 | 445 | */ |
446 | 446 | public function getSubFamilyLog() |
447 | 447 | { |
@@ -129,7 +129,7 @@ |
||
129 | 129 | /** |
130 | 130 | * Set first_inventory. |
131 | 131 | * |
132 | - * @param datetime $firstInventory Date du premier inventaire |
|
132 | + * @param \DateTime $firstInventory Date du premier inventaire |
|
133 | 133 | * |
134 | 134 | * @return Settings |
135 | 135 | */ |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | /** |
151 | 151 | * Get family_log. |
152 | 152 | * |
153 | - * @return FamilyLog |
|
153 | + * @return string |
|
154 | 154 | */ |
155 | 155 | public function getFamilyLog() |
156 | 156 | { |
@@ -174,7 +174,7 @@ discard block |
||
174 | 174 | /** |
175 | 175 | * Get sub_family_log. |
176 | 176 | * |
177 | - * @return SubFamilyLog |
|
177 | + * @return string |
|
178 | 178 | */ |
179 | 179 | public function getSubFamilyLog() |
180 | 180 | { |
@@ -94,8 +94,8 @@ |
||
94 | 94 | } |
95 | 95 | |
96 | 96 | /** |
97 | - * @depends testCreate |
|
98 | - */ |
|
97 | + * @depends testCreate |
|
98 | + */ |
|
99 | 99 | |
100 | 100 | public function testSort() { |
101 | 101 | $client = static::createClient(); |
@@ -22,7 +22,7 @@ |
||
22 | 22 | 'class' => 'AppBundle\Entity\Group', |
23 | 23 | 'expanded' => true, |
24 | 24 | 'multiple' => true, |
25 | - 'apply_filter' => function (QueryInterface $filterQuery, $field, $values) { |
|
25 | + 'apply_filter' => function(QueryInterface $filterQuery, $field, $values) { |
|
26 | 26 | $query = $filterQuery->getQueryBuilder(); |
27 | 27 | $query->leftJoin($field, 'm'); |
28 | 28 | // Filter results using orWhere matching ID |
@@ -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 | { |
@@ -1,17 +1,17 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * DefaultController controller de l'application GLSR. |
|
4 | - * |
|
5 | - * PHP Version 5 |
|
6 | - * |
|
7 | - * @author Quétier Laurent <[email protected]> |
|
8 | - * @copyright 2014 Dev-Int GLSR |
|
9 | - * @license http://opensource.org/licenses/gpl-license.php GNU Public License |
|
10 | - * |
|
11 | - * @version since 1.0.0 |
|
12 | - * |
|
13 | - * @link https://github.com/Dev-Int/glsr |
|
14 | - */ |
|
3 | + * DefaultController controller de l'application GLSR. |
|
4 | + * |
|
5 | + * PHP Version 5 |
|
6 | + * |
|
7 | + * @author Quétier Laurent <[email protected]> |
|
8 | + * @copyright 2014 Dev-Int GLSR |
|
9 | + * @license http://opensource.org/licenses/gpl-license.php GNU Public License |
|
10 | + * |
|
11 | + * @version since 1.0.0 |
|
12 | + * |
|
13 | + * @link https://github.com/Dev-Int/glsr |
|
14 | + */ |
|
15 | 15 | namespace AppBundle\Controller; |
16 | 16 | |
17 | 17 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; |
@@ -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 |