stay compatible with PHP 7.3

Signed-off-by: Julien Veyssier <[email protected]>
nextcloud · Aug 29, 2022 · bb94188 · bb94188
1 parent cd90e9c
commit bb94188
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,7 +6,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
-## 1.0.7 – 2022-08-24
+## 1.0.8 – 2022-08-24
 ### Added
 - admin option to use a popup during the OAuth flow rather than a redirect
 

diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -4,7 +4,7 @@
     <name>Google integration</name>
     <summary>Import Google data into Nextcloud</summary>
     <description><![CDATA[Google integration allows you to automatically import your Google calendars, contacts, photos and files into Nextcloud.]]></description>
-    <version>1.0.7</version>
+    <version>1.0.8</version>
     <licence>agpl</licence>
     <author>Julien Veyssier</author>
     <namespace>Google</namespace>

diff --git a/lib/Controller/ConfigController.php b/lib/Controller/ConfigController.php
@@ -60,7 +60,10 @@ class ConfigController extends Controller {
 	const CALENDAR_SCOPE = 'https://www.googleapis.com/auth/calendar.readonly';
 	const CALENDAR_EVENTS_SCOPE = 'https://www.googleapis.com/auth/calendar.events.readonly';
 	const PHOTOS_SCOPE = 'https://www.googleapis.com/auth/photoslibrary.readonly';
-	private IInitialState $initialStateService;
+	/**
+	 * @var IInitialState
+	 */
+	private $initialStateService;
 
 	public function __construct($appName,
 								IRequest $request,

diff --git a/lib/Service/UserScopeService.php b/lib/Service/UserScopeService.php
@@ -29,10 +29,19 @@
 
 class UserScopeService {
 
-    public function __construct(IUserSession $userSession, IUserManager $userManager) {
-        $this->userSession = $userSession;
-        $this->userManager = $userManager;
-    }
+	/**
+	 * @var IUserSession
+	 */
+	private $userSession;
+	/**
+	 * @var IUserManager
+	 */
+	private $userManager;
+
+	public function __construct(IUserSession $userSession, IUserManager $userManager) {
+		$this->userSession = $userSession;
+		$this->userManager = $userManager;
+	}
 
     /**
      * Set a valid user in IUserSession since lots of server logic is relying on obtaining