Completed
Pull Request — master (#7083)
by Sam
07:25
created
src/Security/MemberAuthenticator/LogoutHandler.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
     /**
80 80
      * @param Member $member
81
-     * @return HTTPResponse
81
+     * @return \SilverStripe\Control\HTTPResponse
82 82
      */
83 83
     public function doLogOut($member)
84 84
     {
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
     }
99 99
 
100 100
     /**
101
-     * @return HTTPResponse
101
+     * @return \SilverStripe\Control\HTTPResponse
102 102
      */
103 103
     protected function redirectAfterLogout()
104 104
     {
Please login to merge, or discard this patch.
src/Core/Environment.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
      * Only increases up to the maximum defined in {@link setMemoryLimitMax()},
52 52
      * and defaults to the 'memory_limit' setting in the PHP configuration.
53 53
      *
54
-     * @param string|float|int $memoryLimit A memory limit string, such as "64M".  If omitted, unlimited memory will be set.
54
+     * @param integer $memoryLimit A memory limit string, such as "64M".  If omitted, unlimited memory will be set.
55 55
      * @return bool true indicates a successful change, false a denied change.
56 56
      */
57 57
     public static function increaseMemoryLimitTo($memoryLimit = -1)
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
     }
97 97
 
98 98
     /**
99
-     * @return int Memory limit in bytes
99
+     * @return double Memory limit in bytes
100 100
      */
101 101
     public static function getMemoryLimitMax()
102 102
     {
Please login to merge, or discard this patch.
tests/php/Forms/DropdownFieldTest.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -400,7 +400,7 @@
 block discarded – undo
400 400
      * string of HTML.
401 401
      *
402 402
      * @param  string $html HTML to scan for elements
403
-     * @return SimpleXMLElement
403
+     * @return \SimpleXMLElement[]
404 404
      */
405 405
     public function findOptionElements($html)
406 406
     {
Please login to merge, or discard this patch.
src/Dev/Install/InstallRequirements.php 1 patch
Doc Comments   +72 added lines, -2 removed lines patch added patch discarded remove patch
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
159 159
 
160 160
     /**
161 161
      * Find the webserver software running on the PHP host.
162
-     * @return string|boolean Server software or boolean FALSE
162
+     * @return false|string Server software or boolean FALSE
163 163
      */
164 164
     public function findWebserver()
165 165
     {
@@ -469,6 +469,10 @@  discard block
 block discarded – undo
469 469
         return ini_get($settingName);
470 470
     }
471 471
 
472
+    /**
473
+     * @param string $settingName
474
+     * @param string[] $testDetails
475
+     */
472 476
     public function suggestPHPSetting($settingName, $settingValues, $testDetails)
473 477
     {
474 478
         $this->testing($testDetails);
@@ -482,6 +486,11 @@  discard block
 block discarded – undo
482 486
         }
483 487
     }
484 488
 
489
+    /**
490
+     * @param string $settingName
491
+     * @param false[] $settingValues
492
+     * @param string[] $testDetails
493
+     */
485 494
     public function requirePHPSetting($settingName, $settingValues, $testDetails)
486 495
     {
487 496
         $this->testing($testDetails);
@@ -492,6 +501,10 @@  discard block
 block discarded – undo
492 501
         }
493 502
     }
494 503
 
504
+    /**
505
+     * @param string $class
506
+     * @param string[] $testDetails
507
+     */
495 508
     public function suggestClass($class, $testDetails)
496 509
     {
497 510
         $this->testing($testDetails);
@@ -501,6 +514,10 @@  discard block
 block discarded – undo
501 514
         }
502 515
     }
503 516
 
517
+    /**
518
+     * @param string $class
519
+     * @param string[] $testDetails
520
+     */
504 521
     public function suggestFunction($class, $testDetails)
505 522
     {
506 523
         $this->testing($testDetails);
@@ -520,6 +537,10 @@  discard block
 block discarded – undo
520 537
         }
521 538
     }
522 539
 
540
+    /**
541
+     * @param integer $min
542
+     * @param integer $recommended
543
+     */
523 544
     public function requireMemory($min, $recommended, $testDetails)
524 545
     {
525 546
         $_SESSION['forcemem'] = false;
@@ -635,6 +656,10 @@  discard block
 block discarded – undo
635 656
         }
636 657
     }
637 658
 
659
+    /**
660
+     * @param string $funcName
661
+     * @param string[] $testDetails
662
+     */
638 663
     public function requireFunction($funcName, $testDetails)
639 664
     {
640 665
         $this->testing($testDetails);
@@ -646,6 +671,10 @@  discard block
 block discarded – undo
646 671
         return true;
647 672
     }
648 673
 
674
+    /**
675
+     * @param string $className
676
+     * @param string[] $testDetails
677
+     */
649 678
     public function requireClass($className, $testDetails)
650 679
     {
651 680
         $this->testing($testDetails);
@@ -692,6 +721,10 @@  discard block
 block discarded – undo
692 721
         return true;
693 722
     }
694 723
 
724
+    /**
725
+     * @param string $recommendedVersion
726
+     * @param string $requiredVersion
727
+     */
695 728
     public function requirePHPVersion($recommendedVersion, $requiredVersion, $testDetails)
696 729
     {
697 730
         $this->testing($testDetails);
@@ -735,7 +768,7 @@  discard block
 block discarded – undo
735 768
      * to ensure the module directory is intact.
736 769
      *
737 770
      * @param string $dirname
738
-     * @param array $testDetails
771
+     * @param string[] $testDetails
739 772
      */
740 773
     public function requireModule($dirname, $testDetails)
741 774
     {
@@ -751,6 +784,10 @@  discard block
 block discarded – undo
751 784
         }
752 785
     }
