Dev (#15)

* Cleanup. Additional tests for easier error-checking.

* Travis build config update.

* Fix for deprecated compression constant.

Author: olssonm

.travis.yml

@@ -1,6 +1,8 @@
 language: php
 
-sudo: false
+dist: xenial
+
+os: linux
 
 before_script:
   - travis_retry composer self-update
@@ -9,7 +11,7 @@ before_script:
 script:
   - composer test
 
-matrix:
+jobs:
   include:
     - php: 7.1
       env:

src/Factories/Password.php

@@ -3,9 +3,9 @@
 namespace Olssonm\BackupShield\Factories;
 
 use Illuminate\Support\Collection;
-
 use Olssonm\BackupShield\Encryption;
 use PhpZip\ZipFile;
+use PhpZip\Constants\ZipCompressionMethod;
 use \ZipArchive;
 
 class Password
@@ -26,7 +26,9 @@ class Password
 
     /**
      * Read the .zip, apply password and encryption, then rewrite the file
-     * @param string $path the path to the .zip-file
+     *
+     * @param Encryption $encryption
+     * @param string     $path
      */
     function __construct(Encryption $encryption, string $path)
     {
@@ -91,7 +93,7 @@ protected function makeZipFile(Encryption $encryption, string $path) : void
         );
 
         $zipFile = new ZipFile();
-        $zipFile->addFile($path, 'backup.zip', ZipFile::METHOD_DEFLATED);
+        $zipFile->addFile($path, 'backup.zip', ZipCompressionMethod::DEFLATED);
         $zipFile->setPassword($this->password, $encryptionConstant);
         $zipFile->saveAsFile($path);
         $zipFile->close();

tests/BackupShieldTests.php

@@ -16,6 +16,7 @@ public function setUp(): void
 
     /**
      * Load the package
+     * 
      * @return array the packages
      */
     protected function getPackageProviders($app)
@@ -26,7 +27,7 @@ protected function getPackageProviders($app)
     }
 
 	/** @test */
-	public function test_config_file_is_installed()
+	public function testConfigFileIsInstalled()
 	{
 		// Run the Installation command
 		Artisan::call('vendor:publish', [
@@ -49,8 +50,10 @@ public function test_config_file_is_installed()
 		$this->assertTrue($test2);
 	}
 
-	/** @test */
-	public function test_listener_return_data()
+	/**
+	 * @depends testConfigFileIsInstalled
+	 */
+	public function testListenerReturnData()
 	{
 		// Set parameters for testing
 		$path = __DIR__ . '/resources/test.zip';
@@ -68,8 +71,10 @@ public function test_listener_return_data()
 		$this->assertEquals($pathTest, $data[0]);
 	}
 
-	/** @test **/
-	public function test_correct_encrypter_engine()
+	/**
+	 * @depends testListenerReturnData
+	 */
+	public function testCorrectEncrypterEngine()
 	{
 		$path = __DIR__ . '/resources/processed.zip';
 
@@ -87,8 +92,10 @@ public function test_correct_encrypter_engine()
 		}
 	}
 
-	/** @test **/
-	public function test_encryption_protection()
+	/**
+	 * @depends testCorrectEncrypterEngine
+	 */
+	public function testEncryptionProtection()
 	{
 		// Test that the archive actually is encrypted and password protected
 		$path = __DIR__ . '/resources/processed.zip';
@@ -102,6 +109,19 @@ public function test_encryption_protection()
 		$this->assertEquals(1, $zipInfo['backup.zip']->getEncryptionMethod());
 	}
 
+	public function testRetrieveEncryptionConstants()
+	{
+		$encryption = new \Olssonm\BackupShield\Encryption();
+
+		// Default
+		$this->assertEquals('257', $encryption->getEncryptionConstant(\Olssonm\BackupShield\Encryption::ENCRYPTION_DEFAULT, 'ZipArchive'));
+		$this->assertEquals(\PhpZip\Constants\ZipEncryptionMethod::PKWARE, $encryption->getEncryptionConstant(\Olssonm\BackupShield\Encryption::ENCRYPTION_DEFAULT, 'ZipFile'));
+
+		// AES 256
+		$this->assertEquals('259', $encryption->getEncryptionConstant(\Olssonm\BackupShield\Encryption::ENCRYPTION_WINZIP_AES_256, 'ZipArchive'));
+		$this->assertEquals(\PhpZip\Constants\ZipEncryptionMethod::WINZIP_AES_256, $encryption->getEncryptionConstant(\Olssonm\BackupShield\Encryption::ENCRYPTION_WINZIP_AES_256, 'ZipFile'));
+	}
+
 	/** Teardown */
 	public static function tearDownAfterClass(): void
 	{