Completed
Push — sf2.7 ( c3d5ae...a366eb )
by Laurent
03:04
created
src/AppBundle/Controller/UserController.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -216,7 +216,7 @@
 block discarded – undo
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
     {
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
     /**
Please login to merge, or discard this patch.
src/AppBundle/Entity/Settings.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -129,7 +129,7 @@
 block discarded – undo
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
      */
Please login to merge, or discard this patch.
src/AppBundle/Entity/Supplier.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
     {
Please login to merge, or discard this patch.
src/AppBundle/Form/Type/UserFilterType.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@
 block discarded – undo
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
Please login to merge, or discard this patch.
src/AppBundle/Controller/DefaultController.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@
 block discarded – undo
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
     {
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@
 block discarded – undo
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);
Please login to merge, or discard this patch.
src/AppBundle/Menu/RequestVoter.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@
 block discarded – undo
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
Please login to merge, or discard this patch.
src/AppBundle/Entity/Article.php 1 patch
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -296,7 +296,7 @@  discard block
 block discarded – undo
296 296
     /**
297 297
      * Get supplier.
298 298
      *
299
-     * @return Supplier
299
+     * @return string
300 300
      */
301 301
     public function getSupplier()
302 302
     {
@@ -320,7 +320,7 @@  discard block
 block discarded – undo
320 320
     /**
321 321
      * Get unit_storage.
322 322
      *
323
-     * @return UnitStorage
323
+     * @return string
324 324
      */
325 325
     public function getUnitStorage()
326 326
     {
@@ -357,7 +357,7 @@  discard block
 block discarded – undo
357 357
     /**
358 358
      * Get zone_storages.
359 359
      *
360
-     * @return \Doctrine\Common\Collections\Collection
360
+     * @return string
361 361
      */
362 362
     public function getZoneStorages()
363 363
     {
@@ -381,7 +381,7 @@  discard block
 block discarded – undo
381 381
     /**
382 382
      * Get family_log.
383 383
      *
384
-     * @return FamilyLog
384
+     * @return string
385 385
      */
386 386
     public function getFamilyLog()
387 387
     {
Please login to merge, or discard this patch.