@@ -287,7 +287,7 @@ discard block |
||
| 287 | 287 | * any database records (like pages), as this locale will be attached |
| 288 | 288 | * to all new records. |
| 289 | 289 | * |
| 290 | - * @param $locale String |
|
| 290 | + * @param string $locale String |
|
| 291 | 291 | */ |
| 292 | 292 | public static function set_default_locale($locale) |
| 293 | 293 | { |
@@ -323,7 +323,6 @@ discard block |
||
| 323 | 323 | * to "auto-filter" all SELECT queries by this language. |
| 324 | 324 | * See {@link disable_locale_filter()} on how to override this behaviour temporarily. |
| 325 | 325 | * |
| 326 | - * @param string $lang New reading language. |
|
| 327 | 326 | */ |
| 328 | 327 | public static function set_current_locale($locale) |
| 329 | 328 | { |
@@ -370,8 +369,6 @@ discard block |
||
| 370 | 369 | * @param string $join A single join clause. This can be used for filtering, only 1 |
| 371 | 370 | * instance of each DataObject will be returned. |
| 372 | 371 | * @param string $limit A limit expression to be inserted into the LIMIT clause. |
| 373 | - * @param string $containerClass The container class to return the results in. |
|
| 374 | - * @param string $having A filter to be inserted into the HAVING clause. |
|
| 375 | 372 | * @return mixed The objects matching the conditions. |
| 376 | 373 | */ |
| 377 | 374 | public static function get_by_locale($class, $locale, $filter = '', $sort = '', $join = "", $limit = "") |
@@ -638,7 +635,7 @@ discard block |
||
| 638 | 635 | * Check if a given SQLSelect filters on the Locale field |
| 639 | 636 | * |
| 640 | 637 | * @param SQLSelect $query |
| 641 | - * @return boolean |
|
| 638 | + * @return boolean|null |
|
| 642 | 639 | */ |
| 643 | 640 | protected function filtersOnLocale($query) |
| 644 | 641 | { |
@@ -1677,7 +1674,7 @@ discard block |
||
| 1677 | 1674 | } |
| 1678 | 1675 | |
| 1679 | 1676 | /** |
| 1680 | - * @return boolean |
|
| 1677 | + * @return null|false |
|
| 1681 | 1678 | */ |
| 1682 | 1679 | public function canEdit($member) |
| 1683 | 1680 | { |
@@ -45,6 +45,9 @@ discard block |
||
| 45 | 45 | parent::tearDown(); |
| 46 | 46 | } |
| 47 | 47 | |
| 48 | + /** |
|
| 49 | + * @param string $message |
|
| 50 | + */ |
|
| 48 | 51 | public function assertArrayEqualsAfterSort($expected, $actual, $message = null) |
| 49 | 52 | { |
| 50 | 53 | sort($expected); |
@@ -233,6 +236,10 @@ discard block |
||
| 233 | 236 | ); |
| 234 | 237 | } |
| 235 | 238 | |
| 239 | + /** |
|
| 240 | + * @param string $class |
|
| 241 | + * @param DataObject|null $node |
|
| 242 | + */ |
|
| 236 | 243 | public function assertClass($class, $node) |
| 237 | 244 | { |
| 238 | 245 | $this->assertNotNull($node); |