@@ -2156,6 +2156,7 @@ discard block |
||
| 2156 | 2156 | |
| 2157 | 2157 | /** |
| 2158 | 2158 | * @param String |
| 2159 | + * @param string $name |
|
| 2159 | 2160 | * @return Zend_Translate |
| 2160 | 2161 | */ |
| 2161 | 2162 | public static function get_translator($name) { |
@@ -2169,6 +2170,7 @@ discard block |
||
| 2169 | 2170 | * @param Zend_Translate Needs to implement {@link i18nTranslateAdapterInterface} |
| 2170 | 2171 | * @param String If left blank will override the default translator. |
| 2171 | 2172 | * @param Int |
| 2173 | + * @param string $name |
|
| 2172 | 2174 | */ |
| 2173 | 2175 | public static function register_translator($translator, $name, $priority = 10) { |
| 2174 | 2176 | if (!is_int($priority)) throw new InvalidArgumentException("register_translator expects an int priority"); |
@@ -2298,7 +2300,7 @@ discard block |
||
| 2298 | 2300 | * |
| 2299 | 2301 | * @see get_locale_name() |
| 2300 | 2302 | * |
| 2301 | - * @param mixed $code Language code |
|
| 2303 | + * @param string $code Language code |
|
| 2302 | 2304 | * @param boolean $native If true, the native name will be returned |
| 2303 | 2305 | * @return Name of the language |
| 2304 | 2306 | */ |
@@ -2455,6 +2457,7 @@ discard block |
||
| 2455 | 2457 | * |
| 2456 | 2458 | * Note: Does not check for {@link $allowed_locales}. |
| 2457 | 2459 | * |
| 2460 | + * @param string $locale |
|
| 2458 | 2461 | * @return boolean |
| 2459 | 2462 | */ |
| 2460 | 2463 | public static function validate_locale($locale) { |
@@ -712,7 +712,8 @@ discard block |
||
| 712 | 712 | * Input for langArrayCodeForEntitySpec() should be suitable for insertion |
| 713 | 713 | * into single-quoted strings, so needs to be escaped already. |
| 714 | 714 | * |
| 715 | - * @param string $entity The entity name, e.g. CMSMain.BUTTONSAVE |
|
| 715 | + * @param string $entitySpec The entity name, e.g. CMSMain.BUTTONSAVE |
|
| 716 | + * @param string $locale |
|
| 716 | 717 | */ |
| 717 | 718 | public function langArrayCodeForEntitySpec($entityFullName, $entitySpec, $locale) { |
| 718 | 719 | $php = ''; |
@@ -775,6 +776,9 @@ discard block |
||
| 775 | 776 | return true; |
| 776 | 777 | } |
| 777 | 778 | |
| 779 | + /** |
|
| 780 | + * @param string $locale |
|
| 781 | + */ |
|
| 778 | 782 | public function getYaml($entities, $locale) { |
| 779 | 783 | // Unflatten array |
| 780 | 784 | $entitiesNested = array(); |
@@ -843,6 +847,7 @@ discard block |
||
| 843 | 847 | |
| 844 | 848 | /** |
| 845 | 849 | * Parses a template and returns any translatable entities |
| 850 | + * @param string $template |
|
| 846 | 851 | */ |
| 847 | 852 | public static function GetTranslatables($template) { |
| 848 | 853 | self::$entities = array(); |
@@ -2,8 +2,6 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace SilverStripe\Framework\Logging; |
| 4 | 4 | |
| 5 | -use Monolog\Logger; |
|
| 6 | -use Monolog\Handler\AbstractProcessingHandler; |
|
| 7 | 5 | use Monolog\Formatter\FormatterInterface; |
| 8 | 6 | |
| 9 | 7 | /** |
@@ -115,6 +115,9 @@ |
||
| 115 | 115 | $this->query("ALTER TABLE \"$tableName\" $alterations"); |
| 116 | 116 | } |
| 117 | 117 | |
| 118 | + /** |
|
| 119 | + * @param string $tableName |
|
| 120 | + */ |
|
| 118 | 121 | public function isView($tableName) { |
| 119 | 122 | $info = $this->query("SHOW /*!50002 FULL*/ TABLES LIKE '$tableName'")->record(); |
| 120 | 123 | return $info && strtoupper($info['Table_type']) == 'VIEW'; |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | /** |
| 108 | 108 | * Gets the url to return to after build |
| 109 | 109 | * |
| 110 | - * @return string|null |
|
| 110 | + * @return string |
|
| 111 | 111 | */ |
| 112 | 112 | protected function getReturnURL() { |
| 113 | 113 | $url = $this->request->getVar('returnURL'); |
@@ -152,7 +152,7 @@ discard block |
||
| 152 | 152 | /** |
| 153 | 153 | * Returns the timestamp of the time that the database was last built |
| 154 | 154 | * |
| 155 | - * @return string Returns the timestamp of the time that the database was |
|
| 155 | + * @return integer|null Returns the timestamp of the time that the database was |
|
| 156 | 156 | * last built |
| 157 | 157 | */ |
| 158 | 158 | public static function lastBuilt() { |
@@ -4,11 +4,9 @@ |
||
| 4 | 4 | |
| 5 | 5 | use Deprecation; |
| 6 | 6 | use SQLExpression; |
| 7 | - |
|
| 8 | 7 | use InvalidArgumentException; |
| 9 | 8 | use Config; |
| 10 | 9 | use LogicException; |
| 11 | - |
|
| 12 | 10 | use Injector; |
| 13 | 11 | use SilverStripe\Model\Connect\Database; |
| 14 | 12 | use SilverStripe\Control\Director; |
@@ -50,6 +50,7 @@ |
||
| 50 | 50 | * |
| 51 | 51 | * @param DataObject (Optional) |
| 52 | 52 | * @param DataObject |
| 53 | + * @param DataObject|null $fromRecord |
|
| 53 | 54 | */ |
| 54 | 55 | public function __construct($fromRecord, DataObject $toRecord) { |
| 55 | 56 | if(!$toRecord) user_error("DataDifferencer constructed without a toRecord", E_USER_WARNING); |
@@ -707,7 +707,7 @@ |
||
| 707 | 707 | * Get the next node in the tree of the type. If there is no instance of the className descended from this node, |
| 708 | 708 | * then search the parents. |
| 709 | 709 | * @param string $className Class name of the node to find. |
| 710 | - * @param string|int $root ID/ClassName of the node to limit the search to |
|
| 710 | + * @param integer $root ID/ClassName of the node to limit the search to |
|
| 711 | 711 | * @param DataObject afterNode Used for recursive calls to this function |
| 712 | 712 | * @return DataObject |
| 713 | 713 | */ |
@@ -74,9 +74,6 @@ |
||
| 74 | 74 | * Given a list of assignments in any user-acceptible format, normalise the |
| 75 | 75 | * value to a common array('SQL' => array(parameters)) format |
| 76 | 76 | * |
| 77 | - * @param array $predicates List of assignments. |
|
| 78 | - * The key of this array should be the field name, and the value the assigned |
|
| 79 | - * literal value, or an array with parameterised information. |
|
| 80 | 77 | * @return array List of normalised assignments |
| 81 | 78 | */ |
| 82 | 79 | protected function normaliseAssignments(array $assignments) { |
@@ -374,7 +374,6 @@ discard block |
||
| 374 | 374 | * @see SQLConditionalExpression::addWhere() for syntax examples |
| 375 | 375 | * |
| 376 | 376 | * @param mixed $where Predicate(s) to set, as escaped SQL statements or paramaterised queries |
| 377 | - * @param mixed $where,... Unlimited additional predicates |
|
| 378 | 377 | * @return self Self reference |
| 379 | 378 | */ |
| 380 | 379 | public function setWhere($where) { |
@@ -460,7 +459,6 @@ discard block |
||
| 460 | 459 | * </code> |
| 461 | 460 | * |
| 462 | 461 | * @param mixed $where Predicate(s) to set, as escaped SQL statements or paramaterised queries |
| 463 | - * @param mixed $where,... Unlimited additional predicates |
|
| 464 | 462 | * @return self Self reference |
| 465 | 463 | */ |
| 466 | 464 | public function addWhere($where) { |
@@ -476,7 +474,6 @@ discard block |
||
| 476 | 474 | * @see SQLConditionalExpression::addWhere() |
| 477 | 475 | * |
| 478 | 476 | * @param mixed $filters Predicate(s) to set, as escaped SQL statements or paramaterised queries |
| 479 | - * @param mixed $filters,... Unlimited additional predicates |
|
| 480 | 477 | * @return self Self reference |
| 481 | 478 | */ |
| 482 | 479 | public function setWhereAny($filters) { |
@@ -490,7 +487,6 @@ discard block |
||
| 490 | 487 | * @see SQLConditionalExpression::addWhere() |
| 491 | 488 | * |
| 492 | 489 | * @param mixed $filters Predicate(s) to set, as escaped SQL statements or paramaterised queries |
| 493 | - * @param mixed $filters,... Unlimited additional predicates |
|
| 494 | 490 | * @return self Self reference |
| 495 | 491 | */ |
| 496 | 492 | public function addWhereAny($filters) { |