Added Sf6 support

pmishev · pmishev · commit 8a14e7dfda2b · 2022-03-24T13:20:47.000Z
diff --git a/.coveralls.yml b/.coveralls.yml
@@ -0,0 +1,3 @@
+coverage_clover: tests/build/clover.xml
+service_name: travis-ci
+json_path: tests/build/coveralls.json
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,48 @@
+language: php
+php:
+  - '7.3'
+  - '8.1'
+
+env:
+  global:
+    - CLAMAV_SOCKET="/var/run/clamav/clamd.ctl"
+    - CLAMAV_HOST="127.0.0.1"
+    - CLAMAV_PORT="3310"
+  jobs:
+    - SYMFONY_VERSION="~6.0"
+    - SYMFONY_VERSION="~5.0"
+    - SYMFONY_VERSION="~4.0"
+
+jobs:
+  exclude:
+    - env: SYMFONY_VERSION="~6.0"
+      php: '7.3'
+
+before_install:
+  - sudo apt-get update -qq
+  - sudo apt-get install -y libclamav-dev clamav clamav-daemon clamav-freshclam
+
+install:
+  - composer require --no-update symfony/framework-bundle:${SYMFONY_VERSION}
+  - composer install --dev --no-interaction
+
+before_script:
+  - sudo freshclam
+  - echo 'TCPAddr 127.0.0.1' | sudo tee -a /etc/clamav/clamd.conf
+  - echo 'TCPSocket 3310' | sudo tee -a /etc/clamav/clamd.conf
+  - sudo adduser clamav travis
+  - sudo /etc/init.d/clamav-daemon start
+  - wget -q --waitretry=1 --retry-connrefused -T 120 -O - http://${CLAMAV_HOST}:${CLAMAV_PORT}
+  - export XDEBUG_MODE=coverage
+
+script:
+  - vendor/bin/phpunit --coverage-clover=tests/build/clover.xml 2>/dev/null
+  - vendor/bin/phpcs -np --standard=PSR2 --ignore=vendor/,tests/,var/ ./
+
+after_script:
+  - travis_retry php vendor/bin/php-coveralls -v
+
+cache:
+  directories:
+    - "/var/lib/clamav"
+  apt: true
diff --git a/README.md b/README.md
@@ -1,5 +1,7 @@
 This library is a PHP client for working with a ClamAV daemon. It also provides optional Symfony integration.
 
