sminnee / silverstripe-framework

src/Core/Startup/ParameterConfirmationToken.php

Doc Comments +4 added lines, -1 removed lines

@@ -47,6 +47,9 @@ 
      */
     protected $token = null;
 
+    /**
+     * @param string $token
+     */
     protected function pathForToken($token)
     {
         return TEMP_FOLDER.'/token_'.preg_replace('/[^a-z0-9]+/', '', $token);
@@ -222,7 +225,7 @@ 
      * Given a list of token names, suppress all tokens that have not been validated, and
      * return the non-validated token with the highest priority
      *
-     * @param array $keys List of token keys in ascending priority (low to high)
+     * @param string[] $keys List of token keys in ascending priority (low to high)
      * @param HTTPRequest $request
      * @return ParameterConfirmationToken The token container for the unvalidated $key given with the highest priority
      */

src/Dev/BulkLoader.php

Doc Comments +4 added lines

@@ -141,6 +141,10 @@
 	 *
 	 * @return BulkLoader_Result See {@link self::processAll()}
 	 */
+
+    /**
+     * @param string $filepath
+     */
     public function load($filepath)
     {
         Environment::increaseTimeLimitTo(3600);

src/Dev/Install/Installer.php

Doc Comments +3 added lines

@@ -274,6 +274,9 @@
         return $this->errors;
     }
 
+    /**
+     * @param string $filename
+     */
     public function writeToFile($filename, $content)
     {
         $base = $this->getBaseDir();

src/Dev/Install/InstallRequirements.php

Doc Comments +72 added lines, -2 removed lines

@@ -159,7 +159,7 @@ 
 
     /**
      * Find the webserver software running on the PHP host.
-     * @return string|boolean Server software or boolean FALSE
+     * @return false|string Server software or boolean FALSE
      */
     public function findWebserver()
     {
@@ -469,6 +469,10 @@ 
         return ini_get($settingName);
     }
 
+    /**
+     * @param string $settingName
+     * @param string[] $testDetails
+     */
     public function suggestPHPSetting($settingName, $settingValues, $testDetails)
     {
         $this->testing($testDetails);
@@ -482,6 +486,11 @@ 
         }
     }
 
+    /**
+     * @param string $settingName
+     * @param false[] $settingValues
+     * @param string[] $testDetails
+     */
     public function requirePHPSetting($settingName, $settingValues, $testDetails)
     {
         $this->testing($testDetails);
@@ -492,6 +501,10 @@ 
         }
     }
 
+    /**
+     * @param string $class
+     * @param string[] $testDetails
+     */
     public function suggestClass($class, $testDetails)
     {
         $this->testing($testDetails);
@@ -501,6 +514,10 @@ 
         }
     }
 
+    /**
+     * @param string $class
+     * @param string[] $testDetails
+     */
     public function suggestFunction($class, $testDetails)
     {
         $this->testing($testDetails);
@@ -520,6 +537,10 @@ 
         }
     }
 
+    /**
+     * @param integer $min
+     * @param integer $recommended
+     */
     public function requireMemory($min, $recommended, $testDetails)
     {
         $_SESSION['forcemem'] = false;
@@ -635,6 +656,10 @@ 
         }
     }
 
+    /**
+     * @param string $funcName
+     * @param string[] $testDetails
+     */
     public function requireFunction($funcName, $testDetails)
     {
         $this->testing($testDetails);
@@ -646,6 +671,10 @@ 
         return true;
     }
 
+    /**
+     * @param string $className
+     * @param string[] $testDetails
+     */
     public function requireClass($className, $testDetails)
     {
         $this->testing($testDetails);
@@ -692,6 +721,10 @@ 
         return true;
     }
 
+    /**
+     * @param string $recommendedVersion
+     * @param string $requiredVersion
+     */
     public function requirePHPVersion($recommendedVersion, $requiredVersion, $testDetails)
     {
         $this->testing($testDetails);
@@ -735,7 +768,7 @@ 
      * to ensure the module directory is intact.
      *
      * @param string $dirname
-     * @param array $testDetails
+     * @param string[] $testDetails
      */
     public function requireModule($dirname, $testDetails)
     {
@@ -751,6 +784,10 @@ 
         }
     }
 
+    /**
+     * @param string $filename
+     * @param string[] $testDetails
+     */
     public function requireFile($filename, $testDetails)
     {
         $this->testing($testDetails);
@@ -761,6 +798,9 @@ 
         }
     }
 
+    /**
+     * @param string $filename
+     */
     public function requireWriteable($filename, $testDetails, $absolute = false)
     {
         $this->testing($testDetails);
@@ -869,6 +909,10 @@ 
         }
     }
 
+    /**
+     * @param string $moduleName
+     * @param string[] $testDetails
+     */
     public function requireApacheRewriteModule($moduleName, $testDetails)
     {
         $this->testing($testDetails);
@@ -889,6 +933,10 @@ 
         return ($this->testApacheRewriteExists() || $this->testIISRewriteModuleExists());
     }
 
+    /**
+     * @param string $moduleName
+     * @param string[] $testDetails
+     */
     public function requireIISRewriteModule($moduleName, $testDetails)
     {
         $this->testing($testDetails);
@@ -916,6 +964,9 @@ 
         return DatabaseAdapterRegistry::getDatabaseConfigurationHelper($databaseClass);
     }
 
+    /**
+     * @param string[] $testDetails
+     */
     public function requireDatabaseFunctions($databaseConfig, $testDetails)
     {
         $this->testing($testDetails);
@@ -933,6 +984,9 @@ 
         }
     }
 
+    /**
+     * @param string[] $testDetails
+     */
     public function requireDatabaseConnection($databaseConfig, $testDetails)
     {
         $this->testing($testDetails);
@@ -947,6 +1001,9 @@ 
         }
     }
 
