@@ -2161,6 +2161,7 @@ discard block |
||
| 2161 | 2161 | |
| 2162 | 2162 | /** |
| 2163 | 2163 | * @param String |
| 2164 | + * @param string $name |
|
| 2164 | 2165 | * @return Zend_Translate |
| 2165 | 2166 | */ |
| 2166 | 2167 | public static function get_translator($name) { |
@@ -2200,6 +2201,7 @@ discard block |
||
| 2200 | 2201 | |
| 2201 | 2202 | /** |
| 2202 | 2203 | * @param String |
| 2204 | + * @param string $name |
|
| 2203 | 2205 | */ |
| 2204 | 2206 | public static function unregister_translator($name) { |
| 2205 | 2207 | foreach (self::get_translators() as $priority => $translators) { |
@@ -2302,7 +2304,7 @@ discard block |
||
| 2302 | 2304 | * |
| 2303 | 2305 | * @see get_locale_name() |
| 2304 | 2306 | * |
| 2305 | - * @param mixed $code Language code |
|
| 2307 | + * @param string $code Language code |
|
| 2306 | 2308 | * @param boolean $native If true, the native name will be returned |
| 2307 | 2309 | * @return string Name of the language |
| 2308 | 2310 | */ |
@@ -5,7 +5,6 @@ |
||
| 5 | 5 | use SilverStripe\Control\Director; |
| 6 | 6 | use SilverStripe\Core\Cache; |
| 7 | 7 | use SilverStripe\Core\Config\Config; |
| 8 | -use SilverStripe\Core\Object; |
|
| 9 | 8 | use SilverStripe\Core\Flushable; |
| 10 | 9 | use SilverStripe\Core\Injector\Injector; |
| 11 | 10 | use SilverStripe\Core\Manifest\ClassLoader; |
@@ -168,7 +168,7 @@ |
||
| 168 | 168 | * |
| 169 | 169 | * Actually only one array argument is supported. |
| 170 | 170 | * |
| 171 | - * @param $f callback to apply |
|
| 171 | + * @param string $f callback to apply |
|
| 172 | 172 | * @param $array array |
| 173 | 173 | * @return array |
| 174 | 174 | */ |
@@ -700,7 +700,7 @@ |
||
| 700 | 700 | /** |
| 701 | 701 | * Returns item stored in list with index $key |
| 702 | 702 | * |
| 703 | - * @param mixed $offset |
|
| 703 | + * @param integer $offset |
|
| 704 | 704 | * @return DataObject |
| 705 | 705 | */ |
| 706 | 706 | public function offsetGet($offset) { |
@@ -295,7 +295,7 @@ discard block |
||
| 295 | 295 | * - array('fields' => array('A','B','C'), 'type' => 'index/unique/fulltext'): This gives you full |
| 296 | 296 | * control over the index. |
| 297 | 297 | * @param boolean $hasAutoIncPK A flag indicating that the primary key on this table is an autoincrement type |
| 298 | - * @param array $options Create table options (ENGINE, etc.) |
|
| 298 | + * @param string|null $options Create table options (ENGINE, etc.) |
|
| 299 | 299 | * @param array|bool $extensions List of extensions |
| 300 | 300 | */ |
| 301 | 301 | public function requireTable($table, $fieldSchema = null, $indexSchema = null, $hasAutoIncPK = true, |
@@ -480,7 +480,7 @@ discard block |
||
| 480 | 480 | /** |
| 481 | 481 | * Given an index spec determines the index type |
| 482 | 482 | * |
| 483 | - * @param array|string $spec |
|
| 483 | + * @param string $spec |
|
| 484 | 484 | * @return string |
| 485 | 485 | */ |
| 486 | 486 | protected function determineIndexType($spec) { |
@@ -575,7 +575,7 @@ discard block |
||
| 575 | 575 | * |
| 576 | 576 | * @param string $table The table name. |
| 577 | 577 | * @param string $field The field name. |
| 578 | - * @param array|string $spec The field specification. If passed in array syntax, the specific database |
|
| 578 | + * @param string $spec The field specification. If passed in array syntax, the specific database |
|
| 579 | 579 | * driver takes care of the ALTER TABLE syntax. If passed as a string, its assumed to |
| 580 | 580 | * be prepared as a direct SQL framgment ready for insertion into ALTER TABLE. In this case you'll |
| 581 | 581 | * need to take care of database abstraction in your DBField subclass. |
@@ -2712,6 +2712,7 @@ discard block |
||
| 2712 | 2712 | |
| 2713 | 2713 | /** |
| 2714 | 2714 | * {@inheritdoc} |
| 2715 | + * @param string $field |
|
| 2715 | 2716 | */ |
| 2716 | 2717 | public function castingHelper($field) { |
| 2717 | 2718 | if ($fieldSpec = $this->db($field)) { |
@@ -2916,7 +2917,7 @@ discard block |
||
| 2916 | 2917 | |
| 2917 | 2918 | /** |
| 2918 | 2919 | * @param Member $member |
| 2919 | - * @return boolean |
|
| 2920 | + * @return boolean|string |
|
| 2920 | 2921 | */ |
| 2921 | 2922 | public function canView($member = null) { |
| 2922 | 2923 | $extended = $this->extendedCan(__FUNCTION__, $member); |
@@ -2928,7 +2929,7 @@ discard block |
||
| 2928 | 2929 | |
| 2929 | 2930 | /** |
| 2930 | 2931 | * @param Member $member |
| 2931 | - * @return boolean |
|
| 2932 | + * @return boolean|string |
|
| 2932 | 2933 | */ |
| 2933 | 2934 | public function canEdit($member = null) { |
| 2934 | 2935 | $extended = $this->extendedCan(__FUNCTION__, $member); |
@@ -2940,7 +2941,7 @@ discard block |
||
| 2940 | 2941 | |
| 2941 | 2942 | /** |
| 2942 | 2943 | * @param Member $member |
| 2943 | - * @return boolean |
|
| 2944 | + * @return boolean|string |
|
| 2944 | 2945 | */ |
| 2945 | 2946 | public function canDelete($member = null) { |
| 2946 | 2947 | $extended = $this->extendedCan(__FUNCTION__, $member); |
@@ -2954,7 +2955,7 @@ discard block |
||
| 2954 | 2955 | * @param Member $member |
| 2955 | 2956 | * @param array $context Additional context-specific data which might |
| 2956 | 2957 | * affect whether (or where) this object could be created. |
| 2957 | - * @return boolean |
|
| 2958 | + * @return boolean|string |
|
| 2958 | 2959 | */ |
| 2959 | 2960 | public function canCreate($member = null, $context = array()) { |
| 2960 | 2961 | $extended = $this->extendedCan(__FUNCTION__, $member, $context); |
@@ -3058,7 +3059,7 @@ discard block |
||
| 3058 | 3059 | * Traverses to a field referenced by relationships between data objects, returning the value |
| 3059 | 3060 | * The path to the related field is specified with dot separated syntax (eg: Parent.Child.Child.FieldName) |
| 3060 | 3061 | * |
| 3061 | - * @param $fieldName string |
|
| 3062 | + * @param string $fieldName string |
|
| 3062 | 3063 | * @return string | null - will return null on a missing value |
| 3063 | 3064 | */ |
| 3064 | 3065 | public function relField($fieldName) { |
@@ -3128,7 +3129,7 @@ discard block |
||
| 3128 | 3129 | * @param string $callerClass The class of objects to be returned |
| 3129 | 3130 | * @param string|array $filter A filter to be inserted into the WHERE clause. |
| 3130 | 3131 | * Supports parameterised queries. See SQLSelect::addWhere() for syntax examples. |
| 3131 | - * @param string|array $sort A sort expression to be inserted into the ORDER |
|
| 3132 | + * @param string $sort A sort expression to be inserted into the ORDER |
|
| 3132 | 3133 | * BY clause. If omitted, self::$default_sort will be used. |
| 3133 | 3134 | * @param string $join Deprecated 3.0 Join clause. Use leftJoin($table, $joinClause) instead. |
| 3134 | 3135 | * @param string|array $limit A limit expression to be inserted into the LIMIT clause. |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | /** |
| 99 | 99 | * Remove a filter from the query |
| 100 | 100 | * |
| 101 | - * @param string|array $fieldExpression The predicate of the condition to remove |
|
| 101 | + * @param string|null $fieldExpression The predicate of the condition to remove |
|
| 102 | 102 | * (ignoring parameters). The expression will be considered a match if it's |
| 103 | 103 | * contained within any other predicate. |
| 104 | 104 | * @return DataQuery Self reference |
@@ -177,7 +177,7 @@ discard block |
||
| 177 | 177 | /** |
| 178 | 178 | * Ensure that the query is ready to execute. |
| 179 | 179 | * |
| 180 | - * @param array|null $queriedColumns Any columns to filter the query by |
|
| 180 | + * @param string[] $queriedColumns Any columns to filter the query by |
|
| 181 | 181 | * @return SQLSelect The finalised sql query |
| 182 | 182 | */ |
| 183 | 183 | public function getFinalisedQuery($queriedColumns = null) { |
@@ -4,7 +4,6 @@ |
||
| 4 | 4 | |
| 5 | 5 | use SilverStripe\ORM\DataQuery; |
| 6 | 6 | use SilverStripe\ORM\DB; |
| 7 | -use InvalidArgumentException; |
|
| 8 | 7 | |
| 9 | 8 | /** |
| 10 | 9 | * Matches textual content with a LIKE '%keyword%' construct. |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | * column. Can contain a relation name in dot notation, which will automatically join |
| 63 | 63 | * the necessary tables (e.g. "Comments.Name" to join the "Comments" has-many relationship and |
| 64 | 64 | * search the "Name" column when applying this filter to a SiteTree class). |
| 65 | - * @param mixed $value |
|
| 65 | + * @param string $value |
|
| 66 | 66 | * @param array $modifiers |
| 67 | 67 | */ |
| 68 | 68 | public function __construct($fullName = null, $value = false, array $modifiers = array()) { |
@@ -142,7 +142,7 @@ discard block |
||
| 142 | 142 | /** |
| 143 | 143 | * Gets supported modifiers for this filter |
| 144 | 144 | * |
| 145 | - * @return array |
|
| 145 | + * @return string[] |
|
| 146 | 146 | */ |
| 147 | 147 | public function getSupportedModifiers() |
| 148 | 148 | { |
@@ -187,6 +187,7 @@ discard block |
||
| 187 | 187 | |
| 188 | 188 | /** |
| 189 | 189 | * @param String |
| 190 | + * @param string $name |
|
| 190 | 191 | */ |
| 191 | 192 | public function setFullName($name) { |
| 192 | 193 | $this->fullName = $name; |
@@ -323,7 +324,7 @@ discard block |
||
| 323 | 324 | /** |
| 324 | 325 | * Determines case sensitivity based on {@link getModifiers()}. |
| 325 | 326 | * |
| 326 | - * @return Mixed TRUE or FALSE to enforce sensitivity, NULL to use field collation. |
|
| 327 | + * @return boolean|null TRUE or FALSE to enforce sensitivity, NULL to use field collation. |
|
| 327 | 328 | */ |
| 328 | 329 | protected function getCaseSensitive() { |
| 329 | 330 | $modifiers = $this->getModifiers(); |
@@ -2,7 +2,6 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace SilverStripe\ORM\Filters; |
| 4 | 4 | |
| 5 | -use SilverStripe\Core\Object; |
|
| 6 | 5 | use SilverStripe\ORM\DataObject; |
| 7 | 6 | use SilverStripe\ORM\DataQuery; |
| 8 | 7 | use InvalidArgumentException; |
@@ -62,7 +62,7 @@ |
||
| 62 | 62 | * |
| 63 | 63 | * It does so by setting the relationFilters. |
| 64 | 64 | * |
| 65 | - * @param DataObject|int $item The DataObject to be added, or its ID |
|
| 65 | + * @param DataObject $item The DataObject to be added, or its ID |
|
| 66 | 66 | */ |
| 67 | 67 | public function add($item) { |
| 68 | 68 | if(is_numeric($item)) { |