Merge pull request #284 from nextcloud/automated/noid/stable27-update…

…-nextcloud-ocp [stable27] Update nextcloud/ocp dependency
nextcloud · Jul 3, 2024 · f10d452 · f10d452
2 parents e8c6cde + 800a3e8
commit f10d452
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 35 deletions.
diff --git a/.github/workflows/phpunit-sqlite.yml b/.github/workflows/phpunit-sqlite.yml
@@ -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
@@ -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

diff --git a/composer.json b/composer.json
@@ -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,

diff --git a/composer.lock b/composer.lock
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
@@ -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);
 	}
 

diff --git a/lib/BackgroundJobs/AdminNotification.php b/lib/BackgroundJobs/AdminNotification.php
@@ -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;

diff --git a/lib/BackgroundJobs/MonthlyReport.php b/lib/BackgroundJobs/MonthlyReport.php
@@ -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;

diff --git a/lib/Categories/Database.php b/lib/Categories/Database.php
@@ -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

diff --git a/lib/Controller/EndpointController.php b/lib/Controller/EndpointController.php
@@ -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 {
 
@@ -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;

diff --git a/lib/Migration/SendAdminNotification.php b/lib/Migration/SendAdminNotification.php
@@ -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 */

diff --git a/lib/Settings/AdminSettings.php b/lib/Settings/AdminSettings.php
@@ -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;

diff --git a/templates/admin.php b/templates/admin.php
@@ -56,7 +56,7 @@
 		</p>
 		<?php
 	}
-	?>
+?>
 
 	<div id="last_report">
 		<h3>