Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
This commit is contained in:
parent
ec399e6bbc
commit
08f0dc9067
|
@ -91,5 +91,8 @@ abstract class AbstractDatabase {
|
||||||
$this->tablePrefix = $dbTablePrefix;
|
$this->tablePrefix = $dbTablePrefix;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param string $userName
|
||||||
|
*/
|
||||||
abstract public function setupDatabase($userName);
|
abstract public function setupDatabase($userName);
|
||||||
}
|
}
|
||||||
|
|
|
@ -71,7 +71,7 @@ class MySQL extends AbstractDatabase {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param IDbConnection $connection
|
* @param IDBConnection $connection
|
||||||
* @throws \OC\DatabaseSetupException
|
* @throws \OC\DatabaseSetupException
|
||||||
*/
|
*/
|
||||||
private function createDBUser($connection) {
|
private function createDBUser($connection) {
|
||||||
|
|
|
@ -227,7 +227,7 @@ class Helper extends \OC\Share\Constants {
|
||||||
*
|
*
|
||||||
* all return: http://localhost
|
* all return: http://localhost
|
||||||
*
|
*
|
||||||
* @param string $shareWith
|
* @param string $remote
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
protected static function fixRemoteURL($remote) {
|
protected static function fixRemoteURL($remote) {
|
||||||
|
@ -244,7 +244,7 @@ class Helper extends \OC\Share\Constants {
|
||||||
* split user and remote from federated cloud id
|
* split user and remote from federated cloud id
|
||||||
*
|
*
|
||||||
* @param string $id
|
* @param string $id
|
||||||
* @return array
|
* @return string[]
|
||||||
* @throws HintException
|
* @throws HintException
|
||||||
*/
|
*/
|
||||||
public static function splitUserRemote($id) {
|
public static function splitUserRemote($id) {
|
||||||
|
|
|
@ -2297,6 +2297,16 @@ class Share extends Constants {
|
||||||
return $id ? $id : false;
|
return $id ? $id : false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param string $itemType
|
||||||
|
* @param string $itemSource
|
||||||
|
* @param integer $shareType
|
||||||
|
* @param string $shareWith
|
||||||
|
* @param string $uidOwner
|
||||||
|
* @param integer $permissions
|
||||||
|
* @param string|null $itemSourceName
|
||||||
|
* @param null|\DateTime $expirationDate
|
||||||
|
*/
|
||||||
private static function checkReshare($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions, $itemSourceName, $expirationDate) {
|
private static function checkReshare($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions, $itemSourceName, $expirationDate) {
|
||||||
$backend = self::getBackend($itemType);
|
$backend = self::getBackend($itemType);
|
||||||
|
|
||||||
|
|
|
@ -70,6 +70,10 @@ class OC_Template extends \OC\Template\Base {
|
||||||
|
|
||||||
protected static $initTemplateEngineFirstRun = true;
|
protected static $initTemplateEngineFirstRun = true;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param string $app
|
||||||
|
* @param string $name
|
||||||
|
*/
|
||||||
public function __construct( $app, $name, $renderAs = "", $registerCall = true ) {
|
public function __construct( $app, $name, $renderAs = "", $registerCall = true ) {
|
||||||
// Read the selected theme from the config file
|
// Read the selected theme from the config file
|
||||||
self::initTemplateEngine($renderAs);
|
self::initTemplateEngine($renderAs);
|
||||||
|
@ -92,6 +96,9 @@ class OC_Template extends \OC\Template\Base {
|
||||||
parent::__construct($template, $requestToken, $l10n, $themeDefaults);
|
parent::__construct($template, $requestToken, $l10n, $themeDefaults);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param string $renderAs
|
||||||
|
*/
|
||||||
public static function initTemplateEngine($renderAs) {
|
public static function initTemplateEngine($renderAs) {
|
||||||
if (self::$initTemplateEngineFirstRun){
|
if (self::$initTemplateEngineFirstRun){
|
||||||
|
|
||||||
|
@ -182,7 +189,7 @@ class OC_Template extends \OC\Template\Base {
|
||||||
* Checking all the possible locations.
|
* Checking all the possible locations.
|
||||||
* @param string $theme
|
* @param string $theme
|
||||||
* @param string $app
|
* @param string $app
|
||||||
* @return array
|
* @return string[]
|
||||||
*/
|
*/
|
||||||
protected function findTemplate($theme, $app, $name) {
|
protected function findTemplate($theme, $app, $name) {
|
||||||
// Check if it is a app template or not.
|
// Check if it is a app template or not.
|
||||||
|
|
|
@ -35,7 +35,6 @@ namespace OC;
|
||||||
|
|
||||||
use OC\Hooks\BasicEmitter;
|
use OC\Hooks\BasicEmitter;
|
||||||
use OC\IntegrityCheck\Checker;
|
use OC\IntegrityCheck\Checker;
|
||||||
use OC\IntegrityCheck\Storage;
|
|
||||||
use OC_App;
|
use OC_App;
|
||||||
use OC_Installer;
|
use OC_Installer;
|
||||||
use OC_Util;
|
use OC_Util;
|
||||||
|
@ -287,7 +286,7 @@ class Updater extends BasicEmitter {
|
||||||
* @param string $installedVersion previous version from which to upgrade from
|
* @param string $installedVersion previous version from which to upgrade from
|
||||||
*
|
*
|
||||||
* @throws \Exception
|
* @throws \Exception
|
||||||
* @return bool true if the operation succeeded, false otherwise
|
* @return boolean|null true if the operation succeeded, false otherwise
|
||||||
*/
|
*/
|
||||||
private function doUpgrade($currentVersion, $installedVersion) {
|
private function doUpgrade($currentVersion, $installedVersion) {
|
||||||
// Stop update if the update is over several major versions
|
// Stop update if the update is over several major versions
|
||||||
|
|
|
@ -253,7 +253,7 @@ class OC_User {
|
||||||
* Sets user display name for session
|
* Sets user display name for session
|
||||||
*
|
*
|
||||||
* @param string $uid
|
* @param string $uid
|
||||||
* @param null $displayName
|
* @param string $displayName
|
||||||
* @return bool Whether the display name could get set
|
* @return bool Whether the display name could get set
|
||||||
*/
|
*/
|
||||||
public static function setDisplayName($uid, $displayName = null) {
|
public static function setDisplayName($uid, $displayName = null) {
|
||||||
|
|
Loading…
Reference in New Issue