sminnee / silverstripe-framework

src/ORM/Hierarchy/MarkedSet.php

Doc Comments +3 added lines, -3 removed lines

@@ -387,7 +387,7 @@ 
      *
      * @param DataObject $node
      * @param int $depth
-     * @return array|string
+     * @return callable
      */
     protected function getSubtree($node, $depth = 0)
     {
@@ -620,7 +620,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)
@@ -765,7 +765,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
      */

tests/php/ORM/DBDateTest.php

Unused Use Statements -2 removed lines

@@ -7,9 +7,7 @@
 use SilverStripe\ORM\FieldType\DBDate;
 use SilverStripe\ORM\FieldType\DBField;
 use SilverStripe\ORM\FieldType\DBDatetime;
-use SilverStripe\ORM\DataObject;
 use SilverStripe\Dev\SapphireTest;
-use SilverStripe\Security\Member;
 
 class DBDateTest extends SapphireTest
 {

tests/php/ORM/MarkedSetTest.php

Doc Comments +5 added lines

@@ -418,6 +418,7 @@ 
      *
      * @param string$html
      * @param DataObject $node
+     * @param string $html
      * @return string
      */
     protected function getNodeClassFromTree($html, $node)
@@ -434,6 +435,10 @@ 
         return '';
     }
 
+    /**
+     * @param string $expected
+     * @param string $actual
+     */
     protected function assertHTMLSame($expected, $actual, $message = '')
     {
         // Trim each line, strip empty lines

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 
 namespace SilverStripe\ORM\Tests;
 
-use DOMDocument;
 use SilverStripe\Dev\CSSContentParser;
 use SilverStripe\Dev\SapphireTest;
 use SilverStripe\ORM\DataObject;

src/Control/Email/Email.php

Doc Comments +13 added lines, -13 removed lines

@@ -135,12 +135,12 @@ 
 
     /**
      * Email constructor.
-     * @param string|array|null $from
-     * @param string|array|null $to
+     * @param string $from
+     * @param string $to
      * @param string|null $subject
      * @param string|null $body
-     * @param string|array|null $cc
-     * @param string|array|null $bcc
+     * @param string $cc
+     * @param string $bcc
      * @param string|null $returnPath
      */
     public function __construct(
@@ -226,7 +226,7 @@ 
     }
 
     /**
-     * @param string|array $address
+     * @param string $address
      * @param string|null $name
      * @return $this
      */
@@ -238,7 +238,7 @@ 
     }
 
     /**
-     * @return array
+     * @return string
      */
     public function getSender()
     {
@@ -303,7 +303,7 @@ 
     }
 
     /**
-     * @param string|array $address
+     * @param string $address
      * @param string|null $name
      * @return $this
      */
@@ -335,7 +335,7 @@ 
     }
 
     /**
-     * @param string|array $address
+     * @param string $address
      * @param string|null $name
      * @return $this
      */
@@ -367,7 +367,7 @@ 
     }
 
     /**
-     * @param string|array $address
+     * @param string $address
      * @param string|null $name
      * @return $this
      */
@@ -384,7 +384,7 @@ 
     }
 
     /**
-     * @param string|array $address
+     * @param string $address
      * @param string|null $name
      * @return $this
      */
@@ -396,7 +396,7 @@ 
     }
 
     /**
-     * @param string|array $address
+     * @param string $address
      * @param string|null $name
      * @return $this
      */
@@ -502,7 +502,7 @@ 
     }
 
     /**
-     * @param string|array $name The data name to add or array to names => value
+     * @param string $name The data name to add or array to names => value
      * @param string|null $value The value of the data to add
      * @return $this
      */
@@ -728,7 +728,7 @@ 
     }
 
     /**
-     * @return Swift_MimePart|false
+     * @return \Swift_Mime_MimeEntity
      */
     public function findPlainPart()
     {

src/Control/Session.php

Doc Comments +8 added lines

@@ -330,6 +330,9 @@ 
         }
     }
 
+    /**
+     * @param string $name
+     */
     public function inst_set($name, $val)
     {
         // Quicker execution path for "."-free names
@@ -379,6 +382,11 @@ 
         $diffVar[sizeof($var)-1] = $val;
     }
 
+    /**
+     * @param string $name
+     *
+     * @return string
+     */
     public function inst_get($name)
     {
         // Quicker execution path for "."-free names

Unused Use Statements -1 removed lines

@@ -5,7 +5,6 @@
 use SilverStripe\Core\Config\Config;
 use SilverStripe\Core\Injector\Injectable;
 use SilverStripe\Core\Injector\Injector;
-use SilverStripe\Dev\Deprecation;
 
 /**
  * Handles all manipulation of the session.

src/Core/Manifest/ClassManifest.php

Doc Comments +2 added lines, -2 removed lines

@@ -225,7 +225,7 @@ 
     /**
      * Returns a lowercase array of all the class names in the manifest.
      *
-     * @return array
+     * @return string[]
      */
     public function getClassNames()
     {
@@ -256,7 +256,7 @@ 
      * Returns an array containing all the descendants (direct and indirect)
      * of a class.
      *
-     * @param  string|object $class
+     * @param  string $class
      * @return array
      */
     public function getDescendantsOf($class)

src/ORM/FieldType/DBField.php

Doc Comments +2 added lines, -2 removed lines

@@ -175,7 +175,7 @@ 
     /**
      * Returns the value of this field.
      *
-     * @return mixed
+     * @return string
      */
     public function getValue()
     {
@@ -533,7 +533,7 @@ 
     }
 
     /**
-     * @param array $value
+     * @param string $value
      * @return $this
      */
     public function setArrayValue($value)

tests/php/Core/Manifest/ThemeResourceLoaderTest.php

Doc Comments +6 added lines

@@ -279,6 +279,9 @@ 
         );
     }
 
+    /**
+     * @param string[] $templates
+     */
     protected function createTestTemplates($templates)
     {
         foreach ($templates as $template) {
@@ -286,6 +289,9 @@ 
         }
     }
 
+    /**
+     * @param string[] $templates
+     */
     protected function removeTestTemplates($templates)
     {
         foreach ($templates as $template) {

tests/php/Core/Startup/ParameterConfirmationTokenTest.php

Doc Comments +3 added lines

@@ -10,6 +10,9 @@
 class ParameterConfirmationTokenTest extends SapphireTest
 {
 
+    /**
+     * @param string $part
+     */
     private function addPart($answer, $slash, $part)
     {
         $bare = str_replace('/', '', $part);