@@ -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 | { |
@@ -192,7 +192,7 @@ discard block |
||
192 | 192 | */ |
193 | 193 | protected function setOrder($name, $field, $type = 'ASC') |
194 | 194 | { |
195 | - $this->getRequest()->getSession()->set('sort.' . $name, array('field' => $field, 'type' => $type)); |
|
195 | + $this->getRequest()->getSession()->set('sort.'.$name, array('field' => $field, 'type' => $type)); |
|
196 | 196 | } |
197 | 197 | |
198 | 198 | /** |
@@ -203,7 +203,7 @@ discard block |
||
203 | 203 | { |
204 | 204 | $session = $this->getRequest()->getSession(); |
205 | 205 | |
206 | - return $session->has('sort.' . $name) ? $session->get('sort.' . $name) : null; |
|
206 | + return $session->has('sort.'.$name) ? $session->get('sort.'.$name) : null; |
|
207 | 207 | } |
208 | 208 | |
209 | 209 | /** |
@@ -214,7 +214,7 @@ discard block |
||
214 | 214 | { |
215 | 215 | $alias = current($qb->getDQLPart('from'))->getAlias(); |
216 | 216 | if (is_array($order = $this->getOrder($name))) { |
217 | - $qb->orderBy($alias . '.' . $order['field'], $order['type']); |
|
217 | + $qb->orderBy($alias.'.'.$order['field'], $order['type']); |
|
218 | 218 | } |
219 | 219 | } |
220 | 220 | |
@@ -238,11 +238,11 @@ discard block |
||
238 | 238 | $url = $this->generateUrl($route ?: $name, is_null($params) ? array() : $params); |
239 | 239 | if (isset($request)) { |
240 | 240 | if ($request->query->has('submit-filter') && $form->handleRequest($request)->isValid()) { |
241 | - $request->getSession()->set('filter.' . $name, $request->query->get($form->getName())); |
|
241 | + $request->getSession()->set('filter.'.$name, $request->query->get($form->getName())); |
|
242 | 242 | |
243 | 243 | return $this->redirect($url); |
244 | 244 | } elseif ($request->query->has('reset-filter')) { |
245 | - $request->getSession()->set('filter.' . $name, null); |
|
245 | + $request->getSession()->set('filter.'.$name, null); |
|
246 | 246 | |
247 | 247 | return $this->redirect($url); |
248 | 248 | } |
@@ -278,7 +278,7 @@ discard block |
||
278 | 278 | */ |
279 | 279 | protected function getFilter($name) |
280 | 280 | { |
281 | - return $this->getRequest()->getSession()->get('filter.' . $name); |
|
281 | + return $this->getRequest()->getSession()->get('filter.'.$name); |
|
282 | 282 | } |
283 | 283 | |
284 | 284 | /** |
@@ -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; |
@@ -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 |
@@ -1,17 +1,17 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * UserFilterType Form properties. |
|
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 | + * UserFilterType Form properties. |
|
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\Form\Type; |
16 | 16 | |
17 | 17 | use Symfony\Component\Form\AbstractType; |
@@ -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; |
@@ -19,8 +19,6 @@ |
||
19 | 19 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; |
20 | 20 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
21 | 21 | use Symfony\Component\HttpFoundation\Response; |
22 | -use Symfony\Component\HttpFoundation\Request; |
|
23 | - |
|
24 | 22 | use AppBundle\Form\Type\SubFamilyLogType; |
25 | 23 | |
26 | 24 | /** |
@@ -49,7 +49,7 @@ |
||
49 | 49 | $subFamId = ''; |
50 | 50 | $famLogId = $request->get('id'); |
51 | 51 | $subFamId = $request->get('id2'); |
52 | - if ($famLogId != '') { |
|
52 | + if ($famLogId != '') { |
|
53 | 53 | $subFamilyLogs = $etm |
54 | 54 | ->getRepository('GlsrGestockBundle:subFamilyLog') |
55 | 55 | ->getFromFamilyLog($famLogId); |
@@ -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 |
@@ -1,17 +1,17 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * RequestVoter KnpMenu. |
|
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 | + * RequestVoter KnpMenu. |
|
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\Menu; |
16 | 16 | |
17 | 17 | use Knp\Menu\ItemInterface; |
@@ -1,17 +1,17 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * TvaType Form properties. |
|
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 | + * TvaType Form properties. |
|
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\Form\Type; |
16 | 16 | |
17 | 17 | use Symfony\Component\Form\AbstractType; |
@@ -1,17 +1,17 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * UnitStorageType Form properties. |
|
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 | + * UnitStorageType Form properties. |
|
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\Form\Type; |
16 | 16 | |
17 | 17 | use Symfony\Component\Form\AbstractType; |