+[![Build Status](https://app.travis-ci.com/sineflow/clamav.svg?branch=master)](https://app.travis-ci.com/github/sineflow/clamav)
+
 # Installation
 ```
 $ composer require sineflow/clamav
diff --git a/composer.json b/composer.json
@@ -13,14 +13,16 @@
     ],
     "require": {
         "php": "^7.3 || ^8.0",
-        "symfony/http-kernel": "~4.0 || ~5.0",
-        "symfony/config": "~4.0 || ~5.0",
-        "symfony/dependency-injection": "~4.0 || ~5.0",
-        "symfony/yaml": "~4.0 || ~5.0",
+        "symfony/http-kernel": "~4.0 || ~5.0 || ~6.0",
+        "symfony/config": "~4.0 || ~5.0 || ~6.0",
+        "symfony/dependency-injection": "~4.0 || ~5.0 || ~6.0",
+        "symfony/yaml": "~4.0 || ~5.0 || ~6.0",
         "ext-sockets": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.0"
+        "phpunit/phpunit": "^9.0",
+        "squizlabs/php_codesniffer": "^3.0",
+        "php-coveralls/php-coveralls": "^2.5"
     },
     "autoload": {
         "psr-4": {"Sineflow\\ClamAV\\": "src/"}
diff --git a/tests/Functional/BundleTest.php b/tests/Functional/BundleTest.php
@@ -11,7 +11,7 @@
 
 class SineflowClamavTestingKernel extends Kernel
 {
-    public function registerBundles()
+    public function registerBundles(): iterable
     {
         return [
             new SineflowClamAVBundle(),
diff --git a/tests/Functional/ScannerTest.php b/tests/Functional/ScannerTest.php
@@ -11,9 +11,16 @@
 class ScannerTest extends TestCase
 {
     private static $originalFilePermissionsOfInaccessibleFile;
+    private static $socket;
+    private static $host;
+    private static $port;
 
     public static function setUpBeforeClass(): void
     {
+        self::$socket = getenv('CLAMAV_SOCKET') ?: ScanStrategyClamdUnix::DEFAULT_SOCKET;
+        self::$host = getenv('CLAMAV_HOST') ?: ScanStrategyClamdNetwork::DEFAULT_HOST;
+        self::$port = getenv('CLAMAV_PORT') ?: ScanStrategyClamdNetwork::DEFAULT_PORT;
+
         self::$originalFilePermissionsOfInaccessibleFile = fileperms(__DIR__.'/../Files/inaccessible.txt');
         chmod(__DIR__.'/../Files/inaccessible.txt', 0000);
     }
@@ -25,25 +32,25 @@ public static function tearDownAfterClass(): void
 
     public function testPingWithClamdUnix()
     {
-        $scanner = new Scanner(new ScanStrategyClamdUnix());
+        $scanner = new Scanner(new ScanStrategyClamdUnix(self::$socket));
         $this->assertTrue($scanner->ping());
     }
 
     public function testPingWithClamdNetwork()
     {
-        $scanner = new Scanner(new ScanStrategyClamdNetwork());
+        $scanner = new Scanner(new ScanStrategyClamdNetwork(self::$host, self::$port));
         $this->assertTrue($scanner->ping());
     }
 
     public function testVersionWithClamdUnix()
     {
-        $scanner = new Scanner(new ScanStrategyClamdUnix());
+        $scanner = new Scanner(new ScanStrategyClamdUnix(self::$socket));
         $this->assertIsString($scanner->version());
     }
 
     public function testVersionWithClamdNetwork()
     {
-        $scanner = new Scanner(new ScanStrategyClamdNetwork());
+        $scanner = new Scanner(new ScanStrategyClamdNetwork(self::$host, self::$port));
         $this->assertIsString($scanner->version());
     }
 
@@ -53,7 +60,7 @@ public function testVersionWithClamdNetwork()
      */
     public function testScanValidFilesWithClamdUnix(string $filePath, bool $expectedVirus, string $expectedVirusName)
     {
-        $scanner = new Scanner(new ScanStrategyClamdUnix());
+        $scanner = new Scanner(new ScanStrategyClamdUnix(self::$socket));
 
         $scanResult = $scanner->scan($filePath);
         $this->assertSame($expectedVirus, !$scanResult->isClean());
@@ -66,7 +73,7 @@ public function testScanValidFilesWithClamdUnix(string $filePath, bool $expected
      */
     public function testScanInvalidFilesWithClamdUnix(string $filePath, string $expectedErrorMessage)
     {
-        $scanner = new Scanner(new ScanStrategyClamdUnix());
+        $scanner = new Scanner(new ScanStrategyClamdUnix(self::$socket));
 
         $this->expectException(FileScanException::class);
         $this->expectExceptionMessage($expectedErrorMessage);
@@ -78,7 +85,7 @@ public function testScanInvalidFilesWithClamdUnix(string $filePath, string $expe
      */
     public function testScanValidFilesWithClamdNetwork(string $filePath, bool $expectedVirus, string $expectedVirusName)
     {
-        $scanner = new Scanner(new ScanStrategyClamdNetwork());
+        $scanner = new Scanner(new ScanStrategyClamdNetwork(self::$host, self::$port));
 
         $scanResult = $scanner->scan($filePath);
         $this->assertSame($expectedVirus, !$scanResult->isClean());
@@ -91,7 +98,7 @@ public function testScanValidFilesWithClamdNetwork(string $filePath, bool $expec
      */
     public function testScanInvalidFilesWithClamdNetwork(string $filePath, string $expectedErrorMessage)
     {
-        $scanner = new Scanner(new ScanStrategyClamdNetwork());
+        $scanner = new Scanner(new ScanStrategyClamdNetwork(self::$host, self::$port));
 
         $this->expectException(FileScanException::class);
         $this->expectExceptionMessage($expectedErrorMessage);
@@ -101,19 +108,19 @@ public function testScanInvalidFilesWithClamdNetwork(string $filePath, string $e
     public function validFilesToCheckProvider()
     {
         return [
-            [__DIR__.'/../Files/clean.txt', false, ''],
-            [__DIR__.'/../Files/eicar.txt', true, 'Win.Test.EICAR_HDB-1'],
-            [__DIR__.'/../Files/eicar-dropper.pdf', true, 'Doc.Dropper.Agent-1540415'],
-            [__DIR__.'/../Files/infected-archive.zip', true, 'Win.Test.EICAR_HDB-1'],
+            [realpath(__DIR__.'/../Files/clean.txt'), false, ''],
+            [realpath(__DIR__.'/../Files/eicar.txt'), true, 'Win.Test.EICAR_HDB-1'],
+            [realpath(__DIR__.'/../Files/eicar-dropper.pdf'), true, 'Doc.Dropper.Agent-1540415'],
+            [realpath(__DIR__.'/../Files/infected-archive.zip'), true, 'Win.Test.EICAR_HDB-1'],
         ];
     }
 
     public function invalidFilesToCheckProvider()
     {
         return [
-            [__DIR__.'/../Files/', 'Error scanning "'.__DIR__.'/../Files/'.'": Not a file.'],
+            [realpath(__DIR__.'/../Files/'), 'Error scanning "'.realpath(__DIR__.'/../Files/').'": Not a file.'],
             ['file_does_not_exist', 'Error scanning "file_does_not_exist": Not a file.'],
-            [__DIR__.'/../Files/inaccessible.txt', 'Error scanning "'.__DIR__.'/../Files/inaccessible.txt'.'": Access denied.'],
+            [realpath(__DIR__.'/../Files/inaccessible.txt'), 'Error scanning "'.realpath(__DIR__.'/../Files/inaccessible.txt').'": Access denied.'],
         ];
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+coverage_clover: tests/build/clover.xml`
	`2`	`+service_name: travis-ci`
	`3`	`+json_path: tests/build/coveralls.json`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`
`12`	`12`	`class SineflowClamavTestingKernel extends Kernel`
`13`	`13`	`{`
`14`		`- public function registerBundles()`
	`14`	`+ public function registerBundles(): iterable`
`15`	`15`	`{`
`16`	`16`	`return [`
`17`	`17`	`new SineflowClamAVBundle(),`
Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,16 @@`
`11`	`11`	`class ScannerTest extends TestCase`
`12`	`12`	`{`
`13`	`13`	`private static $originalFilePermissionsOfInaccessibleFile;`
	`14`	`+ private static $socket;`
	`15`	`+ private static $host;`
	`16`	`+ private static $port;`
`14`	`17`
`15`	`18`	`public static function setUpBeforeClass(): void`
`16`	`19`	`{`
	`20`	`+ self::$socket = getenv('CLAMAV_SOCKET') ?: ScanStrategyClamdUnix::DEFAULT_SOCKET;`
	`21`	`+ self::$host = getenv('CLAMAV_HOST') ?: ScanStrategyClamdNetwork::DEFAULT_HOST;`
	`22`	`+ self::$port = getenv('CLAMAV_PORT') ?: ScanStrategyClamdNetwork::DEFAULT_PORT;`
	`23`	`+`
`17`	`24`	`self::$originalFilePermissionsOfInaccessibleFile = fileperms(__DIR__.'/../Files/inaccessible.txt');`
`18`	`25`	`chmod(__DIR__.'/../Files/inaccessible.txt', 0000);`
`19`	`26`	`}`
`@@ -25,25 +32,25 @@ public static function tearDownAfterClass(): void`
`25`	`32`
`26`	`33`	`public function testPingWithClamdUnix()`
`27`	`34`	`{`
`28`		`- $scanner = new Scanner(new ScanStrategyClamdUnix());`
	`35`	`+ $scanner = new Scanner(new ScanStrategyClamdUnix(self::$socket));`
`29`	`36`	`$this->assertTrue($scanner->ping());`
`30`	`37`	`}`
`31`	`38`
`32`	`39`	`public function testPingWithClamdNetwork()`
`33`	`40`	`{`
`34`		`- $scanner = new Scanner(new ScanStrategyClamdNetwork());`
	`41`	`+ $scanner = new Scanner(new ScanStrategyClamdNetwork(self::$host, self::$port));`
`35`	`42`	`$this->assertTrue($scanner->ping());`
`36`	`43`	`}`
`37`	`44`
`38`	`45`	`public function testVersionWithClamdUnix()`
`39`	`46`	`{`
`40`		`- $scanner = new Scanner(new ScanStrategyClamdUnix());`
	`47`	`+ $scanner = new Scanner(new ScanStrategyClamdUnix(self::$socket));`
`41`	`48`	`$this->assertIsString($scanner->version());`
`42`	`49`	`}`
`43`	`50`
`44`	`51`	`public function testVersionWithClamdNetwork()`
`45`	`52`	`{`
`46`		`- $scanner = new Scanner(new ScanStrategyClamdNetwork());`
	`53`	`+ $scanner = new Scanner(new ScanStrategyClamdNetwork(self::$host, self::$port));`
`47`	`54`	`$this->assertIsString($scanner->version());`
`48`	`55`	`}`
`49`	`56`
`@@ -53,7 +60,7 @@ public function testVersionWithClamdNetwork()`
`53`	`60`	`*/`
`54`	`61`	`public function testScanValidFilesWithClamdUnix(string $filePath, bool $expectedVirus, string $expectedVirusName)`
`55`	`62`	`{`
`56`		`- $scanner = new Scanner(new ScanStrategyClamdUnix());`
	`63`	`+ $scanner = new Scanner(new ScanStrategyClamdUnix(self::$socket));`
`57`	`64`
`58`	`65`	`$scanResult = $scanner->scan($filePath);`
`59`	`66`	`$this->assertSame($expectedVirus, !$scanResult->isClean());`
`@@ -66,7 +73,7 @@ public function testScanValidFilesWithClamdUnix(string $filePath, bool $expected`
`66`	`73`	`*/`
`67`	`74`	`public function testScanInvalidFilesWithClamdUnix(string $filePath, string $expectedErrorMessage)`
`68`	`75`	`{`
`69`		`- $scanner = new Scanner(new ScanStrategyClamdUnix());`
	`76`	`+ $scanner = new Scanner(new ScanStrategyClamdUnix(self::$socket));`
`70`	`77`
`71`	`78`	`$this->expectException(FileScanException::class);`
`72`	`79`	`$this->expectExceptionMessage($expectedErrorMessage);`
`@@ -78,7 +85,7 @@ public function testScanInvalidFilesWithClamdUnix(string $filePath, string $expe`
`78`	`85`	`*/`
`79`	`86`	`public function testScanValidFilesWithClamdNetwork(string $filePath, bool $expectedVirus, string $expectedVirusName)`
`80`	`87`	`{`
`81`		`- $scanner = new Scanner(new ScanStrategyClamdNetwork());`
	`88`	`+ $scanner = new Scanner(new ScanStrategyClamdNetwork(self::$host, self::$port));`
`82`	`89`
`83`	`90`	`$scanResult = $scanner->scan($filePath);`
`84`	`91`	`$this->assertSame($expectedVirus, !$scanResult->isClean());`
`@@ -91,7 +98,7 @@ public function testScanValidFilesWithClamdNetwork(string $filePath, bool $expec`
`91`	`98`	`*/`
`92`	`99`	`public function testScanInvalidFilesWithClamdNetwork(string $filePath, string $expectedErrorMessage)`
`93`	`100`	`{`
`94`		`- $scanner = new Scanner(new ScanStrategyClamdNetwork());`
	`101`	`+ $scanner = new Scanner(new ScanStrategyClamdNetwork(self::$host, self::$port));`
`95`	`102`
`96`	`103`	`$this->expectException(FileScanException::class);`
`97`	`104`	`$this->expectExceptionMessage($expectedErrorMessage);`
`@@ -101,19 +108,19 @@ public function testScanInvalidFilesWithClamdNetwork(string $filePath, string $e`
`101`	`108`	`public function validFilesToCheckProvider()`
`102`	`109`	`{`
`103`	`110`	`return [`
`104`		`- [__DIR__.'/../Files/clean.txt', false, ''],`
`105`		`- [__DIR__.'/../Files/eicar.txt', true, 'Win.Test.EICAR_HDB-1'],`
`106`		`- [__DIR__.'/../Files/eicar-dropper.pdf', true, 'Doc.Dropper.Agent-1540415'],`
`107`		`- [__DIR__.'/../Files/infected-archive.zip', true, 'Win.Test.EICAR_HDB-1'],`
	`111`	`+ [realpath(__DIR__.'/../Files/clean.txt'), false, ''],`
	`112`	`+ [realpath(__DIR__.'/../Files/eicar.txt'), true, 'Win.Test.EICAR_HDB-1'],`
	`113`	`+ [realpath(__DIR__.'/../Files/eicar-dropper.pdf'), true, 'Doc.Dropper.Agent-1540415'],`
	`114`	`+ [realpath(__DIR__.'/../Files/infected-archive.zip'), true, 'Win.Test.EICAR_HDB-1'],`
`108`	`115`	`];`
`109`	`116`	`}`
`110`	`117`
`111`	`118`	`public function invalidFilesToCheckProvider()`
`112`	`119`	`{`
`113`	`120`	`return [`
`114`		`- [__DIR__.'/../Files/', 'Error scanning "'.__DIR__.'/../Files/'.'": Not a file.'],`
	`121`	`+ [realpath(__DIR__.'/../Files/'), 'Error scanning "'.realpath(__DIR__.'/../Files/').'": Not a file.'],`
`115`	`122`	`['file_does_not_exist', 'Error scanning "file_does_not_exist": Not a file.'],`
`116`		`- [__DIR__.'/../Files/inaccessible.txt', 'Error scanning "'.__DIR__.'/../Files/inaccessible.txt'.'": Access denied.'],`
	`123`	`+ [realpath(__DIR__.'/../Files/inaccessible.txt'), 'Error scanning "'.realpath(__DIR__.'/../Files/inaccessible.txt').'": Access denied.'],`
`117`	`124`	`];`
`118`	`125`	`}`
`119`	`126`	`}`