Completed
Pull Request — 2.x (#5811)
by
unknown
17:25
created
Command/GenerateAdminCommand.php 1 patch
Doc Comments   +5 added lines patch added patch discarded remove patch
@@ -291,6 +291,11 @@
 block discarded – undo
291 291
         return $questionHelper->ask($input, $output, $question);
292 292
     }
293 293
 
294
+    /**
295
+     * @param string $questionText
296
+     * @param string $default
297
+     * @param string $separator
298
+     */
294 299
     private function askConfirmation(InputInterface $input, OutputInterface $output, $questionText, $default, $separator)
295 300
     {
296 301
         $questionHelper = $this->getQuestionHelper();
Please login to merge, or discard this patch.
Controller/CoreController.php 1 patch
Doc Comments   -2 removed lines patch added patch discarded remove patch
@@ -37,7 +37,6 @@  discard block
 block discarded – undo
37 37
     }
38 38
 
39 39
     /**
40
-     * @param Request $request
41 40
      *
42 41
      * @return string
43 42
      */
@@ -51,7 +50,6 @@  discard block
 block discarded – undo
51 50
     }
52 51
 
53 52
     /**
54
-     * @param Request $request
55 53
      *
56 54
      * @return Response
57 55
      */
Please login to merge, or discard this patch.
Controller/CRUDController.php 1 patch
Doc Comments   +10 added lines, -19 removed lines patch added patch discarded remove patch
@@ -175,6 +175,7 @@  discard block
 block discarded – undo
175 175
 
176 176
     /**
177 177
      * {@inheritdoc}
178
+     * @param null|string $view
178 179
      */
179 180
     public function render($view, array $parameters = array(), Response $response = null)
180 181
     {
@@ -191,6 +192,9 @@  discard block
 block discarded – undo
191 192
         return parent::render($view, $parameters, $response);
192 193
     }
193 194
 
195
+    /**
196
+     * @param ModelManagerException $e
197
+     */
194 198
     private function logModelManagerException($e)
