Merge pull request #793 from nextcloud/feat/drop-php81-support

oleksandr-nc · web-flow · commit df3766751485 · 2026-02-20T17:20:11.000+02:00
feat: drop PHP 8.1 support, require PHP 8.2+, use readonly classes
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -39,7 +39,7 @@ jobs:
     name: php-lint
     strategy:
       matrix:
-        php-versions: ["8.1"]
+        php-versions: ["8.2"]
 
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -60,7 +60,7 @@ jobs:
     name: php-cs
     strategy:
       matrix:
-        php-versions: ["8.1"]
+        php-versions: ["8.2"]
 
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -83,7 +83,7 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        php-versions: ["8.1"]
+        php-versions: ["8.2"]
     name: php-psalm-analysis
 
     steps:
diff --git a/composer.json b/composer.json
@@ -36,7 +36,7 @@
 		"optimize-autoloader": true,
 		"classmap-authoritative": true,
 		"platform": {
-			"php": "8.1"
+			"php": "8.2"
 		}
 	},
 	"autoload": {
@@ -51,6 +51,6 @@
 	},
   "require": {
 	  "ext-simplexml": "*",
-	  "php": ">=8.1.0"
+	  "php": ">=8.2.0"
   }
 }
diff --git a/composer.lock b/composer.lock
diff --git a/lib/Capabilities.php b/lib/Capabilities.php
@@ -14,11 +14,11 @@
 use OCP\Capabilities\ICapability;
 use OCP\IConfig;
 
