Merge pull request #828 from nextcloud/update-main-target-versions

chore(CI): Adjust testing matrix for Nextcloud 29 on main
nextcloud · Aug 14, 2024 · c0c89c9 · c0c89c9
2 parents a2e2d91 + 5792a2f
commit c0c89c9
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 22 deletions.
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -34,6 +34,9 @@ jobs:
             - php-versions: 8.1
               databases: mysql
               server-versions: stable29
+            - php-versions: 8.1
+              databases: mysql
+              server-versions: stable30
             - php-versions: 8.1
               databases: mysql
               server-versions: master

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -14,7 +14,7 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: ['7.4', '8.0', "8.1"]
+        php-versions: ['8.0', '8.1', '8.2', '8.3']
 
     name: php${{ matrix.php-versions }}
     steps:
@@ -34,7 +34,7 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: ['7.4']
+        php-versions: ['8.0']
 
     name: cs php${{ matrix.php-versions }}
     steps:

diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -19,26 +19,24 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['7.4', '8.0', '8.1', '8.2']
+        php-versions: ['8.0', '8.1', '8.2']
         databases: ['mysql']
-        server-versions: ['stable26', 'stable27', 'stable28', 'stable29', 'master']
+        server-versions: ['stable26', 'stable27', 'stable28', 'stable29', 'stable30', 'master']
         exclude:
-          - php-versions: 7.4
-            server-versions: master
-          - php-versions: 7.4
-            server-versions: stable29
-          - php-versions: 7.4
-            server-versions: stable28
-          - php-versions: 7.4
-            server-versions: stable27
-          - php-versions: 7.4
-            server-versions: stable26
           - php-versions: 8.0
             server-versions: master
+          - php-versions: 8.0
+            server-versions: stable30
         include:
           - php-versions: 8.3
             databases: mysql
             server-versions: stable28
+          - php-versions: 8.3
+            databases: mysql
+            server-versions: stable29
+          - php-versions: 8.3
+            databases: mysql
+            server-versions: stable30
           - php-versions: 8.3
             databases: mysql
             server-versions: master

diff --git a/lib/Controller/LoginController.php b/lib/Controller/LoginController.php
@@ -208,7 +208,7 @@ private function buildProtocolErrorResponse(?bool $throttle = null): TemplateRes
 	 * @param string|null $redirectUrl
 	 * @return DataDisplayResponse|RedirectResponse|TemplateResponse
 	 */
-	public function login(int $providerId, string $redirectUrl = null) {
+	public function login(int $providerId, ?string $redirectUrl = null) {
 		if ($this->userSession->isLoggedIn()) {
 			return new RedirectResponse($redirectUrl);
 		}

diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php
@@ -140,7 +140,7 @@ public function createProvider(string $identifier, string $clientId, string $cli
 		return new JSONResponse(array_merge($provider->jsonSerialize(), ['settings' => $providerSettings]));
 	}
 
-	public function updateProvider(int $providerId, string $identifier, string $clientId, string $discoveryEndpoint, string $clientSecret = null,
+	public function updateProvider(int $providerId, string $identifier, string $clientId, string $discoveryEndpoint, ?string $clientSecret = null,
 		array $settings = [], string $scope = 'openid email profile', ?string $endSessionEndpoint = null): JSONResponse {
 		$provider = $this->providerMapper->getProvider($providerId);
 

diff --git a/lib/Db/ProviderMapper.php b/lib/Db/ProviderMapper.php
@@ -105,9 +105,9 @@ public function getProviders() {
 	 * @throws MultipleObjectsReturnedException
 	 * @throws Exception
 	 */
-	public function createOrUpdateProvider(string $identifier, string $clientid = null,
-		string $clientsecret = null, string $discoveryuri = null, string $scope = 'openid email profile',
-		string $endsessionendpointuri = null) {
+	public function createOrUpdateProvider(string $identifier, ?string $clientid = null,
+		?string $clientsecret = null, ?string $discoveryuri = null, string $scope = 'openid email profile',
+		?string $endsessionendpointuri = null) {
 		try {
 			$provider = $this->findProviderByIdentifier($identifier);
 		} catch (DoesNotExistException $eNotExist) {

diff --git a/tests/stubs/oc_core_command_base.php b/tests/stubs/oc_core_command_base.php
@@ -15,7 +15,7 @@ class Base {
 
 		protected string $defaultOutputFormat = self::OUTPUT_FORMAT_PLAIN;
 
-		public function __construct(string $name = null) {
+		public function __construct(?string $name = null) {
 		}
 
 		protected function configure() {
@@ -36,7 +36,7 @@ public function setDescription(string $description) {
 		/**
 		 * @return $this
 		 */
-		public function addOption(string $name, $shortcut = null, int $mode = null, string $description = '', $default = null) {
+		public function addOption(string $name, $shortcut = null, ?int $mode = null, string $description = '', $default = null) {
 		}
 
 		public function getApplication(): ?Application {
@@ -51,7 +51,7 @@ public function getHelper(string $name) {
 		/**
 		 * @return $this
 		 */
-		public function addArgument(string $name, int $mode = null, string $description = '', $default = null) {
+		public function addArgument(string $name, ?int $mode = null, string $description = '', $default = null) {
 		}
 
 		protected function writeArrayInOutputFormat(InputInterface $input, OutputInterface $output, array $items, string $prefix = '  - '): void {