Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable27] Update nextcloud/ocp dependency #284

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/phpunit-sqlite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ jobs:

strategy:
matrix:
php-versions: ['7.4', '8.0', '8.1']
server-versions: ['master']
php-versions: ['8.0', '8.1', '8.2']
server-versions: ['stable27']

steps:
- name: Set app env
Expand All @@ -53,7 +53,7 @@ jobs:
with:
php-version: ${{ matrix.php-versions }}
tools: phpunit
extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite
extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite, zip, gd
coverage: none

- name: Check composer file existence
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"phpunit/phpunit": "^9.5",
"nextcloud/coding-standard": "^1.0.0",
"vimeo/psalm": "^4.3.2",
"nextcloud/ocp": "dev-master"
"nextcloud/ocp": "dev-stable27"
},
"config": {
"optimize-autoloader": true,
Expand Down
21 changes: 10 additions & 11 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/AppInfo/Application.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
use OCP\AppFramework\Bootstrap\IRegistrationContext;

class Application extends App implements IBootstrap {
public function __construct(array $urlParams = array()) {
public function __construct(array $urlParams = []) {
parent::__construct('survey_client', $urlParams);
}

Expand Down
6 changes: 3 additions & 3 deletions lib/BackgroundJobs/AdminNotification.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ class AdminNotification extends QueuedJob {
protected IURLGenerator $url;

public function __construct(ITimeFactory $time,
IManager $manager,
IGroupManager $groupManager,
IURLGenerator $url) {
IManager $manager,
IGroupManager $groupManager,
IURLGenerator $url) {
parent::__construct($time);
$this->manager = $manager;
$this->groupManager = $groupManager;
Expand Down
4 changes: 2 additions & 2 deletions lib/BackgroundJobs/MonthlyReport.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ class MonthlyReport extends TimedJob {
protected LoggerInterface $logger;

public function __construct(ITimeFactory $time,
Collector $collector,
LoggerInterface $logger) {
Collector $collector,
LoggerInterface $logger) {
parent::__construct($time);
$this->collector = $collector;
$this->logger = $logger;
Expand Down
2 changes: 1 addition & 1 deletion lib/Categories/Database.php
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ protected function databaseSize() {
if ($row['proname'] === 'pg_database_size') {
$database = $this->config->getSystemValue('dbname');
if (strpos($database, '.') !== false) {
list($database, ) = explode('.', $database);
[$database, ] = explode('.', $database);
}
$sql = "SELECT oid
FROM pg_database
Expand Down
12 changes: 6 additions & 6 deletions lib/Controller/EndpointController.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@

namespace OCA\Survey_Client\Controller;

use OCA\Survey_Client\Collector;
use OCA\Survey_Client\BackgroundJobs\MonthlyReport;

use OCA\Survey_Client\Collector;
use OCP\AppFramework\Http\DataResponse;
use OCP\AppFramework\OCSController;
use OCP\BackgroundJob\IJobList;
use OCP\IRequest;
use OCP\Notification\IManager;
use OCA\Survey_Client\BackgroundJobs\MonthlyReport;

class EndpointController extends OCSController {

Expand All @@ -51,10 +51,10 @@ class EndpointController extends OCSController {
* @param IManager $manager
*/
public function __construct(string $appName,
IRequest $request,
Collector $collector,
IJobList $jobList,
IManager $manager) {
IRequest $request,
Collector $collector,
IJobList $jobList,
IManager $manager) {
parent::__construct($appName, $request);

$this->collector = $collector;
Expand Down
4 changes: 2 additions & 2 deletions lib/Migration/SendAdminNotification.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@

namespace OCA\Survey_Client\Migration;

use OCA\Survey_Client\BackgroundJobs\AdminNotification;
use OCA\Survey_Client\BackgroundJobs\MonthlyReport;
use OCP\BackgroundJob\IJobList;
use OCP\Migration\IOutput;
use OCP\Migration\IRepairStep;
use OCA\Survey_Client\BackgroundJobs\MonthlyReport;
use OCA\Survey_Client\BackgroundJobs\AdminNotification;

class SendAdminNotification implements IRepairStep {
/** @var IJobList */
Expand Down
8 changes: 4 additions & 4 deletions lib/Settings/AdminSettings.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@ class AdminSettings implements ISettings {
private $jobList;

public function __construct(Collector $collector,
IConfig $config,
IL10N $l,
IDateTimeFormatter $dateTimeFormatter,
IJobList $jobList
IConfig $config,
IL10N $l,
IDateTimeFormatter $dateTimeFormatter,
IJobList $jobList
) {
$this->collector = $collector;
$this->config = $config;
Expand Down
2 changes: 1 addition & 1 deletion templates/admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
</p>
<?php
}
?>
?>

<div id="last_report">
<h3>
Expand Down
Loading