Skip to content

Commit e57dce5

Browse files
authored
Merge pull request #967 from nextcloud/enh/noid/php8-syntax
Use Php 8 syntax
2 parents 315320b + e6c97c7 commit e57dce5

28 files changed

+204
-549
lines changed

composer.lock

Lines changed: 49 additions & 49 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/Command/DeleteProvider.php

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,12 @@
3737
use Symfony\Component\Console\Question\ConfirmationQuestion;
3838

3939
class DeleteProvider extends Base {
40-
private $providerMapper;
41-
/**
42-
* @var ProviderService
43-
*/
44-
private $providerService;
4540

46-
public function __construct(ProviderMapper $providerMapper, ProviderService $providerService) {
41+
public function __construct(
42+
private ProviderMapper $providerMapper,
43+
private ProviderService $providerService,
44+
) {
4745
parent::__construct();
48-
$this->providerMapper = $providerMapper;
49-
$this->providerService = $providerService;
5046
}
5147

5248
protected function configure() {

lib/Command/UpsertProvider.php

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,6 @@
3737

3838
class UpsertProvider extends Base {
3939

40-
/** @var ProviderService */
41-
private $providerService;
42-
/** @var ProviderMapper */
43-
private $providerMapper;
44-
/** @var ICrypto */
45-
private $crypto;
46-
4740
private const EXTRA_OPTIONS = [
4841
'unique-uid' => [
4942
'shortcut' => null, 'mode' => InputOption::VALUE_OPTIONAL, 'default' => null, 'setting_key' => ProviderService::SETTING_UNIQUE_UID,
@@ -152,14 +145,11 @@ class UpsertProvider extends Base {
152145
];
153146

154147
public function __construct(
155-
ProviderService $providerService,
156-
ProviderMapper $providerMapper,
157-
ICrypto $crypto,
148+
private ProviderService $providerService,
149+
private ProviderMapper $providerMapper,
150+
private ICrypto $crypto,
158151
) {
159152
parent::__construct();
160-
$this->providerService = $providerService;
161-
$this->providerMapper = $providerMapper;
162-
$this->crypto = $crypto;
163153
}
164154

165155
protected function configure() {

lib/Controller/BaseOidcController.php

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,11 @@
3333

3434
class BaseOidcController extends Controller {
3535

36-
/**
37-
* @var IConfig
38-
*/
39-
private $config;
40-
41-
public function __construct(IRequest $request,
42-
IConfig $config) {
36+
public function __construct(
37+
IRequest $request,
38+
private IConfig $config,
39+
) {
4340
parent::__construct(Application::APP_ID, $request);
44-
$this->config = $config;
4541
}
4642

4743
/**

0 commit comments

Comments
 (0)