Completed
Pull Request — 3.4 (#6867)
by Gregory
09:46
created
thirdparty/Zend/Loader/Autoloader/Resource.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -136,7 +136,7 @@
 block discarded – undo
136 136
      * Helper method to calculate the correct class path
137 137
      *
138 138
      * @param string $class
139
-     * @return False if not matched other wise the correct path
139
+     * @return false|string if not matched other wise the correct path
140 140
      */
141 141
     public function getClassPath($class)
142 142
     {
Please login to merge, or discard this patch.
thirdparty/Zend/Loader/PluginLoader.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -283,7 +283,7 @@
 block discarded – undo
283 283
      * Whether or not a Plugin by a specific name is loaded
284 284
      *
285 285
      * @param string $name
286
-     * @return Zend_Loader_PluginLoader
286
+     * @return boolean
287 287
      */
288 288
     public function isLoaded($name)
289 289
     {
Please login to merge, or discard this patch.
admin/code/LeftAndMain.php 1 patch
Doc Comments   +6 added lines, -1 removed lines patch added patch discarded remove patch
@@ -555,6 +555,7 @@  discard block
 block discarded – undo
555 555
 	 * Returns the menu title for the given LeftAndMain subclass.
556 556
 	 * Implemented static so that we can get this value without instantiating an object.
557 557
 	 * Menu title is *not* internationalised.
558
+	 * @return string
558 559
 	 */
559 560
 	public static function menu_title_for_class($class) {
560 561
 		$title = Config::inst()->get($class, 'menu_title', Config::FIRST_SET);
@@ -720,6 +721,7 @@  discard block
 block discarded – undo
720 721
 	 * Return a list of appropriate templates for this class, with the given suffix using
721 722
 	 * {@link SSViewer::get_templates_by_class()}
722 723
 	 *
724
+	 * @param string $suffix
723 725
 	 * @return array
724 726
 	 */
725 727
 	public function getTemplatesWithSuffix($suffix) {
@@ -1740,7 +1742,7 @@  discard block
 block discarded – undo
1740 1742
 	}
1741 1743
 
1742 1744
 	/**
1743
-	 * @return String
1745
+	 * @return DBField
1744 1746
 	 */
1745 1747
 	public function Locale() {
1746 1748
 		return DBField::create_field('DBLocale', i18n::get_locale());
@@ -1906,6 +1908,9 @@  discard block
 block discarded – undo
1906 1908
 		return (parent::isFinished() || $this->isFinished);
1907 1909
 	}
1908 1910
 
1911
+	/**
1912
+	 * @param boolean $bool
1913
+	 */
1909 1914
 	public function setIsFinished($bool) {
1910 1915
 		$this->isFinished = $bool;
1911 1916
 	}
Please login to merge, or discard this patch.
api/RSSFeed.php 1 patch
Doc Comments   +2 added lines patch added patch discarded remove patch
@@ -219,6 +219,7 @@  discard block
 block discarded – undo
219 219
 	 * via the standard template inclusion process.
220 220
 	 *
221 221
 	 * @param string
222
+	 * @param string $template
222 223
 	 */
223 224
 	public function setTemplate($template) {
224 225
 		$this->template = $template;
@@ -315,6 +316,7 @@  discard block
 block discarded – undo
315 316
 	/**
316 317
 	 * Return the named field as an obj() call from $this->failover.
317 318
 	 * Default to the given class if there's no casting information.
319
+	 * @param string $fieldName
318 320
 	 */
319 321
 	public function rssField($fieldName, $defaultClass = 'Varchar') {
320 322
 		if($fieldName) {
Please login to merge, or discard this patch.
core/Object.php 1 patch
Doc Comments   +8 added lines, -9 removed lines patch added patch discarded remove patch
@@ -125,8 +125,6 @@  discard block
 block discarded – undo
125 125
 	 *    $list = DataList::create('SiteTree');
126 126
 	 *	  $list = SiteTree::get();
127 127
 	 *
128
-	 * @param string $class the class name
129
-	 * @param mixed $arguments,... arguments to pass to the constructor
130 128
 	 * @return static
131 129
 	 */
132 130
 	public static function create() {
@@ -149,7 +147,6 @@  discard block
 block discarded – undo
149 147
 	 * way to access instance methods which don't rely on instance
150 148
 	 * data (e.g. the custom SilverStripe static handling).
151 149
 	 *
152
-	 * @param string $className Optional classname (if called on Object directly)
153 150
 	 * @return static The singleton instance
154 151
 	 */
155 152
 	public static function singleton() {
@@ -334,8 +331,6 @@  discard block
 block discarded – undo
334 331
 	 * Similar to {@link Object::create()}, except that classes are only overloaded if you set the $strong parameter to
335 332
 	 * TRUE when using {@link Object::useCustomClass()}
336 333
 	 *
337
-	 * @param string $class the class name
338
-	 * @param mixed $arguments,... arguments to pass to the constructor
339 334
 	 * @return static
340 335
 	 */
341 336
 	public static function strong_create() {
@@ -387,8 +382,8 @@  discard block
 block discarded – undo
387 382
 	 * without any inheritance, merging or parent lookup if it doesn't exist on the given class.
388 383
 	 *
389 384
 	 * @static
390
-	 * @param $class - The class to get the static from
391
-	 * @param $name - The property to get from the class
385
+	 * @param string $class - The class to get the static from
386
+	 * @param string $name - The property to get from the class
392 387
 	 * @param null $default - The value to return if property doesn't exist on class
393 388
 	 * @return any - The value of the static property $name on class $class, or $default if that property is not
394 389
 	 *               defined
@@ -914,6 +909,7 @@  discard block
 block discarded – undo
914 909
 
915 910
 	/**
916 911
 	 * @see Object::get_static()
912
+	 * @param string $name
917 913
 	 */
918 914
 	public function stat($name, $uncached = false) {
919 915
 		return Config::inst()->get(($this->class ? $this->class : get_class($this)), $name, Config::FIRST_SET);
@@ -921,6 +917,8 @@  discard block
 block discarded – undo
921 917
 
922 918
 	/**
923 919
 	 * @see Object::set_static()
920
+	 * @param string $name
921
+	 * @param string $value
924 922
 	 */
925 923
 	public function set_stat($name, $value) {
926 924
 		Config::inst()->update(($this->class ? $this->class : get_class($this)), $name, $value);
@@ -928,6 +926,7 @@  discard block
 block discarded – undo
928 926
 
929 927
 	/**
930 928
 	 * @see Object::uninherited_static()
929
+	 * @param string $name
931 930
 	 */
932 931
 	public function uninherited($name) {
933 932
 		return Config::inst()->get(($this->class ? $this->class : get_class($this)), $name, Config::UNINHERITED);
@@ -978,7 +977,7 @@  discard block
 block discarded – undo
978 977
 	 * all results into an array
979 978
 	 *
980 979
 	 * @param string $method the method name to call
981
-	 * @param mixed $argument a single argument to pass
980
+	 * @param string $argument a single argument to pass
982 981
 	 * @return mixed
983 982
 	 * @todo integrate inheritance rules
984 983
 	 */
@@ -1001,7 +1000,7 @@  discard block
 block discarded – undo
1001 1000
 	 * The extension methods are defined during {@link __construct()} in {@link defineMethods()}.
1002 1001
 	 *
1003 1002
 	 * @param string $method the name of the method to call on each extension
1004
-	 * @param mixed $a1,... up to 7 arguments to be passed to the method
1003
+	 * @param DataObject $a4
1005 1004
 	 * @return array
1006 1005
 	 */
1007 1006
 	public function extend($method, &$a1=null, &$a2=null, &$a3=null, &$a4=null, &$a5=null, &$a6=null, &$a7=null) {
Please login to merge, or discard this patch.
dev/DebugView.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -126,6 +126,7 @@
 block discarded – undo
126 126
 	 *
127 127
 	 * @param string $title
128 128
 	 * @param string $title
129
+	 * @param string|false $subtitle
129 130
 	 */
130 131
 	public function writeInfo($title, $subtitle, $description=false) {
131 132
 		echo '<div class="info">';
Please login to merge, or discard this patch.
dev/SapphireTest.php 1 patch
Doc Comments   +11 added lines, -9 removed lines patch added patch discarded remove patch
@@ -142,6 +142,7 @@  discard block
 block discarded – undo
142 142
 
143 143
 	/**
144 144
 	 * Set the manifest to be used to look up test classes by helper functions
145
+	 * @param SS_ClassManifest $manifest
145 146
 	 */
146 147
 	public static function set_test_class_manifest($manifest) {
147 148
 		self::$test_class_manifest = $manifest;
@@ -394,7 +395,7 @@  discard block
 block discarded – undo
394 395
 	/**
395 396
 	 * Get the ID of an object from the fixture.
396 397
 	 *
397
-	 * @param $className The data class, as specified in your fixture file.  Parent classes won't work
398
+	 * @param string $className The data class, as specified in your fixture file.  Parent classes won't work
398 399
 	 * @param $identifier The identifier string, as provided in your fixture file
399 400
 	 * @return int
400 401
 	 */
@@ -417,7 +418,7 @@  discard block
 block discarded – undo
417 418
 	 * Will collate all IDs form all fixtures if multiple fixtures are provided.
418 419
 	 *
419 420
 	 * @param string $className
420
-	 * @return array A map of fixture-identifier => object-id
421
+	 * @return A A map of fixture-identifier => object-id
421 422
 	 */
422 423
 	protected function allFixtureIDs($className) {
423 424
 		return $this->getFixtureFactory()->getIds($className);
@@ -574,10 +575,10 @@  discard block
 block discarded – undo
574 575
 	/**
575 576
 	 * Assert that the matching email was sent since the last call to clearEmails()
576 577
 	 * All of the parameters can either be a string, or, if they start with "/", a PREG-compatible regular expression.
577
-	 * @param $to
578
+	 * @param string $to
578 579
 	 * @param $from
579
-	 * @param $subject
580
-	 * @param $content
580
+	 * @param string $subject
581
+	 * @param string $content
581 582
 	 * @return array Contains the keys: 'type', 'to', 'from', 'subject', 'content', 'plainContent', 'attachedFiles',
582 583
 	 *               'customHeaders', 'htmlContent', inlineImages'
583 584
 	 */
@@ -738,7 +739,7 @@  discard block
 block discarded – undo
738 739
 	 * @param string $expectedSQL
739 740
 	 * @param string $actualSQL
740 741
 	 * @param string $message
741
-	 * @param float $delta
742
+	 * @param integer $delta
742 743
 	 * @param integer $maxDepth
743 744
 	 * @param boolean $canonicalize
744 745
 	 * @param boolean $ignoreCase
@@ -937,6 +938,7 @@  discard block
 block discarded – undo
937 938
 	/**
938 939
 	 * Create a member and group with the given permission code, and log in with it.
939 940
 	 * Returns the member ID.
941
+	 * @return integer
940 942
 	 */
941 943
 	public function logInWithPermission($permCode = "ADMIN") {
942 944
 		if(!isset($this->cache_generatedMembers[$permCode])) {
@@ -976,9 +978,9 @@  discard block
 block discarded – undo
976 978
 	/**
977 979
 	 * Test against a theme.
978 980
 	 *
979
-	 * @param $themeBaseDir string - themes directory
980
-	 * @param $theme string - theme name
981
-	 * @param $callback Closure
981
+	 * @param string $themeBaseDir string - themes directory
982
+	 * @param string $theme string - theme name
983
+	 * @param Closure $callback Closure
982 984
 	 */
983 985
 	protected function useTestTheme($themeBaseDir, $theme, $callback) {
984 986
 		Config::nest();
Please login to merge, or discard this patch.
filesystem/Upload.php 1 patch
Doc Comments   +5 added lines, -4 removed lines patch added patch discarded remove patch
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
 	 * Set a different instance than {@link Upload_Validator}
103 103
 	 * for this upload session.
104 104
 	 *
105
-	 * @param object $validator
105
+	 * @param Upload_Validator $validator
106 106
 	 */
107 107
 	public function setValidator($validator) {
108 108
 		$this->validator = $validator;
@@ -223,7 +223,7 @@  discard block
 block discarded – undo
223 223
 	 *
224 224
 	 * @param array $tmpFile
225 225
 	 * @param File $file
226
-	 * @return Boolean
226
+	 * @return boolean|string
227 227
 	 */
228 228
 	public function loadIntoFile($tmpFile, $file, $folderPath = false) {
229 229
 		$this->file = $file;
@@ -231,7 +231,8 @@  discard block
 block discarded – undo
231 231
 	}
232 232
 
233 233
 	/**
234
-	 * @return Boolean
234
+	 * @param boolean $bool
235
+	 * @return boolean|null
235 236
 	 */
236 237
 	public function setReplaceFile($bool) {
237 238
 		$this->replaceFile = $bool;
@@ -295,7 +296,7 @@  discard block
 block discarded – undo
295 296
 	/**
296 297
 	 * Determines wether previous operations caused an error.
297 298
 	 *
298
-	 * @return boolean
299
+	 * @return integer
299 300
 	 */
300 301
 	public function isError() {
301 302
 		return (count($this->errors));
Please login to merge, or discard this patch.
forms/HtmlEditorField.php 1 patch
Doc Comments   +10 added lines, -3 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 	 *
46 46
 	 * @param string $name The internal field name, passed to forms.
47 47
 	 * @param string $title The human-readable field label.
48
-	 * @param mixed $value The value of the field.
48
+	 * @param integer $value The value of the field.
49 49
 	 * @param string $config HTMLEditorConfig identifier to be used. Default to the active one.
50 50
 	 */
51 51
 	public function __construct($name, $title = null, $value = '', $config = null) {
@@ -169,6 +169,10 @@  discard block
 block discarded – undo
169 169
 
170 170
 	protected $controller, $name;
171 171
 
172
+	/**
173
+	 * @param Controller|null $controller
174
+	 * @param string $name
175
+	 */
172 176
 	public function __construct($controller, $name) {
173 177
 		parent::__construct();
174 178
 
@@ -197,7 +201,7 @@  discard block
 block discarded – undo
197 201
 	/**
198 202
 	 * Searches the SiteTree for display in the dropdown
199 203
 	 *
200
-	 * @return callback
204
+	 * @return DataList
201 205
 	 */
202 206
 	public function siteTreeSearchCallback($sourceObject, $labelField, $search) {
203 207
 		return DataObject::get($sourceObject)->filterAny(array(
@@ -563,7 +567,7 @@  discard block
 block discarded – undo
563 567
 	/**
564 568
 	 * Find all anchors available on the given page.
565 569
 	 *
566
-	 * @return array
570
+	 * @return string
567 571
 	 */
568 572
 	public function getanchors() {
569 573
 		$id = (int)$this->getRequest()->getVar('PageID');
@@ -607,6 +611,7 @@  discard block
 block discarded – undo
607 611
 	 * not the "master record" in the database - hence there's no form or saving logic.
608 612
 	 *
609 613
 	 * @param String Relative or absolute URL to file
614
+	 * @param HtmlEditorField_File $file
610 615
 	 * @return FieldList
611 616
 	 */
612 617
 	protected function getFieldsForFile($url, $file) {
@@ -628,6 +633,7 @@  discard block
 block discarded – undo
628 633
 	}
629 634
 
630 635
 	/**
636
+	 * @param HtmlEditorField_Embed $file
631 637
 	 * @return FieldList
632 638
 	 */
633 639
 	protected function getFieldsForOembed($url, $file) {
@@ -837,6 +843,7 @@  discard block
 block discarded – undo
837 843
 
838 844
 	/**
839 845
 	 * @param Int
846
+	 * @param integer $parentID
840 847
 	 * @return DataList
841 848
 	 */
842 849
 	protected function getFiles($parentID = null) {
Please login to merge, or discard this patch.