Skip to content

Commit 83d0e47

Browse files
fix scoper problems, remove credentials
1 parent b0a5422 commit 83d0e47

File tree

9 files changed

+4192
-27
lines changed

9 files changed

+4192
-27
lines changed

.phpunit.result.cache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"version":1,"defects":{"Gdatacyberdefenseag\\GdataAntivirus\\tests\\unittests\\ScanClientTest::testScanFunction":8,"Gdatacyberdefenseag\\GdataAntivirus\\tests\\unittests\\GdataAntivirusTest::testDependencyInjection":8},"times":{"Gdatacyberdefenseag\\GdataAntivirus\\tests\\unittests\\GdataAntivirusTest::testDependencyInjection":0.01,"Gdatacyberdefenseag\\GdataAntivirus\\tests\\unittests\\ScanClientTest::testScanFunction":0.562,"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}}
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}}

PluginPage/AdminNotices.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,6 @@
55
use Psr\Log\LoggerInterface;
66

77
if (! class_exists('AdminNotices')) {
8-
interface AdminNoticesInterface
9-
{
10-
public static function add_notice(string $text): void;
11-
public function save_notices(): void;
12-
public function output_notices(): void;
13-
}
14-
158
class AdminNotices implements AdminNoticesInterface
169
{
1710
private static $notices = array();
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?php
2+
3+
namespace Gdatacyberdefenseag\GdataAntivirus\PluginPage;
4+
5+
interface AdminNoticesInterface
6+
{
7+
public static function add_notice(string $text): void;
8+
public function save_notices(): void;
9+
public function output_notices(): void;
10+
}

Vaas/ScanClient.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@
1010
use VaasSdk\Authentication\ClientCredentialsGrantAuthenticator;
1111
use VaasSdk\Authentication\ResourceOwnerPasswordGrantAuthenticator;
1212
use VaasSdk\VaasVerdict;
13-
use VaasSdk\Message\VerdictResponse;
13+
use VaasSdk\VerdictResponse;
1414
use VaasSdk\Options\VaasOptions as VaasParameters;
15+
use VaasSdk\Verdict;
1516

1617
if (! class_exists('ScanClient')) {
1718
class ScanClient
@@ -244,7 +245,9 @@ public function scan_file($file_path): VaasVerdict
244245
$vaas_verdict = $this->vaas->forFileAsync($file_path)->await();
245246
} catch (\Exception $e) {
246247
$this->logger->debug($e->getMessage());
247-
return new VaasVerdict(new VerdictResponse);
248+
$vaas_verdict = new VaasVerdict();
249+
$vaas_verdict->verdict = Verdict::UNKNOWN;
250+
return $vaas_verdict;
248251
}
249252
}
250253
$this->logger->debug(

0 commit comments

Comments
 (0)