Merge pull request #967 from nextcloud/enh/noid/php8-syntax

Use Php 8 syntax
nextcloud · Nov 4, 2024 · e57dce5 · e57dce5
2 parents 315320b + e6c97c7
commit e57dce5
Show file tree

Hide file tree

Showing 28 changed files with 204 additions and 549 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/lib/Command/DeleteProvider.php b/lib/Command/DeleteProvider.php
@@ -37,16 +37,12 @@
 use Symfony\Component\Console\Question\ConfirmationQuestion;
 
 class DeleteProvider extends Base {
-	private $providerMapper;
-	/**
-	 * @var ProviderService
-	 */
-	private $providerService;
 
-	public function __construct(ProviderMapper $providerMapper, ProviderService $providerService) {
+	public function __construct(
+		private ProviderMapper $providerMapper,
+		private ProviderService $providerService,
+	) {
 		parent::__construct();
-		$this->providerMapper = $providerMapper;
-		$this->providerService = $providerService;
 	}
 
 	protected function configure() {

diff --git a/lib/Command/UpsertProvider.php b/lib/Command/UpsertProvider.php
@@ -37,13 +37,6 @@
 
 class UpsertProvider extends Base {
 
-	/** @var ProviderService */
-	private $providerService;
-	/** @var ProviderMapper */
-	private $providerMapper;
-	/** @var ICrypto */
-	private $crypto;
-
 	private const EXTRA_OPTIONS = [
 		'unique-uid' => [
 			'shortcut' => null, 'mode' => InputOption::VALUE_OPTIONAL, 'default' => null, 'setting_key' => ProviderService::SETTING_UNIQUE_UID,
@@ -152,14 +145,11 @@ class UpsertProvider extends Base {
 	];
 
 	public function __construct(
-		ProviderService $providerService,
-		ProviderMapper $providerMapper,
-		ICrypto $crypto,
+		private ProviderService $providerService,
+		private ProviderMapper $providerMapper,
+		private ICrypto $crypto,
 	) {
 		parent::__construct();
-		$this->providerService = $providerService;
-		$this->providerMapper = $providerMapper;
-		$this->crypto = $crypto;
 	}
 
 	protected function configure() {

diff --git a/lib/Controller/BaseOidcController.php b/lib/Controller/BaseOidcController.php
@@ -33,15 +33,11 @@
 
 class BaseOidcController extends Controller {
 
-	/**
-	 * @var IConfig
-	 */
-	private $config;
-
-	public function __construct(IRequest $request,
-		IConfig $config) {
+	public function __construct(
+		IRequest $request,
+		private IConfig $config,
+	) {
 		parent::__construct(Application::APP_ID, $request);
-		$this->config = $config;
 	}
 
 	/**