Update all major dependencies (major) (#53)

* Update all major dependencies

* adjust composer.json and build script

* add php 8.1 to tbe build matrix

* add support for php 8.4

* try tests with original php image

* try the bitnami php image

* remove composer.lock file

* remove the platfrom statement so it can install a lower phpunit version for php 8.1

* illuminate container can conditionally also install a lower version for php 8.1

* add php 8.1 again

* remove composer.lock file

* also allow a lower symfony finder version

* some working tests of the client implementation, still have to verify via wordpres ui

* remove composer.lock

* fix scoper problems, remove credentials

* remove composer.lock file

* use vaas password secret

* fix initialization problem

---------

Co-authored-by: Renovate Bot <[email protected]>
Co-authored-by: Matthias Simonis <[email protected]>

Author: 3 people

.devcontainer/devcontainer.json

@@ -3,7 +3,7 @@
 {
 	"name": "PHP",
 	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
-	"image": "mcr.microsoft.com/devcontainers/php:1-8.2-bullseye",
+	"image": "mcr.microsoft.com/devcontainers/php:1-8.3-bullseye",
 	"customizations": {
 		"vscode": {
 			"extensions": [

.dockerignore

@@ -24,4 +24,5 @@
 LICENSE
 README.md
 wordpress/**
-svn/**
+svn/**
+composer.lock

.github/workflows/github-release.yaml

@@ -45,11 +45,16 @@ jobs:
           fi
 
   test:
+    strategy:
+      matrix:
+        php-version: ["8.1", "8.2", "8.3", "8.4"]
+    env:
+      VAAS_PASSWORD: ${{ secrets.VAAS_PASSWORD }}
     runs-on: ubuntu-latest
     container:
-      image: mcr.microsoft.com/devcontainers/php:1-8.2-bullseye
+      image: bitnami/php-fpm:${{ matrix.php-version }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v4        
       - name: composer install
         run: composer install
       - name: phpunit

.phpunit.result.cache

@@ -0,0 +1 @@
+{"version":1,"defects":{"Gdatacyberdefenseag\\GdataAntivirus\\tests\\unittests\\ScanClientTest::testScanFunction":7,"Gdatacyberdefenseag\\GdataAntivirus\\tests\\unittests\\GdataAntivirusTest::testDependencyInjection":8},"times":{"Gdatacyberdefenseag\\GdataAntivirus\\tests\\unittests\\GdataAntivirusTest::testDependencyInjection":0.01,"Gdatacyberdefenseag\\GdataAntivirus\\tests\\unittests\\ScanClientTest::testScanFunction":0.537,"Gdatacyberdefenseag\\GdataAntivirus\\tests\\unittests\\VaasOptionsTest::test_credentials_configured_when_ROPG_credentials_are_correct_configured_returns_true":0,"Gdatacyberdefenseag\\GdataAntivirus\\tests\\unittests\\VaasOptionsTest::test_credentials_configured_when_CCG_credentials_are_correct_configured_returns_true":0,"Gdatacyberdefenseag\\GdataAntivirus\\tests\\unittests\\VaasOptionsTest::test_credentials_configured_when_ROPG_credentials_are_incorrect_configured_returns_false":0,"Gdatacyberdefenseag\\GdataAntivirus\\tests\\unittests\\VaasOptionsTest::test_credentials_configured_when_CCG_credentials_are_incorrect_configured_returns_false":0,"Gdatacyberdefenseag\\GdataAntivirus\\tests\\unittests\\VaasOptionsTest::test_credentials_configured_when_CCG_credentials_one_option_missing_configured_returns_false":0,"Gdatacyberdefenseag\\GdataAntivirus\\tests\\unittests\\VaasOptionsTest::test_credentials_configured_when_ROPG_credentials_one_option_missing_configured_returns_false":0}}

GdataAntivirusPlugin.php

@@ -19,8 +19,10 @@
 use Psr\Log\NullLogger;
 
 if (! class_exists('GdataAntivirusPlugin')) {
-	class GdataAntivirusPlugin extends Container {
-		public function __construct( LoggerInterface $logger = new NullLogger() ) {
+	class GdataAntivirusPlugin extends Container
+	{
+		public function __construct(LoggerInterface $logger = new NullLogger())
+		{
 			$logger->info('GdataAntivirusPlugin::__construct');
 			$this->singleton(FindingsMenuPage::class, FindingsMenuPage::class);
 			$this->singleton(FullScanMenuPage::class, FullScanMenuPage::class);
@@ -31,10 +33,13 @@ public function __construct( LoggerInterface $logger = new NullLogger() ) {
 			$this->singleton(GdataAntivirusMenuPage::class, GdataAntivirusMenuPage::class);
 			$this->singleton(ScanClient::class, ScanClient::class);
 			$this->singleton(AdminNotices::class, AdminNotices::class);
-			$this->singleton(LoggerInterface::class, function () use ( $logger ) {
+			$this->singleton(LoggerInterface::class, function () use ($logger) {
 				return $logger;
 			});
+		}
 
+		public function start()
+		{
 			$this->make(GdataAntivirusMenuPage::class);
 			$findings_menu = $this->make(FindingsMenuPage::class);
 			$this->make(FullScanMenuPage::class);

PluginPage/AdminNotices.php

@@ -5,24 +5,29 @@
 use Psr\Log\LoggerInterface;
 
 if (! class_exists('AdminNotices')) {
-	class AdminNotices {
+	class AdminNotices implements AdminNoticesInterface
+	{
 		private static $notices = array();
 
-		public function __construct( LoggerInterface $logger ) {
+		public function __construct(LoggerInterface $logger)
+		{
 			$logger->info('AdminNotices::__construct');
-			add_action('admin_notices', array( $this, 'output_notices' ));
-			add_action('shutdown', array( $this, 'save_notices' ));
+			add_action('admin_notices', array($this, 'output_notices'));
+			add_action('shutdown', array($this, 'save_notices'));
 		}
 
-		public static function add_notice( $text ) {
+		public static function add_notice(string $text): void
+		{
 			self::$notices[] = $text;
 		}
 
-		public function save_notices() {
+		public function save_notices(): void
+		{
 			update_option('gdatacyberdefenseag_antivirus_notices', self::$notices);
 		}
 
-		public function output_notices() {
+		public function output_notices(): void
+		{
 			$notices = maybe_unserialize(get_option('gdatacyberdefenseag_antivirus_notices'));
 
 			if (! empty($notices)) {

PluginPage/AdminNoticesInterface.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Gdatacyberdefenseag\GdataAntivirus\PluginPage;
+
+interface AdminNoticesInterface
+{
+	public static function add_notice(string $text): void;
+	public function save_notices(): void;
+	public function output_notices(): void;
+}