Merge pull request #21744 from owncloud/scrutinizer-patch-1
Scrutinizer Auto-Fixes
This commit is contained in:
commit
f0f308dfbf
|
@ -281,7 +281,6 @@ class Configuration {
|
||||||
*
|
*
|
||||||
* @param string $varName name of config-key
|
* @param string $varName name of config-key
|
||||||
* @param array|string $value to set
|
* @param array|string $value to set
|
||||||
* @param boolean $trim Trim value? (default: false)
|
|
||||||
*/
|
*/
|
||||||
protected function setMultiLine($varName, $value) {
|
protected function setMultiLine($varName, $value) {
|
||||||
if(empty($value)) {
|
if(empty($value)) {
|
||||||
|
|
|
@ -152,8 +152,8 @@ class USER_LDAP extends BackendUtility implements \OCP\IUserBackend, \OCP\UserIn
|
||||||
* Get a list of all users
|
* Get a list of all users
|
||||||
*
|
*
|
||||||
* @param string $search
|
* @param string $search
|
||||||
* @param null|int $limit
|
* @param integer $limit
|
||||||
* @param null|int $offset
|
* @param integer $offset
|
||||||
* @return string[] an array of all uids
|
* @return string[] an array of all uids
|
||||||
*/
|
*/
|
||||||
public function getUsers($search = '', $limit = 10, $offset = 0) {
|
public function getUsers($search = '', $limit = 10, $offset = 0) {
|
||||||
|
|
|
@ -118,6 +118,9 @@ With help from many libraries and frameworks including:
|
||||||
echo "License updated: $path" . PHP_EOL;
|
echo "License updated: $path" . PHP_EOL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param string $source
|
||||||
|
*/
|
||||||
private function isMITLicensed($source) {
|
private function isMITLicensed($source) {
|
||||||
$lines = explode(PHP_EOL, $source);
|
$lines = explode(PHP_EOL, $source);
|
||||||
while(!empty($lines)) {
|
while(!empty($lines)) {
|
||||||
|
@ -131,6 +134,9 @@ With help from many libraries and frameworks including:
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param string $source
|
||||||
|
*/
|
||||||
private function eatOldLicense($source) {
|
private function eatOldLicense($source) {
|
||||||
$lines = explode(PHP_EOL, $source);
|
$lines = explode(PHP_EOL, $source);
|
||||||
while(!empty($lines)) {
|
while(!empty($lines)) {
|
||||||
|
|
|
@ -73,7 +73,7 @@ class DependencyAnalyzer {
|
||||||
* 5.2.6.5 and 5.1 will be turned into 5.2 and 5.1
|
* 5.2.6.5 and 5.1 will be turned into 5.2 and 5.1
|
||||||
* @param string $first
|
* @param string $first
|
||||||
* @param string $second
|
* @param string $second
|
||||||
* @return array first element is the first version, second element is the
|
* @return string[] first element is the first version, second element is the
|
||||||
* second version
|
* second version
|
||||||
*/
|
*/
|
||||||
private function normalizeVersions($first, $second) {
|
private function normalizeVersions($first, $second) {
|
||||||
|
|
|
@ -206,6 +206,9 @@ class PlatformRepository {
|
||||||
throw new \UnexpectedValueException('Invalid version string "' . $version . '"' . $extraMessage);
|
throw new \UnexpectedValueException('Invalid version string "' . $version . '"' . $extraMessage);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param string $stability
|
||||||
|
*/
|
||||||
private function expandStability($stability) {
|
private function expandStability($stability) {
|
||||||
$stability = strtolower($stability);
|
$stability = strtolower($stability);
|
||||||
switch ($stability) {
|
switch ($stability) {
|
||||||
|
|
|
@ -52,7 +52,7 @@ class Migrator {
|
||||||
protected $config;
|
protected $config;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param \Doctrine\DBAL\Connection $connection
|
* @param Connection $connection
|
||||||
* @param ISecureRandom $random
|
* @param ISecureRandom $random
|
||||||
* @param IConfig $config
|
* @param IConfig $config
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -261,6 +261,9 @@ class OC_Defaults {
|
||||||
return $footer;
|
return $footer;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param string $key
|
||||||
|
*/
|
||||||
public function buildDocLinkToKey($key) {
|
public function buildDocLinkToKey($key) {
|
||||||
if ($this->themeExist('buildDocLinkToKey')) {
|
if ($this->themeExist('buildDocLinkToKey')) {
|
||||||
return $this->theme->buildDocLinkToKey($key);
|
return $this->theme->buildDocLinkToKey($key);
|
||||||
|
|
Loading…
Reference in New Issue