@@ -235,7 +235,7 @@ |
||
235 | 235 | * @param string $entityName Name of Entity |
236 | 236 | * @param string $prefixRoute Prefix of Route |
237 | 237 | * |
238 | - * @return array |
|
238 | + * @return \Symfony\Component\HttpFoundation\RedirectResponse |
|
239 | 239 | */ |
240 | 240 | public function abstractDeleteWithArticlesAction($entity, Request $request, $entityName, $prefixRoute) |
241 | 241 | { |
@@ -373,15 +373,15 @@ |
||
373 | 373 | { |
374 | 374 | $roles = ['ROLE_ADMIN', 'ROLE_SUPER_ADMIN']; |
375 | 375 | switch ($entityName) { |
376 | - case 'Settings\Diverse\FamilyLog': |
|
377 | - $entities = $etm->getRepository('AppBundle:'.$entityName)->childrenHierarchy(); |
|
378 | - break; |
|
379 | - default: |
|
380 | - if ($this->getUser() !== null && in_array($this->getUser()->getRoles()[0], $roles)) { |
|
381 | - $entities = $etm->getRepository('AppBundle:'.$entityName)->getAllItems(); |
|
382 | - } else { |
|
383 | - $entities = $etm->getRepository('AppBundle:'.$entityName)->getItems(); |
|
384 | - } |
|
376 | + case 'Settings\Diverse\FamilyLog': |
|
377 | + $entities = $etm->getRepository('AppBundle:'.$entityName)->childrenHierarchy(); |
|
378 | + break; |
|
379 | + default: |
|
380 | + if ($this->getUser() !== null && in_array($this->getUser()->getRoles()[0], $roles)) { |
|
381 | + $entities = $etm->getRepository('AppBundle:'.$entityName)->getAllItems(); |
|
382 | + } else { |
|
383 | + $entities = $etm->getRepository('AppBundle:'.$entityName)->getItems(); |
|
384 | + } |
|
385 | 385 | } |
386 | 386 | return $entities; |
387 | 387 | } |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | $entities = $this->getEntity($entityName, $etm); |
45 | 45 | $qbd = $etm->createQueryBuilder(); |
46 | 46 | $qbd->select('count(entity.id)'); |
47 | - $qbd->from('AppBundle:' . $entityName, 'entity'); |
|
47 | + $qbd->from('AppBundle:'.$entityName, 'entity'); |
|
48 | 48 | $ctEntity = $qbd->getQuery()->getSingleScalarResult(); |
49 | 49 | |
50 | 50 | if ($request !== null && is_array($entities) === false && $entities !== null) { |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | $paginator = $this->get('knp_paginator')->paginate($entities, $request->query->get('page', 1), $item); |
54 | 54 | } |
55 | 55 | |
56 | - return ['entities' => $entities, 'ctEntity' => $ctEntity, 'paginator' => $paginator,]; |
|
56 | + return ['entities' => $entities, 'ctEntity' => $ctEntity, 'paginator' => $paginator, ]; |
|
57 | 57 | } |
58 | 58 | |
59 | 59 | /** |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | { |
69 | 69 | $deleteForm = $this->createDeleteForm($entity->getId(), $prefixRoute.'_delete'); |
70 | 70 | |
71 | - return [$prefixRoute => $entity, 'delete_form' => $deleteForm->createView(),]; |
|
71 | + return [$prefixRoute => $entity, 'delete_form' => $deleteForm->createView(), ]; |
|
72 | 72 | } |
73 | 73 | |
74 | 74 | /** |
@@ -93,12 +93,12 @@ discard block |
||
93 | 93 | } |
94 | 94 | if ($entityName !== 'Settings\Company' || $entityName !== 'Settings\Settings') { |
95 | 95 | $entityNew = $etm->getClassMetadata($entityPath)->newInstance(); |
96 | - $form = $this->createForm($typePath, $entityNew, ['action' => $this->generateUrl($prefixRoute.'_create'),]); |
|
96 | + $form = $this->createForm($typePath, $entityNew, ['action' => $this->generateUrl($prefixRoute.'_create'), ]); |
|
97 | 97 | |
98 | 98 | if ($entityName === 'Staff\Group') { |
99 | 99 | $this->addRolesAction($form, $entityNew); |
100 | 100 | } |
101 | - $return = [strtolower($entityName) => $entityNew, 'form' => $form->createView(),]; |
|
101 | + $return = [strtolower($entityName) => $entityNew, 'form' => $form->createView(), ]; |
|
102 | 102 | } |
103 | 103 | |
104 | 104 | return $return; |
@@ -119,12 +119,12 @@ discard block |
||
119 | 119 | { |
120 | 120 | $etm = $this->getDoctrine()->getManager(); |
121 | 121 | $entityNew = $etm->getClassMetadata($entityPath)->newInstance(); |
122 | - $form = $this->createForm($typePath, $entityNew, ['action' => $this->generateUrl($prefixRoute.'_create'),]); |
|
122 | + $form = $this->createForm($typePath, $entityNew, ['action' => $this->generateUrl($prefixRoute.'_create'), ]); |
|
123 | 123 | if ($entityName === 'Staff\Group') { |
124 | 124 | $this->addRolesAction($form, $entityNew); |
125 | 125 | } |
126 | 126 | $form->handleRequest($request); |
127 | - $return = [$entityName => $entityNew, 'form' => $form->createView(),]; |
|
127 | + $return = [$entityName => $entityNew, 'form' => $form->createView(), ]; |
|
128 | 128 | |
129 | 129 | if ($form->isValid()) { |
130 | 130 | $etm = $this->getDoctrine()->getManager(); |
@@ -167,7 +167,7 @@ discard block |
||
167 | 167 | $deleteForm = $this->createDeleteForm($entity->getId(), $prefixRoute.'_delete'); |
168 | 168 | |
169 | 169 | return [$prefixRoute => $entity, 'edit_form' => $editForm->createView(), |
170 | - 'delete_form' => $deleteForm->createView(),]; |
|
170 | + 'delete_form' => $deleteForm->createView(), ]; |
|
171 | 171 | } |
172 | 172 | |
173 | 173 | /** |
@@ -196,7 +196,7 @@ discard block |
||
196 | 196 | $deleteForm = $this->createDeleteForm($entity->getId(), $prefixRoute.'_delete'); |
197 | 197 | |
198 | 198 | $return = [$prefixRoute => $entity, 'edit_form' => $editForm->createView(), |
199 | - 'delete_form' => $deleteForm->createView(),]; |
|
199 | + 'delete_form' => $deleteForm->createView(), ]; |
|
200 | 200 | |
201 | 201 | if ($editForm->isValid()) { |
202 | 202 | $this->getDoctrine()->getManager()->flush(); |
@@ -240,9 +240,9 @@ discard block |
||
240 | 240 | public function abstractDeleteWithArticlesAction($entity, Request $request, $entityName, $prefixRoute) |
241 | 241 | { |
242 | 242 | $etm = $this->getDoctrine()->getManager(); |
243 | - $form = $this->createDeleteForm($entity->getId(), $prefixRoute . '_delete'); |
|
243 | + $form = $this->createDeleteForm($entity->getId(), $prefixRoute.'_delete'); |
|
244 | 244 | $entityArticles = $etm |
245 | - ->getRepository('AppBundle:' . $entityName . 'Articles') |
|
245 | + ->getRepository('AppBundle:'.$entityName.'Articles') |
|
246 | 246 | ->findBy([$prefixRoute => $entity->getId()]); |
247 | 247 | |
248 | 248 | if ($form->handleRequest($request)->isValid()) { |
@@ -278,7 +278,7 @@ discard block |
||
278 | 278 | if ($name === $order['entity']) { |
279 | 279 | $alias = current($qbd->getDQLPart('from'))->getAlias(); |
280 | 280 | } |
281 | - $qbd->orderBy($alias . '.' . $order['field'], $order['type']); |
|
281 | + $qbd->orderBy($alias.'.'.$order['field'], $order['type']); |
|
282 | 282 | } |
283 | 283 | } |
284 | 284 | |
@@ -308,7 +308,7 @@ discard block |
||
308 | 308 | */ |
309 | 309 | protected function testReturnParam($entity, $prefixRoute) |
310 | 310 | { |
311 | - $entityArray = ['article', 'supplier', 'familylog', 'zonestorage', 'unit', 'material',]; |
|
311 | + $entityArray = ['article', 'supplier', 'familylog', 'zonestorage', 'unit', 'material', ]; |
|
312 | 312 | if (in_array($prefixRoute, $entityArray, true)) { |
313 | 313 | $param = ['slug' => $entity->getSlug()]; |
314 | 314 | } |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | $tvaMoyen = $this->getReference('tva2'); |
76 | 76 | $tvaLuxe = $this->getReference('tva3'); |
77 | 77 | // Datas des articles |
78 | - $datas =[ |
|
78 | + $datas = [ |
|
79 | 79 | ['name' => 'Salade', 'supplier' => $davifrais, |
80 | 80 | 'familyLog' => $fruitLegumesFrais, 'zoneStorage' => $zoneFrais, |
81 | 81 | 'unitStorage' => $piece, 'unitWorking' => $kilogramme, 'price' => 2.99, |
@@ -147,17 +147,17 @@ discard block |
||
147 | 147 | |
148 | 148 | $manager->persist($article); |
149 | 149 | $order = $key + 1; |
150 | - $this->addReference('article' . $order, $article); |
|
150 | + $this->addReference('article'.$order, $article); |
|
151 | 151 | |
152 | 152 | $material = new Material(); |
153 | 153 | $material->setName($data['name']) |
154 | 154 | ->setUnitWorking($data['unitWorking']) |
155 | - ->addArticle($this->getReference('article' . $order)) |
|
155 | + ->addArticle($this->getReference('article'.$order)) |
|
156 | 156 | ->setMultiple(0) |
157 | 157 | ->setActive(1); |
158 | 158 | |
159 | 159 | $manager->persist($material); |
160 | - $this->addReference('material' . $order, $material); |
|
160 | + $this->addReference('material'.$order, $material); |
|
161 | 161 | } |
162 | 162 | |
163 | 163 | $manager->flush(); |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | $sec = $this->getReference('family-log5'); |
44 | 44 | $boissons = $this->getReference('family-log6'); |
45 | 45 | // Datas des suppliers |
46 | - $datas =[ |
|
46 | + $datas = [ |
|
47 | 47 | ['name' => 'Davigel', 'address' => '12, rue du gel', 'zipCode' => 75001, |
48 | 48 | 'town' => 'Paris', 'phone' => $phoneUtil->parse('0140000001', "FR"), |
49 | 49 | 'fax' => $phoneUtil->parse('0140000001', "FR"), |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | |
90 | 90 | $manager->persist($supplier); |
91 | 91 | $order = $key + 1; |
92 | - $this->addReference('supplier' . $order, $supplier); |
|
92 | + $this->addReference('supplier'.$order, $supplier); |
|
93 | 93 | } |
94 | 94 | |
95 | 95 | $manager->flush(); |
@@ -47,16 +47,16 @@ |
||
47 | 47 | if ($ctEntity > 0 && $request->getMethod() == 'GET' && is_numeric($number) && $number < 5) { |
48 | 48 | $message = 'gestock.install.st'.$number.'.yet_exist'; |
49 | 49 | } |
50 | - $form = $this->createForm($typePath, $entityNew, ['action' => $this->generateUrl('gs_install_st'.$number),]); |
|
50 | + $form = $this->createForm($typePath, $entityNew, ['action' => $this->generateUrl('gs_install_st'.$number), ]); |
|
51 | 51 | if ($entityName === 'Staff\Group') { |
52 | 52 | $this->addRolesAction($form, $entityNew); |
53 | 53 | } |
54 | 54 | if (is_int($number)) { |
55 | - $return = ['message' => $message, 'form' => $form->createView(),]; |
|
55 | + $return = ['message' => $message, 'form' => $form->createView(), ]; |
|
56 | 56 | } else { |
57 | 57 | $return = ['message' => $message, |
58 | 58 | $this->nameToVariable($entityName) => $entityNew, |
59 | - 'form' => $form->createView(),]; |
|
59 | + 'form' => $form->createView(), ]; |
|
60 | 60 | } |
61 | 61 | if ($entityName === 'Settings\Diverse\Material') { |
62 | 62 | $articles = $etm->getRepository('AppBundle:Settings\Article')->findAll(); |
@@ -254,7 +254,7 @@ |
||
254 | 254 | { |
255 | 255 | $return = ''; |
256 | 256 | if ($this->parent !== null) { |
257 | - for ($i=2; $i <= $this->level; $i++) { |
|
257 | + for ($i = 2; $i <= $this->level; $i++) { |
|
258 | 258 | $return .= '|- -'; |
259 | 259 | } |
260 | 260 | $return .= $this->name; |