-class Capabilities implements ICapability {
+readonly class Capabilities implements ICapability {
 
 	public function __construct(
-		private readonly IConfig $config,
-		private readonly IAppManager $appManager,
+		private IConfig $config,
+		private IAppManager $appManager,
 	) {
 	}
 
diff --git a/lib/Listener/DeclarativeSettings/GetValueListener.php b/lib/Listener/DeclarativeSettings/GetValueListener.php
@@ -22,13 +22,13 @@
 /**
  * @template-implements IEventListener<Event>
  */
-class GetValueListener implements IEventListener {
+readonly class GetValueListener implements IEventListener {
 	public function __construct(
-		private readonly SettingsService $service,
-		private readonly ExAppPreferenceService $preferenceService,
-		private readonly ExAppConfigService $configService,
-		private readonly ICrypto $crypto,
-		private readonly LoggerInterface $logger,
+		private SettingsService $service,
+		private ExAppPreferenceService $preferenceService,
+		private ExAppConfigService $configService,
+		private ICrypto $crypto,
+		private LoggerInterface $logger,
 	) {
 	}
 
diff --git a/lib/Listener/DeclarativeSettings/RegisterDeclarativeSettingsListener.php b/lib/Listener/DeclarativeSettings/RegisterDeclarativeSettingsListener.php
@@ -17,9 +17,9 @@
 /**
  * @template-implements IEventListener<Event>
  */
-class RegisterDeclarativeSettingsListener implements IEventListener {
+readonly class RegisterDeclarativeSettingsListener implements IEventListener {
 	public function __construct(
-		private readonly SettingsService $service,
+		private SettingsService $service,
 	) {
 	}
 
diff --git a/lib/Listener/DeclarativeSettings/SetValueListener.php b/lib/Listener/DeclarativeSettings/SetValueListener.php
@@ -22,13 +22,13 @@
 /**
  * @template-implements IEventListener<Event>
  */
-class SetValueListener implements IEventListener {
+readonly class SetValueListener implements IEventListener {
 	public function __construct(
-		private readonly SettingsService $service,
-		private readonly ExAppPreferenceService $preferenceService,
-		private readonly ExAppConfigService $configService,
-		private readonly ICrypto $crypto,
-		private readonly LoggerInterface $logger,
+		private SettingsService $service,
+		private ExAppPreferenceService $preferenceService,
+		private ExAppConfigService $configService,
+		private ICrypto $crypto,
+		private LoggerInterface $logger,
 	) {
 	}
 
diff --git a/lib/Listener/GetTaskProcessingProvidersListener.php b/lib/Listener/GetTaskProcessingProvidersListener.php
@@ -18,12 +18,12 @@
 use OCP\TaskProcessing\Events\GetTaskProcessingProvidersEvent;
 use Psr\Log\LoggerInterface;
 
-class GetTaskProcessingProvidersListener implements IEventListener {
+readonly class GetTaskProcessingProvidersListener implements IEventListener {
 	public function __construct(
-		private readonly TaskProcessingService $taskProcessingService,
-		private readonly ExAppService $exAppService,
-		private readonly AppAPIService $appAPIService,
-		private readonly LoggerInterface $logger,
+		private TaskProcessingService $taskProcessingService,
+		private ExAppService $exAppService,
+		private AppAPIService $appAPIService,
+		private LoggerInterface $logger,
 	) {
 	}
 
diff --git a/lib/Listener/LoadMenuEntriesListener.php b/lib/Listener/LoadMenuEntriesListener.php
@@ -25,10 +25,10 @@
 /**
  * @template-extends IEventListener<LoadMenuEntriesListener>
  */
-class LoadMenuEntriesListener implements IEventListener {
+readonly class LoadMenuEntriesListener implements IEventListener {
 
 	public function __construct(
-		private readonly TopMenuService $topMenuService,
+		private TopMenuService $topMenuService,
 	) {
 	}
 
diff --git a/lib/PublicFunctions.php b/lib/PublicFunctions.php
@@ -15,11 +15,11 @@
 use OCP\Http\Client\IResponse;
 use OCP\IRequest;
 
-class PublicFunctions {
+readonly class PublicFunctions {
 
 	public function __construct(
-		private readonly ExAppService $exAppService,
-		private readonly AppAPIService $service,
+		private ExAppService $exAppService,
+		private AppAPIService $service,
 	) {
 	}
 
diff --git a/lib/Service/AppAPICommonService.php b/lib/Service/AppAPICommonService.php
@@ -14,11 +14,11 @@
 use OCP\App\IAppManager;
 use OCP\IRequest;
 
-class AppAPICommonService {
+readonly class AppAPICommonService {
 
 	public function __construct(
-		private readonly IAppManager $appManager,
-		private readonly HarpService $harpService,
+		private IAppManager $appManager,
+		private HarpService $harpService,
 	) {
 	}
 
diff --git a/lib/Service/DaemonConfigService.php b/lib/Service/DaemonConfigService.php
@@ -22,12 +22,12 @@
 /**
  * Daemon configuration (daemons)
  */
-class DaemonConfigService {
+readonly class DaemonConfigService {
 	public function __construct(
-		private readonly LoggerInterface $logger,
-		private readonly DaemonConfigMapper $mapper,
-		private readonly ExAppService $exAppService,
-		private readonly ICrypto $crypto,
+		private LoggerInterface $logger,
+		private DaemonConfigMapper $mapper,
+		private ExAppService $exAppService,
+		private ICrypto $crypto,
 	) {
 	}
 
diff --git a/lib/Service/ExAppConfigService.php b/lib/Service/ExAppConfigService.php
@@ -21,7 +21,7 @@
 /**
  * App configuration (appconfig_ex)
  */
-class ExAppConfigService {
+readonly class ExAppConfigService {
 
 	public function __construct(
 		private ExAppConfigMapper $mapper,
diff --git a/lib/Service/ExAppPreferenceService.php b/lib/Service/ExAppPreferenceService.php
@@ -21,7 +21,7 @@
 /**
  * App per-user preferences (preferences_ex)
  */
-class ExAppPreferenceService {
+readonly class ExAppPreferenceService {
 
 	public function __construct(
 		private ExAppPreferenceMapper $mapper,
diff --git a/lib/Service/ExAppsPageService.php b/lib/Service/ExAppsPageService.php
@@ -17,16 +17,16 @@
 use OCP\IURLGenerator;
 use Psr\Log\LoggerInterface;
 
-class ExAppsPageService {
+readonly class ExAppsPageService {
 
 	public function __construct(
-		private readonly ExAppFetcher $exAppFetcher,
-		private readonly DaemonConfigService $daemonConfigService,
-		private readonly DockerActions $dockerActions,
-		private readonly IAppConfig $appConfig,
-		private readonly IAppManager $appManager,
-		private readonly LoggerInterface $logger,
-		private readonly IURLGenerator $urlGenerator,
+		private ExAppFetcher $exAppFetcher,
+		private DaemonConfigService $daemonConfigService,
+		private DockerActions $dockerActions,
+		private IAppConfig $appConfig,
+		private IAppManager $appManager,
+		private LoggerInterface $logger,
+		private IURLGenerator $urlGenerator,
 	) {
 	}
 
diff --git a/lib/Service/TalkBotsService.php b/lib/Service/TalkBotsService.php
@@ -16,13 +16,13 @@
 use OCP\IURLGenerator;
 use OCP\Security\ISecureRandom;
 
-class TalkBotsService {
+readonly class TalkBotsService {
 
 	public function __construct(
-		private readonly ExAppConfigService $exAppConfigService,
-		private readonly IEventDispatcher $dispatcher,
-		private readonly ISecureRandom $random,
-		private readonly IURLGenerator $urlGenerator,
+		private ExAppConfigService $exAppConfigService,
+		private IEventDispatcher $dispatcher,
+		private ISecureRandom $random,
+		private IURLGenerator $urlGenerator,
 	) {
 	}
 
diff --git a/lib/Service/UI/InitialStateService.php b/lib/Service/UI/InitialStateService.php
@@ -16,11 +16,11 @@
 use OCP\DB\Exception;
 use Psr\Log\LoggerInterface;
 
-class InitialStateService {
+readonly class InitialStateService {
 
 	public function __construct(
-		private readonly InitialStateMapper $mapper,
-		private readonly LoggerInterface $logger,
+		private InitialStateMapper $mapper,
+		private LoggerInterface $logger,
 	) {
 	}
 
diff --git a/lib/Service/UI/ScriptsService.php b/lib/Service/UI/ScriptsService.php
@@ -19,13 +19,13 @@
 use OCP\Util;
 use Psr\Log\LoggerInterface;
 
-class ScriptsService {
+readonly class ScriptsService {
 
 	public const MAX_JS_FILES = 10; //should be equal to number of files in "proxy_js" folder.
 
 	public function __construct(
-		private readonly ScriptMapper $mapper,
-		private readonly LoggerInterface $logger,
+		private ScriptMapper $mapper,
+		private LoggerInterface $logger,
 	) {
 	}
 
diff --git a/lib/Service/UI/StylesService.php b/lib/Service/UI/StylesService.php
@@ -18,11 +18,11 @@
 use OCP\Util;
 use Psr\Log\LoggerInterface;
 
-class StylesService {
+readonly class StylesService {
 
 	public function __construct(
-		private readonly StyleMapper $mapper,
-		private readonly LoggerInterface $logger,
+		private StyleMapper $mapper,
+		private LoggerInterface $logger,
 	) {
 	}
 
diff --git a/lib/Settings/Admin.php b/lib/Settings/Admin.php
@@ -19,14 +19,14 @@
 use OCP\Settings\ISettings;
 use Psr\Log\LoggerInterface;
 
-class Admin implements ISettings {
+readonly class Admin implements ISettings {
 
 	public function __construct(
-		private readonly IInitialState $initialStateService,
-		private readonly DaemonConfigService $daemonConfigService,
-		private readonly IAppConfig $appConfig,
-		private readonly DockerActions $dockerActions,
-		private readonly LoggerInterface $logger,
+		private IInitialState $initialStateService,
+		private DaemonConfigService $daemonConfigService,
+		private IAppConfig $appConfig,
+		private DockerActions $dockerActions,
+		private LoggerInterface $logger,
 	) {
 	}
 
diff --git a/lib/SetupChecks/DaemonCheck.php b/lib/SetupChecks/DaemonCheck.php
@@ -20,14 +20,14 @@
 use OCP\SetupCheck\SetupResult;
 use Psr\Log\LoggerInterface;
 
-class DaemonCheck implements ISetupCheck {
+readonly class DaemonCheck implements ISetupCheck {
 	public function __construct(
-		private readonly IL10N $l10n,
-		private readonly IConfig $config,
-		private readonly IAppConfig $appConfig,
-		private readonly DockerActions $dockerActions,
-		private readonly LoggerInterface $logger,
-		private readonly DaemonConfigService $daemonConfigService,
+		private IL10N $l10n,
+		private IConfig $config,
+		private IAppConfig $appConfig,
+		private DockerActions $dockerActions,
+		private LoggerInterface $logger,
+		private DaemonConfigService $daemonConfigService,
 	) {
 	}
 
diff --git a/psalm.xml b/psalm.xml
@@ -13,7 +13,7 @@
 	findUnusedCode="false"
 	findUnusedBaselineEntry="true"
 	ensureOverrideAttribute="false"
-	phpVersion="8.1"
+	phpVersion="8.2"
 >
 	<projectFiles>
 		<directory name="lib" />
diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml
@@ -119,7 +119,7 @@
 			}]]></code>
     </InvalidArgument>
     <InvalidDocblock>
-      <code><![CDATA[class LoadMenuEntriesListener implements IEventListener {]]></code>
+      <code><![CDATA[readonly class LoadMenuEntriesListener implements IEventListener {]]></code>
     </InvalidDocblock>
     <InvalidTemplateParam>
       <code><![CDATA[IEventListener]]></code>

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@`
`36`	`36`	`"optimize-autoloader": true,`
`37`	`37`	`"classmap-authoritative": true,`
`38`	`38`	`"platform": {`
`39`		`- "php": "8.1"`
	`39`	`+ "php": "8.2"`
`40`	`40`	`}`
`41`	`41`	`},`
`42`	`42`	`"autoload": {`
`@@ -51,6 +51,6 @@`
`51`	`51`	`},`
`52`	`52`	`"require": {`
`53`	`53`	`"ext-simplexml": "*",`
`54`		`- "php": ">=8.1.0"`
	`54`	`+ "php": ">=8.2.0"`
`55`	`55`	`}`
`56`	`56`	`}`