753 786
 
787
+    /**
788
+     * @param string $filename
789
+     * @param string[] $testDetails
790
+     */
754 791
     public function requireFile($filename, $testDetails)
755 792
     {
756 793
         $this->testing($testDetails);
@@ -761,6 +798,9 @@  discard block
 block discarded – undo
761 798
         }
762 799
     }
763 800
 
801
+    /**
802
+     * @param string $filename
803
+     */
764 804
     public function requireWriteable($filename, $testDetails, $absolute = false)
765 805
     {
766 806
         $this->testing($testDetails);
@@ -869,6 +909,10 @@  discard block
 block discarded – undo
869 909
         }
870 910
     }
871 911
 
912
+    /**
913
+     * @param string $moduleName
914
+     * @param string[] $testDetails
915
+     */
872 916
     public function requireApacheRewriteModule($moduleName, $testDetails)
873 917
     {
874 918
         $this->testing($testDetails);
@@ -889,6 +933,10 @@  discard block
 block discarded – undo
889 933
         return ($this->testApacheRewriteExists() || $this->testIISRewriteModuleExists());
890 934
     }
891 935
 
936
+    /**
937
+     * @param string $moduleName
938
+     * @param string[] $testDetails
939
+     */
892 940
     public function requireIISRewriteModule($moduleName, $testDetails)
893 941
     {
894 942
         $this->testing($testDetails);
@@ -916,6 +964,9 @@  discard block
 block discarded – undo
916 964
         return DatabaseAdapterRegistry::getDatabaseConfigurationHelper($databaseClass);
917 965
     }
918 966
 
967
+    /**
968
+     * @param string[] $testDetails
969
+     */
919 970
     public function requireDatabaseFunctions($databaseConfig, $testDetails)
920 971
     {
921 972
         $this->testing($testDetails);
@@ -933,6 +984,9 @@  discard block
 block discarded – undo
933 984
         }
934 985
     }
935 986
 
987
+    /**
988
+     * @param string[] $testDetails
989
+     */
936 990
     public function requireDatabaseConnection($databaseConfig, $testDetails)
937 991
     {
938 992
         $this->testing($testDetails);
@@ -947,6 +1001,9 @@  discard block
 block discarded – undo
947 1001
         }
948 1002
     }
949 1003
 
1004
+    /**
1005
+     * @param string[] $testDetails
1006
+     */
950 1007
     public function requireDatabaseVersion($databaseConfig, $testDetails)
951 1008
     {
952 1009
         $this->testing($testDetails);
@@ -979,6 +1036,9 @@  discard block
 block discarded – undo
979 1036
         }
980 1037
     }
981 1038
 
1039
+    /**
1040
+     * @param string[] $testDetails
1041
+     */
982 1042
     public function requireDatabaseOrCreatePermissions($databaseConfig, $testDetails)
983 1043
     {
984 1044
         $this->testing($testDetails);
@@ -1004,6 +1064,9 @@  discard block
 block discarded – undo
1004 1064
         }
1005 1065
     }
1006 1066
 
1067
+    /**
1068
+     * @param string[] $testDetails
1069
+     */
1007 1070
     public function requireDatabaseAlterPermissions($databaseConfig, $testDetails)
1008 1071
     {
1009 1072
         $this->testing($testDetails);
@@ -1019,6 +1082,10 @@  discard block
 block discarded – undo
1019 1082
         }
1020 1083
     }
1021 1084
 
1085
+    /**
1086
+     * @param string[] $varNames
1087
+     * @param string[] $testDetails
1088
+     */
1022 1089
     public function requireServerVariables($varNames, $testDetails)
1023 1090
     {
1024 1091
         $this->testing($testDetails);
@@ -1040,6 +1107,9 @@  discard block
 block discarded – undo
1040 1107
     }
1041 1108
 
1042 1109
 
1110
+    /**
1111
+     * @param string[] $testDetails
1112
+     */
1043 1113
     public function requirePostSupport($testDetails)
1044 1114
     {
1045 1115
         $this->testing($testDetails);
Please login to merge, or discard this patch.
src/Core/Manifest/ClassManifest.php 1 patch
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -258,7 +258,7 @@  discard block
 block discarded – undo
258 258
      * Returns an array containing all the descendants (direct and indirect)
259 259
      * of a class.
260 260
      *
261
-     * @param  string|object $class
261
+     * @param  string $class
262 262
      * @return array
263 263
      */
264 264
     public function getDescendantsOf($class)
@@ -390,6 +390,9 @@  discard block
 block discarded – undo
390 390
         }
391 391
     }
392 392
 
393
+    /**
394
+     * @param boolean $includeTests
395
+     */
393 396
     public function handleFile($basename, $pathname, $includeTests)
394 397
     {
395 398
         $classes    = null;
Please login to merge, or discard this patch.
src/Dev/Deprecation.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -77,9 +77,9 @@  discard block
 block discarded – undo
77 77
      * greater than or equal to this version, a message will be raised
78 78
      *
79 79
      * @static
80
-     * @param $ver string -
80
+     * @param string $ver string -
81 81
      *     A php standard version string, see http://php.net/manual/en/function.version-compare.php for details.
82
-     * @param null $forModule string -
82
+     * @param string $forModule string -
83 83
      *    The name of a module. The passed version will be used as the check value for
84 84
      *    calls directly from this module rather than the global value
85 85
      * @return void
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
143 143
     /**
144 144
      * Determine if deprecation notices should be displayed
145 145
      *
146
-     * @return bool
146
+     * @return boolean|string
147 147
      */
148 148
     public static function get_enabled()
149 149
     {
Please login to merge, or discard this patch.