silverstripe / silverstripe-framework

src/includes/functions.php

Doc Comments -6 removed lines

@@ -53,12 +53,6 @@
  * @param string $entity Entity that identifies the string. It must be in the form
  * "Namespace.Entity" where Namespace will be usually the class name where this
  * string is used and Entity identifies the string inside the namespace.
- * @param mixed $arg,... Additional arguments are parsed as such:
- *  - Next string argument is a default. Pass in a `|` pipe-delimeted value with `{count}`
- *    to do pluralisation.
- *  - Any other string argument after default is context for i18nTextCollector
- *  - Any array argument in any order is an injection parameter list. Pass in a `count`
- *    injection parameter to pluralise.
  * @return string
  */
 function _t($entity, $arg = null)

src/ORM/DataObject.php

Doc Comments +8 added lines, -7 removed lines

@@ -2397,6 +2397,7 @@ 
 
     /**
      * {@inheritdoc}
+     * @param string $field
      */
     public function castingHelper($field)
     {
@@ -2502,7 +2503,7 @@ 
      * </code>
      *
      * @param string $methodName Method on the same object, e.g. {@link canEdit()}
-     * @param Member|int $member
+     * @param null|Member $member
      * @param array $context Optional context
      * @return boolean|null
      */
@@ -2525,7 +2526,7 @@ 
 
     /**
      * @param Member $member
-     * @return boolean
+     * @return boolean|string
      */
     public function canView($member = null)
     {
@@ -2538,7 +2539,7 @@ 
 
     /**
      * @param Member $member
-     * @return boolean
+     * @return boolean|string
      */
     public function canEdit($member = null)
     {
@@ -2551,7 +2552,7 @@ 
 
     /**
      * @param Member $member
-     * @return boolean
+     * @return boolean|string
      */
     public function canDelete($member = null)
     {
@@ -2566,7 +2567,7 @@ 
      * @param Member $member
      * @param array $context Additional context-specific data which might
      * affect whether (or where) this object could be created.
-     * @return boolean
+     * @return boolean|string
      */
     public function canCreate($member = null, $context = array())
     {
@@ -2683,7 +2684,7 @@ 
      * Traverses to a field referenced by relationships between data objects, returning the value
      * The path to the related field is specified with dot separated syntax (eg: Parent.Child.Child.FieldName)
      *
-     * @param $fieldName string
+     * @param string $fieldName string
      * @return string | null - will return null on a missing value
      */
     public function relField($fieldName)
@@ -2762,7 +2763,7 @@ 
      * @param string $callerClass The class of objects to be returned
      * @param string|array $filter A filter to be inserted into the WHERE clause.
      * Supports parameterised queries. See SQLSelect::addWhere() for syntax examples.
-     * @param string|array $sort A sort expression to be inserted into the ORDER
+     * @param string $sort A sort expression to be inserted into the ORDER
      * BY clause.  If omitted, self::$default_sort will be used.
      * @param string $join Deprecated 3.0 Join clause. Use leftJoin($table, $joinClause) instead.
      * @param string|array $limit A limit expression to be inserted into the LIMIT clause.