Completed
Pull Request — master (#6394)
by Ed
10:36
created
src/Security/Permission.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
      *  will be checked for the current user
123 123
      * @param bool $strict Use "strict" checking (which means a permission
124 124
      *  will be granted if the key does not exist at all)?
125
-     * @return int|bool The ID of the permission record if the permission
125
+     * @return boolean|string The ID of the permission record if the permission
126 126
      *  exists; FALSE otherwise. If "strict" checking is
127 127
      *  disabled, TRUE will be returned if the permission does not exist at all.
128 128
      */
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
      * @param string $arg Optional argument (e.g. a permissions for a specific page)
163 163
      * @param bool $strict Use "strict" checking (which means a permission
164 164
      *  will be granted if the key does not exist at all)?
165
-     * @return int|bool The ID of the permission record if the permission
165
+     * @return boolean|string The ID of the permission record if the permission
166 166
      *  exists; FALSE otherwise. If "strict" checking is
167 167
      *  disabled, TRUE will be returned if the permission does not exist at all.
168 168
      */
Please login to merge, or discard this patch.
src/Security/Permission_Group.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -58,7 +58,7 @@
 block discarded – undo
58 58
     /**
59 59
      * Get permissions
60 60
      *
61
-     * @return array Associative array of permissions in this permission
61
+     * @return string Associative array of permissions in this permission
62 62
      *               group. The array indicies are the permission codes as
63 63
      *               used in {@link Permission::check()}. The value is
64 64
      *               suitable for using in an interface.
Please login to merge, or discard this patch.
src/Security/RememberLoginHash.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -85,6 +85,9 @@
 block discarded – undo
85 85
         return $this->token;
86 86
     }
87 87
 
88
+    /**
89
+     * @param string $token
90
+     */
88 91
     public function setToken($token)
89 92
     {
90 93
         $this->token = $token;
Please login to merge, or discard this patch.
src/Security/Security.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -532,7 +532,7 @@  discard block
 block discarded – undo
532 532
      * Combine the given forms into a formset with a tabbed interface
533 533
      *
534 534
      * @param array $forms List of LoginForm instances
535
-     * @return string
535
+     * @return \SilverStripe\ORM\FieldType\DBHTMLText
536 536
      */
537 537
     protected function generateLoginFormSet($forms)
538 538
     {
@@ -1149,7 +1149,7 @@  discard block
 block discarded – undo
1149 1149
     /**
1150 1150
      * Set to true to ignore access to disallowed actions, rather than returning permission failure
1151 1151
      * Note that this is just a flag that other code needs to check with Security::ignore_disallowed_actions()
1152
-     * @param $flag True or false
1152
+     * @param boolean $flag True or false
1153 1153
      */
1154 1154
     public static function set_ignore_disallowed_actions($flag)
1155 1155
     {
Please login to merge, or discard this patch.
src/View/Parsers/Diff.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -161,7 +161,7 @@
 block discarded – undo
161 161
     }
162 162
 
163 163
     /**
164
-     * @param string|array $content If passed as an array, values will be concatenated with a comma.
164
+     * @param string $content If passed as an array, values will be concatenated with a comma.
165 165
      * @return array
166 166
      */
167 167
     public static function getHTMLChunks($content)
Please login to merge, or discard this patch.
src/View/Parsers/HTMLValue.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -150,6 +150,7 @@
 block discarded – undo
150 150
     /**
151 151
      * Get the body element, or false if there isn't one (we haven't loaded any content
152 152
      * or this instance is in an invalid state)
153
+     * @return \DOMElement
153 154
      */
154 155
     public function getBody()
155 156
     {
Please login to merge, or discard this patch.
src/View/Parsers/ShortcodeParser.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -197,6 +197,9 @@
 block discarded – undo
197 197
 
198 198
     // --------------------------------------------------------------------------------------------------------------
199 199
 
200
+    /**
201
+     * @param DOMElement $node
202
+     */
200 203
     protected function removeNode($node)
201 204
     {
202 205
         $node->parentNode->removeChild($node);
Please login to merge, or discard this patch.
src/View/Parsers/URLSegmentFilter.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -139,6 +139,7 @@
 block discarded – undo
139 139
 
140 140
     /**
141 141
      * @param boolean
142
+     * @param boolean $bool
142 143
      */
143 144
     public function setAllowMultibyte($bool)
144 145
     {
Please login to merge, or discard this patch.
src/View/Requirements_Backend.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -321,6 +321,7 @@
 block discarded – undo
321 321
      * Forces the JavaScript requirements to the end of the body, right before the closing tag
322 322
      *
323 323
      * @param bool
324
+     * @param boolean $var
324 325
      * @return $this
325 326
      */
326 327
     public function setForceJSToBottom($var)
Please login to merge, or discard this patch.