Completed
Pull Request — master (#146)
by Hamish
02:06
created
code/Controller/AssetAdmin.php 1 patch
Doc Comments   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -560,7 +560,7 @@  discard block
 block discarded – undo
560 560
 
561 561
     /**
562 562
      * @param  bool      $unlinked
563
-     * @return ArrayList
563
+     * @return \ArrayList
564 564
      */
565 565
     public function breadcrumbs($unlinked = false)
566 566
     {
@@ -605,6 +605,7 @@  discard block
 block discarded – undo
605 605
     /**
606 606
      * Don't include class namespace in template names
607 607
      * @todo Make code in framework more namespace-savvy so that we don't need this duplication
608
+     * @param string $suffix
608 609
      */
609 610
     public function getTemplatesWithSuffix($suffix)
610 611
     {
Please login to merge, or discard this patch.
code/FormField/AssetGalleryField.php 1 patch
Doc Comments   +2 added lines, -3 removed lines patch added patch discarded remove patch
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
      *
148 148
      * @param SS_HTTPRequest $request
149 149
      *
150
-     * @return SS_HTTPResponse
150
+     * @return Controller|null
151 151
      */
152 152
     public function item(SS_HTTPRequest $request)
153 153
     {
@@ -538,7 +538,7 @@  discard block
 block discarded – undo
538 538
     /**
539 539
      * @param null|string $folder
540 540
      *
541
-     * @return null|Folder
541
+     * @return null|\DataObject
542 542
      */
543 543
     protected function getFolder($folder = null)
544 544
     {
@@ -775,7 +775,6 @@  discard block
 block discarded – undo
775 775
     }
776 776
 
777 777
     /**
778
-     * @param boolean $bulkActions
779 778
      *
780 779
      * @return $this
781 780
      */
Please login to merge, or discard this patch.
code/FormField/DropzoneUploadField.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@
 block discarded – undo
48 48
      * This method is identical to `AssetGalleryField::getObjectFromData`.
49 49
      * Ideally this would be on File, and be available at some endpoint, similar to the form field schema.
50 50
      *
51
-     * @param $file
51
+     * @param \SilverStripe\Filesystem\Storage\AssetContainer $file
52 52
      *
53 53
      * @return array
54 54
      */
Please login to merge, or discard this patch.
behat/features/bootstrap/SilverStripe/Cms/Test/Behaviour/ThemeContext.php 1 patch
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -52,6 +52,9 @@  discard block
 block discarded – undo
52 52
         $this->requireFile(BASE_PATH . '/themes/' . $theme . '/templates/' . $template, $content);
53 53
     }
54 54
 
55
+    /**
56
+     * @param string $filename
57
+     */
55 58
     protected function requireFile($filename, $content)
56 59
     {
57 60
         // Already exists
@@ -69,6 +72,9 @@  discard block
 block discarded – undo
69 72
         }
70 73
     }
71 74
 
75
+    /**
76
+     * @param string $dirname
77
+     */
72 78
     protected function requireDir($dirname)
73 79
     {
74 80
         // Directory doesn't exist, create it and mark it for deletion
Please login to merge, or discard this patch.
tests/php/AssetAdminTest.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@
 block discarded – undo
53 53
      * @param string $from Created from date
54 54
      * @param string $to Createi to date
55 55
      * @param string $category
56
-     * @return SS_List
56
+     * @return \SS_List
57 57
      */
58 58
     protected function getResultsForSearch($name = '', $from = '', $to = '', $category = '')
59 59
     {
Please login to merge, or discard this patch.