+    /**
+     * @param string[] $testDetails
+     */
     public function requireDatabaseVersion($databaseConfig, $testDetails)
     {
         $this->testing($testDetails);
@@ -979,6 +1036,9 @@ 
         }
     }
 
+    /**
+     * @param string[] $testDetails
+     */
     public function requireDatabaseOrCreatePermissions($databaseConfig, $testDetails)
     {
         $this->testing($testDetails);
@@ -1004,6 +1064,9 @@ 
         }
     }
 
+    /**
+     * @param string[] $testDetails
+     */
     public function requireDatabaseAlterPermissions($databaseConfig, $testDetails)
     {
         $this->testing($testDetails);
@@ -1019,6 +1082,10 @@ 
         }
     }
 
+    /**
+     * @param string[] $varNames
+     * @param string[] $testDetails
+     */
     public function requireServerVariables($varNames, $testDetails)
     {
         $this->testing($testDetails);
@@ -1040,6 +1107,9 @@ 
     }
 
 
+    /**
+     * @param string[] $testDetails
+     */
     public function requirePostSupport($testDetails)
     {
         $this->testing($testDetails);

src/Dev/SapphireTest.php

Doc Comments +2 added lines, -2 removed lines

@@ -787,7 +787,7 @@ 
      * @param string $expectedSQL
      * @param string $actualSQL
      * @param string $message
-     * @param float|int $delta
+     * @param integer $delta
      * @param integer $maxDepth
      * @param boolean $canonicalize
      * @param boolean $ignoreCase
@@ -952,7 +952,7 @@ 
      * Create a member and group with the given permission code, and log in with it.
      * Returns the member ID.
      *
-     * @param string|array $permCode Either a permission, or list of permissions
+     * @param string $permCode Either a permission, or list of permissions
      * @return int Member ID
      */
     public function logInWithPermission($permCode = "ADMIN")

src/includes/functions.php

Doc Comments -6 removed lines

@@ -53,12 +53,6 @@
  * @param string $entity Entity that identifies the string. It must be in the form
  * "Namespace.Entity" where Namespace will be usually the class name where this
  * string is used and Entity identifies the string inside the namespace.
- * @param mixed $arg,... Additional arguments are parsed as such:
- *  - Next string argument is a default. Pass in a `|` pipe-delimeted value with `{count}`
- *    to do pluralisation.
- *  - Any other string argument after default is context for i18nTextCollector
- *  - Any array argument in any order is an injection parameter list. Pass in a `count`
- *    injection parameter to pluralise.
  * @return string
  */
 function _t($entity, $arg = null)

src/ORM/DataObject.php

Doc Comments +8 added lines, -7 removed lines

@@ -2397,6 +2397,7 @@ 
 
     /**
      * {@inheritdoc}
+     * @param string $field
      */
     public function castingHelper($field)
     {
@@ -2502,7 +2503,7 @@ 
      * </code>
      *
      * @param string $methodName Method on the same object, e.g. {@link canEdit()}
-     * @param Member|int $member
+     * @param null|Member $member
      * @param array $context Optional context
      * @return boolean|null
      */
@@ -2525,7 +2526,7 @@ 
 
     /**
      * @param Member $member
-     * @return boolean
+     * @return boolean|string
      */
     public function canView($member = null)
     {
@@ -2538,7 +2539,7 @@ 
 
     /**
      * @param Member $member
-     * @return boolean
+     * @return boolean|string
      */
     public function canEdit($member = null)
     {
@@ -2551,7 +2552,7 @@ 
 
     /**
      * @param Member $member
-     * @return boolean
+     * @return boolean|string
      */
     public function canDelete($member = null)
     {
@@ -2566,7 +2567,7 @@ 
      * @param Member $member
      * @param array $context Additional context-specific data which might
      * affect whether (or where) this object could be created.
-     * @return boolean
+     * @return boolean|string
      */
     public function canCreate($member = null, $context = array())
     {
@@ -2683,7 +2684,7 @@ 
      * Traverses to a field referenced by relationships between data objects, returning the value
      * The path to the related field is specified with dot separated syntax (eg: Parent.Child.Child.FieldName)
      *
-     * @param $fieldName string
+     * @param string $fieldName string
      * @return string | null - will return null on a missing value
      */
     public function relField($fieldName)
@@ -2762,7 +2763,7 @@ 
      * @param string $callerClass The class of objects to be returned
      * @param string|array $filter A filter to be inserted into the WHERE clause.
      * Supports parameterised queries. See SQLSelect::addWhere() for syntax examples.
-     * @param string|array $sort A sort expression to be inserted into the ORDER
+     * @param string $sort A sort expression to be inserted into the ORDER
      * BY clause.  If omitted, self::$default_sort will be used.
      * @param string $join Deprecated 3.0 Join clause. Use leftJoin($table, $joinClause) instead.
      * @param string|array $limit A limit expression to be inserted into the LIMIT clause.

src/ORM/FieldType/DBHTMLText.php

Unused Use Statements -1 removed lines

@@ -3,7 +3,6 @@
 namespace SilverStripe\ORM\FieldType;
 
 use SilverStripe\Core\Convert;
-use SilverStripe\Core\Injector\Injector;
 use SilverStripe\Control\HTTP;
 use SilverStripe\Forms\TextField;
 use SilverStripe\Forms\HTMLEditor\HTMLEditorField;

src/Security/LogoutForm.php

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 use SilverStripe\Control\Director;
 use SilverStripe\Control\RequestHandler;
-use SilverStripe\Control\Session;
 use SilverStripe\Forms\FieldList;
 use SilverStripe\Forms\Form;
 use SilverStripe\Forms\FormAction;