silverstripe / silverstripe-framework

src/ORM/DataList.php

Doc Comments +9 added lines, -9 removed lines

@@ -556,7 +556,7 @@ 
      * Check if the given field specification could be interpreted as an unquoted relation name
      *
      * @param string $field
-     * @return bool
+     * @return integer
      */
     protected function isValidRelationName($field)
     {
@@ -669,7 +669,7 @@ 
      * @param int $order A numerical index to control the order that joins are added to the query; lower order values
      * will cause the query to appear first. The default is 20, and joins created automatically by the
      * ORM have a value of 10.
-     * @param array $parameters Any additional parameters if the join is a parameterised subquery
+     * @param string[] $parameters Any additional parameters if the join is a parameterised subquery
      * @return static
      */
     public function innerJoin($table, $onClause, $alias = null, $order = 20, $parameters = array())
@@ -688,7 +688,7 @@ 
      * @param int $order A numerical index to control the order that joins are added to the query; lower order values
      * will cause the query to appear first. The default is 20, and joins created automatically by the
      * ORM have a value of 10.
-     * @param array $parameters Any additional parameters if the join is a parameterised subquery
+     * @param string[] $parameters Any additional parameters if the join is a parameterised subquery
      * @return static
      */
     public function leftJoin($table, $onClause, $alias = null, $order = 20, $parameters = array())
@@ -836,7 +836,7 @@ 
      * Return the maximum value of the given field in this DataList
      *
      * @param string $fieldName
-     * @return mixed
+     * @return string
      */
     public function max($fieldName)
     {
@@ -847,7 +847,7 @@ 
      * Return the minimum value of the given field in this DataList
      *
      * @param string $fieldName
-     * @return mixed
+     * @return string
      */
     public function min($fieldName)
     {
@@ -858,7 +858,7 @@ 
      * Return the average value of the given field in this DataList
      *
      * @param string $fieldName
-     * @return mixed
+     * @return string
      */
     public function avg($fieldName)
     {
@@ -869,7 +869,7 @@ 
      * Return the sum of the values of the given field in this DataList
      *
      * @param string $fieldName
-     * @return mixed
+     * @return string
      */
     public function sum($fieldName)
     {
@@ -928,7 +928,7 @@ 
     /**
      * Restrict the columns to fetch into this DataList
      *
-     * @param array $queriedColumns
+     * @param string[] $queriedColumns
      * @return static
      */
     public function setQueriedColumns($queriedColumns)
@@ -1174,7 +1174,7 @@ 
     /**
      * Returns item stored in list with index $key
      *
-     * @param mixed $key
+     * @param integer $key
      * @return DataObject
      */
     public function offsetGet($key)

src/ORM/FieldType/DBDatetime.php

Doc Comments +2 added lines, -2 removed lines

@@ -85,7 +85,7 @@ 
      * Return a date and time formatted as per a CMS user's settings.
      *
      * @param Member $member
-     * @return boolean | string A time and date pair formatted as per user-defined settings.
+     * @return null|string | string A time and date pair formatted as per user-defined settings.
      */
     public function FormatFromSettings($member = null)
     {
@@ -190,7 +190,7 @@ 
      * Use {@link clear_mock_now()} to revert to the current system date.
      * Caution: This sets a fixed date that doesn't increment with time.
      *
-     * @param DBDatetime|string $datetime Either in object format, or as a DBDatetime compatible string.
+     * @param string $datetime Either in object format, or as a DBDatetime compatible string.
      * @throws Exception
      */
     public static function set_mock_now($datetime)

src/ORM/ManyManyThroughList.php

Doc Comments +1 added lines, -1 removed lines

@@ -130,7 +130,7 @@
     }
 
     /**
-     * @param mixed $item
+     * @param Tests\ManyManyThroughListTest\Item $item
      * @param array $extraFields
      */
     public function add($item, $extraFields = [])

src/ORM/Queries/SQLSelect.php

Doc Comments +1 added lines, -3 removed lines

@@ -380,7 +380,7 @@ 
      *
      * @param string $value
      * @param string $defaultDirection
-     * @return array A two element array: array($column, $direction)
+     * @return string[] A two element array: array($column, $direction)
      */
     private function getDirectionFromString($value, $defaultDirection = null)
     {
@@ -482,7 +482,6 @@ 
      * @see SQLSelect::addWhere() for syntax examples
      *
      * @param mixed $having Predicate(s) to set, as escaped SQL statements or paramaterised queries
-     * @param mixed $having,... Unlimited additional predicates
      * @return $this Self reference
      */
     public function setHaving($having)
@@ -498,7 +497,6 @@ 
      * @see SQLSelect::addWhere() for syntax examples
      *
      * @param mixed $having Predicate(s) to set, as escaped SQL statements or paramaterised queries
-     * @param mixed $having,... Unlimited additional predicates
      * @return $this Self reference
      */
     public function addHaving($having)

tests/php/View/Parsers/ShortcodeParserTest.php

Doc Comments +4 added lines

@@ -208,6 +208,10 @@
         $this->assertEquals('', $this->parser->parse('[test_shortcode][test_shortcode]'));
     }
 
+    /**
+     * @param string $a
+     * @param string $b
+     */
     protected function assertEqualsIgnoringWhitespace($a, $b, $message = null)
     {
         $this->assertEquals(preg_replace('/\s+/', '', $a), preg_replace('/\s+/', '', $b), $message);

tests/php/View/RequirementsTest.php

Doc Comments +4 added lines

@@ -1048,6 +1048,10 @@
         }
     }
 
+    /**
+     * @param Requirements_Backend $backend
+     * @param string $type
+     */
     public function assertFileNotIncluded($backend, $type, $files)
     {
         $includedFiles = $this->getBackendFiles($backend, $type);

src/Forms/HTMLEditor/HTMLEditorField_Embed.php

Doc Comments +1 added lines, -1 removed lines

@@ -143,7 +143,7 @@
     }
 
     /**
-     * @return AdapterInterface
+     * @return Adapter
      */
     public function getEmbed()
     {

src/Forms/TreeDropdownField.php

Doc Comments +2 added lines, -2 removed lines

@@ -313,7 +313,7 @@ 
 
     /**
      * @param array $properties
-     * @return string
+     * @return \SilverStripe\ORM\FieldType\DBHTMLText
      */
     public function Field($properties = array())
     {
@@ -479,7 +479,7 @@ 
 
     /**
      * Marking a specific node in the tree as disabled
-     * @param $node
+     * @param DataObject $node
      * @return boolean
      */
     public function nodeIsDisabled($node)

src/ORM/Hierarchy/MarkedSet.php

Doc Comments +3 added lines, -3 removed lines

@@ -380,7 +380,7 @@ 
      *
      * @param DataObject $node
      * @param int $depth
-     * @return array|string
+     * @return callable
      */
     protected function getSubtree($node, $depth = 0)
     {
@@ -613,7 +613,7 @@ 
     /**
      * Expose the given object in the tree, by marking this page and all it ancestors.
      *
-     * @param DataObject|Hierarchy $childObj
+     * @param DataObject $childObj
      * @return $this
      */
     public function markToExpose(DataObject $childObj)
@@ -758,7 +758,7 @@ 
     /**
      * Check if this node has too many children
      *
-     * @param DataObject|Hierarchy $node
+     * @param DataObject $node
      * @param int $count Children count (if already calculated)
      * @return bool
      */