@@ -43,6 +43,7 @@ discard block |
||
| 43 | 43 | |
| 44 | 44 | /** |
| 45 | 45 | * @todo Move this to SS_Database or DB |
| 46 | + * @param string $class |
|
| 46 | 47 | */ |
| 47 | 48 | public static function hasTable($class) { |
| 48 | 49 | // Cache the list of all table names to reduce on DB traffic |
@@ -80,7 +81,7 @@ discard block |
||
| 80 | 81 | * |
| 81 | 82 | * @todo Move this into {@see DataObjectSchema} |
| 82 | 83 | * |
| 83 | - * @param string|object $class |
|
| 84 | + * @param string $class |
|
| 84 | 85 | * @return array |
| 85 | 86 | */ |
| 86 | 87 | public static function dataClassesFor($class) { |
@@ -205,6 +206,7 @@ discard block |
||
| 205 | 206 | |
| 206 | 207 | /** |
| 207 | 208 | * Returns true if the given class implements the given interface |
| 209 | + * @param string $interfaceName |
|
| 208 | 210 | */ |
| 209 | 211 | public static function classImplements($className, $interfaceName) { |
| 210 | 212 | return in_array($className, self::implementorsOf($interfaceName)); |
@@ -255,6 +257,9 @@ discard block |
||
| 255 | 257 | |
| 256 | 258 | private static $method_from_cache = array(); |
| 257 | 259 | |
| 260 | + /** |
|
| 261 | + * @param string $method |
|
| 262 | + */ |
|
| 258 | 263 | public static function has_method_from($class, $method, $compclass) { |
| 259 | 264 | $lClass = strtolower($class); |
| 260 | 265 | $lMethod = strtolower($method); |
@@ -260,6 +260,9 @@ discard block |
||
| 260 | 260 | return $this; |
| 261 | 261 | } |
| 262 | 262 | |
| 263 | + /** |
|
| 264 | + * @param string $type |
|
| 265 | + */ |
|
| 263 | 266 | protected function invokeCallbacks($type, $args = array()) { |
| 264 | 267 | foreach($this->callbacks[$type] as $callback) { |
| 265 | 268 | call_user_func_array($callback, $args); |
@@ -299,6 +302,9 @@ discard block |
||
| 299 | 302 | $obj->$name = $this->parseValue($value, $fixtures); |
| 300 | 303 | } |
| 301 | 304 | |
| 305 | + /** |
|
| 306 | + * @param string $fieldName |
|
| 307 | + */ |
|
| 302 | 308 | protected function overrideField($obj, $fieldName, $value, $fixtures = null) { |
| 303 | 309 | $class = get_class($obj); |
| 304 | 310 | $table = DataObject::getSchema()->tableForField($class, $fieldName); |
@@ -223,6 +223,7 @@ |
||
| 223 | 223 | * via the standard template inclusion process. |
| 224 | 224 | * |
| 225 | 225 | * @param string |
| 226 | + * @param string $template |
|
| 226 | 227 | */ |
| 227 | 228 | public function setTemplate($template) { |
| 228 | 229 | $this->template = $template; |
@@ -133,6 +133,7 @@ discard block |
||
| 133 | 133 | * {@inheritdoc} |
| 134 | 134 | * |
| 135 | 135 | * Also set the URLParams |
| 136 | + * @param SS_HTTPRequest $request |
|
| 136 | 137 | */ |
| 137 | 138 | public function setRequest($request) { |
| 138 | 139 | $return = parent::setRequest($request); |
@@ -509,7 +510,7 @@ discard block |
||
| 509 | 510 | * |
| 510 | 511 | * @param array $params |
| 511 | 512 | * |
| 512 | - * @return string |
|
| 513 | + * @return DBHTMLText |
|
| 513 | 514 | */ |
| 514 | 515 | public function render($params = null) { |
| 515 | 516 | $template = $this->getViewer($this->getAction()); |
@@ -674,7 +675,7 @@ discard block |
||
| 674 | 675 | * Tests whether a redirection has been requested. If redirect() has been called, it will return |
| 675 | 676 | * the URL redirected to. Otherwise, it will return null. |
| 676 | 677 | * |
| 677 | - * @return null|string |
|
| 678 | + * @return boolean |
|
| 678 | 679 | */ |
| 679 | 680 | public function redirectedTo() { |
| 680 | 681 | return $this->getResponse() && $this->getResponse()->getHeader('Location'); |
@@ -144,7 +144,7 @@ |
||
| 144 | 144 | /** |
| 145 | 145 | * Get meta-data details on a named method |
| 146 | 146 | * |
| 147 | - * @param array $method |
|
| 147 | + * @param string $method |
|
| 148 | 148 | * @return array List of custom method details, if defined for this method |
| 149 | 149 | */ |
| 150 | 150 | protected function getExtraMethodConfig($method) { |
@@ -38,6 +38,9 @@ discard block |
||
| 38 | 38 | ] |
| 39 | 39 | ); |
| 40 | 40 | |
| 41 | + /** |
|
| 42 | + * @param string $root |
|
| 43 | + */ |
|
| 41 | 44 | public function __construct($root = null, $writeFlags = LOCK_EX, $linkHandling = self::DISALLOW_LINKS) { |
| 42 | 45 | // Get root path |
| 43 | 46 | $root = $this->findRoot($root); |
@@ -118,7 +121,7 @@ discard block |
||
| 118 | 121 | * Render server configuration file from a template file |
| 119 | 122 | * |
| 120 | 123 | * @param string $template |
| 121 | - * @return DBHTMLText Rendered results |
|
| 124 | + * @return string Rendered results |
|
| 122 | 125 | */ |
| 123 | 126 | protected function renderTemplate($template) { |
| 124 | 127 | // Build allowed extensions |
@@ -200,7 +200,7 @@ |
||
| 200 | 200 | * |
| 201 | 201 | * @todo refactor this into GridFieldComponent |
| 202 | 202 | * |
| 203 | - * @param mixed $value |
|
| 203 | + * @param string $value |
|
| 204 | 204 | * @param string|array $castingDefinition |
| 205 | 205 | * |
| 206 | 206 | * @return mixed |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | * Which columns are handled by this component |
| 56 | 56 | * |
| 57 | 57 | * @param GridField $gridField |
| 58 | - * @return array |
|
| 58 | + * @return string[] |
|
| 59 | 59 | */ |
| 60 | 60 | public function getColumnsHandled($gridField) { |
| 61 | 61 | return array('Actions'); |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | * @param DataObject $record |
| 77 | 77 | * @param string $columnName |
| 78 | 78 | * |
| 79 | - * @return string - the HTML for the column |
|
| 79 | + * @return DBHTMLText - the HTML for the column |
|
| 80 | 80 | */ |
| 81 | 81 | public function getColumnContent($gridField, $record, $columnName) { |
| 82 | 82 | // No permission checks, handled through GridFieldDetailForm, |
@@ -123,6 +123,10 @@ discard block |
||
| 123 | 123 | )); |
| 124 | 124 | } |
| 125 | 125 | |
| 126 | + /** |
|
| 127 | + * @param DBHTMLText $result |
|
| 128 | + * @param string[] $expected |
|
| 129 | + */ |
|
| 126 | 130 | private function assertExpectedStrings($result, $expected) { |
| 127 | 131 | foreach ($expected as $expectedStr) { |
| 128 | 132 | $this->assertTrue( |
@@ -756,6 +760,10 @@ discard block |
||
| 756 | 760 | $this->assertEquals('A A1 A1 i A1 ii A2 A3', $rationalisedResult); |
| 757 | 761 | } |
| 758 | 762 | |
| 763 | + /** |
|
| 764 | + * @param string $a |
|
| 765 | + * @param string $b |
|
| 766 | + */ |
|
| 759 | 767 | public function assertEqualIgnoringWhitespace($a, $b) { |
| 760 | 768 | $this->assertEquals(preg_replace('/\s+/', '', $a), preg_replace('/\s+/', '', $b)); |
| 761 | 769 | } |
@@ -1375,6 +1383,11 @@ discard block |
||
| 1375 | 1383 | Config::inst()->update('SSViewer', 'source_file_comments', false); |
| 1376 | 1384 | Config::inst()->update('Director', 'environment_type', $origEnv); |
| 1377 | 1385 | } |
| 1386 | + |
|
| 1387 | + /** |
|
| 1388 | + * @param string $name |
|
| 1389 | + * @param string $expected |
|
| 1390 | + */ |
|
| 1378 | 1391 | private function _renderWithSourceFileComments($name, $expected) { |
| 1379 | 1392 | $viewer = new SSViewer(array($name)); |
| 1380 | 1393 | $data = new ArrayData(array()); |