From 0447c056da3a7665105c7a5743850e5e15383924 Mon Sep 17 00:00:00 2001 From: Luka Trovic Date: Mon, 10 Jun 2024 15:41:48 +0200 Subject: [PATCH] fix: phpcs issues Signed-off-by: Luka Trovic --- .github/workflows/phpunit-sqlite.yml | 2 +- composer.json | 2 +- lib/AppInfo/Application.php | 2 +- lib/BackgroundJobs/AdminNotification.php | 6 +++--- lib/BackgroundJobs/MonthlyReport.php | 4 ++-- lib/Categories/Database.php | 2 +- lib/Controller/EndpointController.php | 12 ++++++------ lib/Migration/SendAdminNotification.php | 4 ++-- lib/Settings/AdminSettings.php | 8 ++++---- templates/admin.php | 2 +- 10 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/phpunit-sqlite.yml b/.github/workflows/phpunit-sqlite.yml index 9a86fea1..e8426e7f 100644 --- a/.github/workflows/phpunit-sqlite.yml +++ b/.github/workflows/phpunit-sqlite.yml @@ -27,7 +27,7 @@ jobs: strategy: matrix: - php-versions: ['7.4', '8.0', '8.1'] + php-versions: ['8.1', '8.2', '8.3'] server-versions: ['master'] steps: diff --git a/composer.json b/composer.json index 502ecded..7912981e 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "optimize-autoloader": true, "classmap-authoritative": true, "platform": { - "php": "8.0" + "php": "8.0.2" } }, "scripts": { diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php index 8bc4402e..4e3537a8 100644 --- 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 index 06659b6b..411756dc 100644 --- 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 index c427cc5b..086b0561 100644 --- 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 index 30846d17..0fd76b3b 100644 --- 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 index be7d925b..35c3a374 100644 --- 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 index ea15d0de..80b5f213 100644 --- 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 index b17f4fb5..e8951f8a 100644 --- 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 index 0fb72a36..1f1f316c 100644 --- a/templates/admin.php +++ b/templates/admin.php @@ -56,7 +56,7 @@

+?>