@@ -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 |
@@ -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 |
@@ -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 | /** |
@@ -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); |
@@ -131,7 +131,7 @@ discard block |
||
| 131 | 131 | * @Method("GET") |
| 132 | 132 | * @Template() |
| 133 | 133 | */ |
| 134 | - public function editAction(Group $group=null) |
|
| 134 | + public function editAction(Group $group = null) |
|
| 135 | 135 | { |
| 136 | 136 | $editForm = $this->createForm(new GroupType(), $group, array( |
| 137 | 137 | 'action' => $this->generateUrl('admin_groups_update', array('id' => $group->getId())), |
@@ -161,7 +161,7 @@ discard block |
||
| 161 | 161 | * @Method("PUT") |
| 162 | 162 | * @Template("AppBundle:Group:edit.html.twig") |
| 163 | 163 | */ |
| 164 | - public function updateAction(Request $request, Group $group=null) |
|
| 164 | + public function updateAction(Request $request, Group $group = null) |
|
| 165 | 165 | { |
| 166 | 166 | $editForm = $this->createForm(new GroupType(), $group, array( |
| 167 | 167 | 'action' => $this->generateUrl('admin_groups_update', array('id' => $group->getId())), |
@@ -195,7 +195,7 @@ discard block |
||
| 195 | 195 | * @Route("/{id}/delete", name="admin_groups_delete", requirements={"id"="\d+"}) |
| 196 | 196 | * @Method("DELETE") |
| 197 | 197 | */ |
| 198 | - public function deleteAction(Request $request, Group $group=null) |
|
| 198 | + public function deleteAction(Request $request, Group $group = null) |
|
| 199 | 199 | { |
| 200 | 200 | $form = $this->createDeleteForm($group->getId(), 'admin_groups_delete'); |
| 201 | 201 | |