Completed
Pull Request — master (#6482)
by Ingo
18:33
created
tests/php/View/SSViewerTest.php 1 patch
Doc Comments   +13 added lines patch added patch discarded remove patch
@@ -173,6 +173,10 @@  discard block
 block discarded – undo
173 173
         );
174 174
     }
175 175
 
176
+    /**
177
+     * @param \SilverStripe\ORM\FieldType\DBHTMLText $result
178
+     * @param string[] $expected
179
+     */
176 180
     private function assertExpectedStrings($result, $expected)
177 181
     {
178 182
         foreach ($expected as $expectedStr) {
@@ -1088,6 +1092,10 @@  discard block
 block discarded – undo
1088 1092
         $this->assertEquals('A A1 A1 i A1 ii A2 A3', $rationalisedResult);
1089 1093
     }
1090 1094
 
1095
+    /**
1096
+     * @param string $a
1097
+     * @param string $b
1098
+     */
1091 1099
     public function assertEqualIgnoringWhitespace($a, $b, $message = '')
1092 1100
     {
1093 1101
         $this->assertEquals(preg_replace('/\s+/', '', $a), preg_replace('/\s+/', '', $b), $message);
@@ -1819,6 +1827,11 @@  discard block
 block discarded – undo
1819 1827
             $this->_renderWithSourceFileComments('SSViewerTestComments/'.$template['name'], $template['expected']);
1820 1828
         }
1821 1829
     }
1830
+
1831
+    /**
1832
+     * @param string $name
1833
+     * @param string $expected
1834
+     */
1822 1835
     private function _renderWithSourceFileComments($name, $expected)
1823 1836
     {
1824 1837
         $viewer = new SSViewer(array($name));
Please login to merge, or discard this patch.
admin/code/ModelAdmin.php 1 patch
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -152,6 +152,9 @@  discard block
 block discarded – undo
152 152
         }
153 153
     }
154 154
 
155
+    /**
156
+     * @param string $action
157
+     */
155 158
     public function Link($action = null)
156 159
     {
157 160
         if (!$action) {
@@ -403,7 +406,7 @@  discard block
 block discarded – undo
403 406
     /**
404 407
      * Generate a CSV import form for a single {@link DataObject} subclass.
405 408
      *
406
-     * @return Form|false
409
+     * @return Form
407 410
      */
408 411
     public function ImportForm()
409 412
     {
Please login to merge, or discard this patch.