Completed
Pull Request — master (#7083)
by Sam
07:25
created
src/ORM/FieldType/DBDate.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -245,7 +245,7 @@  discard block
 block discarded – undo
245 245
      * Return a date formatted as per a CMS user's settings.
246 246
      *
247 247
      * @param Member $member
248
-     * @return boolean | string A date formatted as per user-defined settings.
248
+     * @return null|string | string A date formatted as per user-defined settings.
249 249
      */
250 250
     public function FormatFromSettings($member = null)
251 251
     {
@@ -551,7 +551,7 @@  discard block
 block discarded – undo
551 551
      * Attempt to split date string into year, month, day, and timestamp components.
552 552
      *
553 553
      * @param string $value
554
-     * @return array
554
+     * @return string[]
555 555
      */
556 556
     protected function explodeDateString($value)
557 557
     {
Please login to merge, or discard this patch.
tests/php/View/SSViewerCacheBlockTest.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -31,6 +31,9 @@
 block discarded – undo
31 31
         Injector::inst()->get(CacheInterface::class . '.cacheblock')->clear();
32 32
     }
33 33
 
34
+    /**
35
+     * @param string $template
36
+     */
34 37
     protected function _runtemplate($template, $data = null)
35 38
     {
36 39
         if ($data === null) {
Please login to merge, or discard this patch.
src/Control/Director.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -925,7 +925,7 @@  discard block
 block discarded – undo
925 925
     /**
926 926
      * Returns true if the given file exists. Filename should be relative to the site root.
927 927
      *
928
-     * @param $file
928
+     * @param string $file
929 929
      *
930 930
      * @return bool
931 931
      */
@@ -1153,7 +1153,7 @@  discard block
 block discarded – undo
1153 1153
      * Can also be checked with {@link Director::isDev()}, {@link Director::isTest()}, and
1154 1154
      * {@link Director::isLive()}.
1155 1155
      *
1156
-     * @return bool
1156
+     * @return string
1157 1157
      */
1158 1158
     public static function get_environment_type()
1159 1159
     {
Please login to merge, or discard this patch.
src/Core/Manifest/Module.php 1 patch
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -28,6 +28,10 @@
 block discarded – undo
28 28
      */
29 29
     protected $composerData = null;
30 30
 
31
+    /**
32
+     * @param string $path
33
+     * @param string $base
34
+     */
31 35
     public function __construct($path, $base)
32 36
     {
33 37
         $this->path = rtrim($path, '/\\');
Please login to merge, or discard this patch.
src/Dev/FunctionalTest.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
      * Find an attribute in a SimpleXMLElement object by name.
227 227
      * @param SimpleXMLElement $object
228 228
      * @param string $attribute Name of attribute to find
229
-     * @return SimpleXMLElement object of the attribute
229
+     * @return boolean object of the attribute
230 230
      */
231 231
     public function findAttribute($object, $attribute)
232 232
     {
@@ -260,7 +260,7 @@  discard block
 block discarded – undo
260 260
      * Note:   characters are stripped from the content; make sure that your assertions take this into account.
261 261
      *
262 262
      * @param string $selector A basic CSS selector, e.g. 'li.jobs h3'
263
-     * @param array|string $expectedMatches The content of at least one of the matched tags
263
+     * @param string[] $expectedMatches The content of at least one of the matched tags
264 264
      * @param string $message
265 265
      * @throws PHPUnit_Framework_AssertionFailedError
266 266
      */
Please login to merge, or discard this patch.
src/Security/PasswordEncryptor_Blowfish.php 1 patch
Doc Comments   +5 added lines patch added patch discarded remove patch
@@ -165,6 +165,11 @@
 block discarded – undo
165 165
         return sprintf('%02d', self::$cost) . '$' . substr($generator->randomToken('sha1'), 0, 22);
166 166
     }
167 167
 
168
+    /**
169
+     * @param string|false $hash
170
+     * @param string $password
171
+     * @param string $salt
172
+     */
168 173
     public function check($hash, $password, $salt = null, $member = null)
169 174
     {
170 175
         if (strpos($hash, '$2y$') === 0) {
Please login to merge, or discard this patch.
src/Forms/FormRequestHandler.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -390,7 +390,7 @@
 block discarded – undo
390 390
     /**
391 391
      * Fields can have action to, let's check if anyone of the responds to $funcname them
392 392
      *
393
-     * @param SS_List|array $fields
393
+     * @param FieldList $fields
394 394
      * @param callable $funcName
395 395
      * @return FormField
396 396
      */
Please login to merge, or discard this patch.
src/Core/Cache/DefaultCacheFactory.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
     /**
79 79
      * Determine if apcu is supported
80 80
      *
81
-     * @return bool
81
+     * @return boolean|null
82 82
      */
83 83
     protected function isAPCUSupported()
84 84
     {
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
     /**
93 93
      * Determine if PHP files is supported
94 94
      *
95
-     * @return bool
95
+     * @return boolean|null
96 96
      */
97 97
     protected function isPHPFilesSupported()
98 98
     {
Please login to merge, or discard this patch.
src/Forms/HTMLEditor/HTMLEditorConfig.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -151,7 +151,7 @@
 block discarded – undo
151 151
      * Get the current value of an option
152 152
      *
153 153
      * @param string $key The key of the option to get
154
-     * @return mixed The value of the specified option
154
+     * @return string The value of the specified option
155 155
      */
156 156
     abstract public function getOption($key);
157 157
 
Please login to merge, or discard this patch.