Skip to content

Commit bb94188

Browse files
author
Julien Veyssier
committed
stay compatible with PHP 7.3
Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
1 parent cd90e9c commit bb94188

File tree

4 files changed

+19
-7
lines changed

4 files changed

+19
-7
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
66

77
## [Unreleased]
88

9-
## 1.0.7 – 2022-08-24
9+
## 1.0.8 – 2022-08-24
1010
### Added
1111
- admin option to use a popup during the OAuth flow rather than a redirect
1212

appinfo/info.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<name>Google integration</name>
55
<summary>Import Google data into Nextcloud</summary>
66
<description><![CDATA[Google integration allows you to automatically import your Google calendars, contacts, photos and files into Nextcloud.]]></description>
7-
<version>1.0.7</version>
7+
<version>1.0.8</version>
88
<licence>agpl</licence>
99
<author>Julien Veyssier</author>
1010
<namespace>Google</namespace>

lib/Controller/ConfigController.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,10 @@ class ConfigController extends Controller {
6060
const CALENDAR_SCOPE = 'https://www.googleapis.com/auth/calendar.readonly';
6161
const CALENDAR_EVENTS_SCOPE = 'https://www.googleapis.com/auth/calendar.events.readonly';
6262
const PHOTOS_SCOPE = 'https://www.googleapis.com/auth/photoslibrary.readonly';
63-
private IInitialState $initialStateService;
63+
/**
64+
* @var IInitialState
65+
*/
66+
private $initialStateService;
6467

6568
public function __construct($appName,
6669
IRequest $request,

lib/Service/UserScopeService.php

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,19 @@
2929

3030
class UserScopeService {
3131

32-
public function __construct(IUserSession $userSession, IUserManager $userManager) {
33-
$this->userSession = $userSession;
34-
$this->userManager = $userManager;
35-
}
32+
/**
33+
* @var IUserSession
34+
*/
35+
private $userSession;
36+
/**
37+
* @var IUserManager
38+
*/
39+
private $userManager;
40+
41+
public function __construct(IUserSession $userSession, IUserManager $userManager) {
42+
$this->userSession = $userSession;
43+
$this->userManager = $userManager;
44+
}
3645

3746
/**
3847
* Set a valid user in IUserSession since lots of server logic is relying on obtaining

0 commit comments

Comments
 (0)