PHP 7 compatibility: Changed return types with null

Jefferson49 · Jefferson49 · commit 402ede37f391 · 2025-01-28T06:39:06.000+01:00
diff --git a/composer.json b/composer.json
@@ -10,7 +10,7 @@
         }        
     ],
     "require": {
-        "jefferson49/webtrees-common": ">=1.2.7",
+        "jefferson49/webtrees-common": ">=1.2.8",
         "stevenmaguire/oauth2-dropbox": "dev-Remove-scope-from-getAccessToken",
         "league/oauth2-client": "=2.8.0",
         "league/oauth2-github": "=3.1.1",
diff --git a/composer.lock b/composer.lock
diff --git a/src/LoginWithAuthorizationProviderAction.php b/src/LoginWithAuthorizationProviderAction.php
@@ -478,7 +478,7 @@ private function resizeUserData(string $name, string $value, bool $add_flash_mes
      *
      * @return User
      */
-    private function findUserByAuthorizationProviderId(string $provider_name, string $authorization_provider_id): User|null
+    private function findUserByAuthorizationProviderId(string $provider_name, string $authorization_provider_id): ?User
     {
         $users = Functions::getAllUsers();
 

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`}`
`11`	`11`	`],`
`12`	`12`	`"require": {`
`13`		`- "jefferson49/webtrees-common": ">=1.2.7",`
	`13`	`+ "jefferson49/webtrees-common": ">=1.2.8",`
`14`	`14`	`"stevenmaguire/oauth2-dropbox": "dev-Remove-scope-from-getAccessToken",`
`15`	`15`	`"league/oauth2-client": "=2.8.0",`
`16`	`16`	`"league/oauth2-github": "=3.1.1",`
Original file line number	Diff line number	Diff line change
`@@ -478,7 +478,7 @@ private function resizeUserData(string $name, string $value, bool $add_flash_mes`
`478`	`478`	`*`
`479`	`479`	`* @return User`
`480`	`480`	`*/`
`481`		`- private function findUserByAuthorizationProviderId(string $provider_name, string $authorization_provider_id): User\|null`
	`481`	`+ private function findUserByAuthorizationProviderId(string $provider_name, string $authorization_provider_id): ?User`
`482`	`482`	`{`
`483`	`483`	`$users = Functions::getAllUsers();`
`484`	`484`