195 199
     {
196 200
         $context = array('exception' => $e);
@@ -260,7 +264,7 @@  discard block
 block discarded – undo
260 264
     /**
261 265
      * Delete action.
262 266
      *
263
-     * @param int|string|null $id
267
+     * @param integer $id
264 268
      *
265 269
      * @return Response|RedirectResponse
266 270
      *
@@ -429,7 +433,6 @@  discard block
 block discarded – undo
429 433
      * Redirect the user depend on this choice.
430 434
      *
431 435
      * @param object  $object
432
-     * @param Request $request
433 436
      *
434 437
      * @return RedirectResponse
435 438
      */
@@ -468,7 +471,6 @@  discard block
 block discarded – undo
468 471
     /**
469 472
      * Batch action.
470 473
      *
471
-     * @param Request $request
472 474
      *
473 475
      * @return Response|RedirectResponse
474 476
      *
@@ -582,7 +584,6 @@  discard block
 block discarded – undo
582 584
     /**
583 585
      * Create action.
584 586
      *
585
-     * @param Request $request
586 587
      *
587 588
      * @return Response
588 589
      *
@@ -679,7 +680,6 @@  discard block
 block discarded – undo
679 680
     /**
680 681
      * Returns true if the preview is requested to be shown.
681 682
      *
682
-     * @param Request $request
683 683
      *
684 684
      * @return bool
685 685
      */
@@ -693,7 +693,6 @@  discard block
 block discarded – undo
693 693
     /**
694 694
      * Returns true if the preview has been approved.
695 695
      *
696
-     * @param Request $request
697 696
      *
698 697
      * @return bool
699 698
      */
@@ -710,7 +709,6 @@  discard block
 block discarded – undo
710 709
      * That means either a preview is requested or the preview has already been shown
711 710
      * and it got approved/declined.
712 711
      *
713
-     * @param Request $request
714 712
      *
715 713
      * @return bool
716 714
      */
@@ -725,7 +723,6 @@  discard block
 block discarded – undo
725 723
     /**
726 724
      * Returns true if the preview has been declined.
727 725
      *
728
-     * @param Request $request
729 726
      *
730 727
      * @return bool
731 728
      */
@@ -740,7 +737,6 @@  discard block
 block discarded – undo
740 737
      * Show action.
741 738
      *
742 739
      * @param int|string|null $id
743
-     * @param Request         $request
744 740
      *
745 741
      * @return Response
746 742
      *
@@ -775,7 +771,6 @@  discard block
 block discarded – undo
775 771
      * Show history revisions for object.
776 772
      *
777 773
      * @param int|string|null $id
778
-     * @param Request         $request
779 774
      *
780 775
      * @return Response
781 776
      *
@@ -823,9 +818,8 @@  discard block
 block discarded – undo
823 818
     /**
824 819
      * View history revision of object.
825 820
      *
826
-     * @param int|string|null $id
821
+     * @param null|integer $id
827 822
      * @param string|null     $revision
828
-     * @param Request         $request
829 823
      *
830 824
      * @return Response
831 825
      *
@@ -886,10 +880,9 @@  discard block
 block discarded – undo
886 880
     /**
887 881
      * Compare history revisions of object.
888 882
      *
889
-     * @param int|string|null $id
890
-     * @param int|string|null $base_revision
891
-     * @param int|string|null $compare_revision
892
-     * @param Request         $request
883
+     * @param null|integer $id
884
+     * @param null|integer $base_revision
885
+     * @param null|integer $compare_revision
893 886
      *
894 887
      * @return Response
895 888
      *
@@ -963,7 +956,7 @@  discard block
 block discarded – undo
963 956
     /**
964 957
      * Export data to specified format.
965 958
      *
966
-     * @param Request $reques
959
+     * @param Request $request
967 960
      *
968 961
      * @return Response
969 962
      *
@@ -1030,7 +1023,6 @@  discard block
 block discarded – undo
1030 1023
      * Returns the Response object associated to the acl action.
1031 1024
      *
1032 1025
      * @param int|string|null $id
1033
-     * @param Request         $request
1034 1026
      *
1035 1027
      * @return Response|RedirectResponse
1036 1028
      *
@@ -1108,7 +1100,6 @@  discard block
 block discarded – undo
1108 1100
      * Validate CSRF token for action without form.
1109 1101
      *
1110 1102
      * @param string  $intention
1111
-     * @param Request $request
1112 1103
      *
1113 1104
      * @throws HttpException
1114 1105
      */
Please login to merge, or discard this patch.
Controller/HelperController.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -428,7 +428,7 @@
 block discarded – undo
428 428
      * @param AdminInterface $admin
429 429
      * @param string         $field
430 430
      *
431
-     * @return \Symfony\Component\Form\FormInterface
431
+     * @return \Sonata\AdminBundle\Admin\FieldDescriptionInterface
432 432
      *
433 433
      * @throws \RuntimeException
434 434
      */
Please login to merge, or discard this patch.
Datagrid/DatagridMapper.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -114,7 +114,7 @@
 block discarded – undo
114 114
     /**
115 115
      * @param array $keys field names
116 116
      *
117
-     * @return \Sonata\AdminBundle\Datagrid\ListMapper
117
+     * @return DatagridMapper
118 118
      */
119 119
     public function reorder(array $keys)
120 120
     {
Please login to merge, or discard this patch.
Datagrid/Pager.php 1 patch
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
     /**
59 59
      * Returns the current pager's max record limit.
60 60
      *
61
-     * @return int
61
+     * @return boolean
62 62
      */
63 63
     public function getMaxRecordLimit()
64 64
     {
@@ -407,7 +407,7 @@  discard block
 block discarded – undo
407 407
      * Returns a parameter.
408 408
      *
409 409
      * @param string $name
410
-     * @param mixed  $default
410
+     * @param null|string  $default
411 411
      *
412 412
      * @return mixed
413 413
      */
@@ -432,7 +432,7 @@  discard block
 block discarded – undo
432 432
      * Sets a parameter.
433 433
      *
434 434
      * @param string $name
435
-     * @param mixed  $value
435
+     * @param string  $value
436 436
      */
437 437
     public function setParameter($name, $value)
438 438
     {
@@ -571,7 +571,7 @@  discard block
 block discarded – undo
571 571
     }
572 572
 
573 573
     /**
574
-     * @param array $countColumn
574
+     * @param string[] $countColumn
575 575
      *
576 576
      * @return array
577 577
      */
Please login to merge, or discard this patch.
Tests/Admin/PoolTest.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -253,7 +253,7 @@
 block discarded – undo
253 253
     }
254 254
 
255 255
     /**
256
-     * @return Symfony\Component\DependencyInjection\ContainerInterface - the mock of container interface
256
+     * @return \Symfony\Component\DependencyInjection\ContainerInterface - the mock of container interface
257 257
      */
258 258
     private function getContainer()
259 259
     {
Please login to merge, or discard this patch.
Tests/Controller/CRUDControllerTest.php 1 patch
Doc Comments   +7 added lines patch added patch discarded remove patch
@@ -663,6 +663,9 @@  discard block
 block discarded – undo
663 663
         $this->assertSame('list?filter%5Bfoo%5D=bar', $result->getTargetUrl());
664 664
     }
665 665
 
666
+    /**
667
+     * @param string $method
668
+     */
666 669
     private function assertLoggerLogsModelManagerException($subject, $method)
667 670
     {
668 671
         $exception = new ModelManagerException(
@@ -2972,6 +2975,10 @@  discard block
 block discarded – undo
2972 2975
         );
2973 2976
     }
2974 2977
 
2978
+    /**
2979
+     * @param string $id
2980
+     * @param string $domain
2981
+     */
2975 2982
     private function expectTranslate($id, array $parameters = array(), $domain = null, $locale = null)
2976 2983
     {
2977 2984
         $this->admin->expects($this->once())
Please login to merge, or discard this patch.
Tests/Show/ShowMapperTest.php 1 patch
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -223,6 +223,10 @@
 block discarded – undo
223 223
             ), ), true), print_r($this->admin->getShowGroups(), true));
224 224
     }
225 225
 
226
+    /**
227
+     * @param string $name
228
+     * @param string $label
229
+     */
226 230
     private function getFieldDescriptionMock($name = null, $label = null)
227 231
     {
228 232
         $fieldDescription = $this->getMockForAbstractClass('Sonata\AdminBundle\Admin\BaseFieldDescription');
Please login to merge, or discard this patch.