Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>tags/v19.0.0beta3
@@ -62,7 +62,7 @@ class AuthSettingsController extends Controller { | |||
private $session; | |||
/** IUserSession */ | |||
private $userSession; | |||
private $userSession; | |||
/** @var string */ | |||
private $uid; |
@@ -46,9 +46,9 @@ use OCA\User_LDAP\User\Manager; | |||
use OCP\ILogger; | |||
class UpdateGroups extends \OC\BackgroundJob\TimedJob { | |||
static private $groupsFromDB; | |||
private static $groupsFromDB; | |||
static private $groupBE; | |||
private static $groupBE; | |||
public function __construct() { | |||
$this->interval = self::getRefreshInterval(); |
@@ -38,7 +38,7 @@ use OCA\User_LDAP\Mapping\UserMapping; | |||
use OCA\User_LDAP\User\Manager; | |||
abstract class Proxy { | |||
static private $accesses = []; | |||
private static $accesses = []; | |||
private $ldap = null; | |||
/** @var \OCP\ICache|null */ |
@@ -43,7 +43,7 @@ use OCP\ILogger; | |||
class Wizard extends LDAPUtility { | |||
/** @var \OCP\IL10N */ | |||
static protected $l; | |||
protected static $l; | |||
protected $access; | |||
protected $cr; | |||
protected $configuration; |
@@ -36,7 +36,7 @@ use OCP\Files\Search\ISearchOrder; | |||
* Tools for transforming search queries into database queries | |||
*/ | |||
class QuerySearchHelper { | |||
static protected $searchOperatorMap = [ | |||
protected static $searchOperatorMap = [ | |||
ISearchComparison::COMPARE_LIKE => 'iLike', | |||
ISearchComparison::COMPARE_EQUAL => 'eq', | |||
ISearchComparison::COMPARE_GREATER_THAN => 'gt', | |||
@@ -45,7 +45,7 @@ class QuerySearchHelper { | |||
ISearchComparison::COMPARE_LESS_THAN_EQUAL => 'lte' | |||
]; | |||
static protected $searchOperatorNegativeMap = [ | |||
protected static $searchOperatorNegativeMap = [ | |||
ISearchComparison::COMPARE_LIKE => 'notLike', | |||
ISearchComparison::COMPARE_EQUAL => 'neq', | |||
ISearchComparison::COMPARE_GREATER_THAN => 'lte', |
@@ -80,13 +80,13 @@ class Filesystem { | |||
/** | |||
* @var \OC\Files\View $defaultInstance | |||
*/ | |||
static private $defaultInstance; | |||
private static $defaultInstance; | |||
static private $usersSetup = []; | |||
private static $usersSetup = []; | |||
static private $normalizedPathCache = null; | |||
private static $normalizedPathCache = null; | |||
static private $listeningForProviders = false; | |||
private static $listeningForProviders = false; | |||
/** | |||
* classname which used for hooks handling |
@@ -97,7 +97,7 @@ class File extends \OCP\Search\Result { | |||
/** | |||
* @var Folder $userFolderCache | |||
*/ | |||
static protected $userFolderCache = null; | |||
protected static $userFolderCache = null; | |||
/** | |||
* converts a path relative to the users files folder |
@@ -105,7 +105,7 @@ class Setup { | |||
$this->installer = $installer; | |||
} | |||
static protected $dbSetupClasses = [ | |||
protected static $dbSetupClasses = [ | |||
'mysql' => \OC\Setup\MySQL::class, | |||
'pgsql' => \OC\Setup\PostgreSQL::class, | |||
'oci' => \OC\Setup\OCI::class, |
@@ -65,12 +65,12 @@ use OCP\ILogger; | |||
* upgrading and removing apps. | |||
*/ | |||
class OC_App { | |||
static private $adminForms = []; | |||
static private $personalForms = []; | |||
static private $appTypes = []; | |||
static private $loadedApps = []; | |||
static private $altLogin = []; | |||
static private $alreadyRegistered = []; | |||
private static $adminForms = []; | |||
private static $personalForms = []; | |||
private static $appTypes = []; | |||
private static $loadedApps = []; | |||
private static $altLogin = []; | |||
private static $alreadyRegistered = []; | |||
const supportedApp = 300; | |||
const officialApp = 200; | |||
@@ -36,7 +36,7 @@ | |||
class OC_Hook { | |||
public static $thrownExceptions = []; | |||
static private $registered = []; | |||
private static $registered = []; | |||
/** | |||
* connects a function to a hook |
@@ -1128,7 +1128,6 @@ class OC_Image implements \OCP\IImage { | |||
* @return bool | |||
*/ | |||
public function copyResize($maxSize): IImage { | |||
} | |||
/** |
@@ -11,12 +11,12 @@ namespace Test; | |||
class DateTimeFormatterTest extends TestCase { | |||
/** @var \OC\DateTimeFormatter */ | |||
protected $formatter; | |||
static protected $oneMinute = 60; | |||
static protected $oneHour = 3600; | |||
static protected $oneDay; | |||
static protected $oneYear; | |||
protected static $oneMinute = 60; | |||
protected static $oneHour = 3600; | |||
protected static $oneDay; | |||
protected static $oneYear; | |||
static protected $defaultTimeZone; | |||
protected static $defaultTimeZone; | |||
public static function setUpBeforeClass(): void { | |||
parent::setUpBeforeClass(); |
@@ -325,13 +325,13 @@ class GeneratorTest extends \Test\TestCase { | |||
$image->method('dataMimeType')->willReturn('image/png'); | |||
$image->method('data')->willReturn($data); | |||
$image->method('resizeCopy')->willReturnCallback(function($size) use ($data) { | |||
$image->method('resizeCopy')->willReturnCallback(function ($size) use ($data) { | |||
return $this->getMockImage($size, $size, $data); | |||
}); | |||
$image->method('preciseResizeCopy')->willReturnCallback(function($width, $height) use ($data) { | |||
$image->method('preciseResizeCopy')->willReturnCallback(function ($width, $height) use ($data) { | |||
return $this->getMockImage($width, $height, $data); | |||
}); | |||
$image->method('cropCopy')->willReturnCallback(function($x, $y, $width, $height) use ($data) { | |||
$image->method('cropCopy')->willReturnCallback(function ($x, $y, $width, $height) use ($data) { | |||
return $this->getMockImage($width, $height, $data); | |||
}); | |||
@@ -323,7 +323,7 @@ class DummyShareClass extends \OC\Share\Share { | |||
} | |||
class DummyHookListener { | |||
static $shareType = null; | |||
public static $shareType = null; | |||
public static function listen($params) { | |||
self::$shareType = $params['shareType']; |
@@ -38,10 +38,10 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase { | |||
private $commandBus; | |||
/** @var IDBConnection */ | |||
static protected $realDatabase = null; | |||
protected static $realDatabase = null; | |||
/** @var bool */ | |||
static private $wasDatabaseAllowed = false; | |||
private static $wasDatabaseAllowed = false; | |||
/** @var array */ | |||
protected $services = []; |