Merge pull request #176 from mikehaertl/refine-test-config

Test against newer PHP versions and use require/autoload-dev

Author: mikehaertl

.travis.yml

@@ -1,6 +1,9 @@
 language: php
 dist: trusty
 php:
+  - "7.4"
+  - "7.3"
+  - "7.2"
   - "7.1"
   - "7.0"
   - "5.6"

composer.json

@@ -15,9 +15,17 @@
         "mikehaertl/php-shellcommand": "^1.5.0",
         "mikehaertl/php-tmpfile": "^1.1.0"
     },
+    "require-dev": {
+        "phpunit/phpunit": ">4.0 <8"
+    },
     "autoload": {
         "psr-4": {
             "mikehaertl\\pdftk\\": "src/"
         }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "tests\\": "tests"
+        }
     }
 }

phpunit.xml.dist

@@ -8,7 +8,6 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
          bootstrap="./tests/bootstrap.php"
 >
     <testsuites>

tests/CommandTest.php

@@ -1,7 +1,10 @@
 <?php
+namespace tests;
+
+use PHPUnit\Framework\TestCase;
 use mikehaertl\pdftk\Command;
 
-class CommandTest extends \PHPUnit\Framework\TestCase
+class CommandTest extends TestCase
 {
     public function setUp()
     {
@@ -26,7 +29,7 @@ public function testCanAddFiles()
         $this->assertTrue($command->execute($file));
         $this->assertFileExists($file);
 
-        $this->assertEquals("pdftk A='$document1' B='$document2' input_pw B='complex'\''\"password' output '$file'", (string) $command);
+        $this->assertEquals("pdftk 'A'='$document1' 'B'='$document2' 'input_pw' 'B'='complex'\''\"password' 'output' '$file'", (string) $command);
     }
 
     public function testCanAddOptions()
@@ -42,7 +45,7 @@ public function testCanAddOptions()
         $this->assertTrue($command->execute($file));
         $this->assertFileExists($file);
 
-        $this->assertEquals("pdftk A='$document1' output '$file' encrypt_40bit allow Printing owner_pw 'complex'\''\"password'", (string) $command);
+        $this->assertEquals("pdftk 'A'='$document1' 'output' '$file' 'encrypt_40bit' allow Printing 'owner_pw' 'complex'\''\"password'", (string) $command);
     }
 
     public function testCanSetAndGetOperationAndArgument()
@@ -59,7 +62,7 @@ public function testCanSetAndGetOperationAndArgument()
 
         $this->assertEquals('cat', $command->getOperation());
         $this->assertEquals('A', $command->getOperationArgument());
-        $this->assertEquals("pdftk A='$document1' cat A output '$file'", (string) $command);
+        $this->assertEquals("pdftk 'A'='$document1' cat A 'output' '$file'", (string) $command);
     }
 
     public function testCanAddPageRanges()
@@ -86,7 +89,7 @@ public function testCanAddPageRanges()
         $this->assertTrue($command->execute($file));
         $this->assertFileExists($file);
 
-        $this->assertEquals("pdftk A='$document1' cat 1 A1 1-3 1-3even 1-3evennorth 1-3north A1-3 A1-3even A1-3oddeast A1-3east 1-3east 1 3 A1 A3 output '$file'", (string) $command);
+        $this->assertEquals("pdftk 'A'='$document1' cat 1 A1 1-3 1-3even 1-3evennorth 1-3north A1-3 A1-3even A1-3oddeast A1-3east 1-3east 1 3 A1 A3 'output' '$file'", (string) $command);
     }
 
     protected function getDocument1()

tests/DataFieldsTest.php

@@ -1,7 +1,10 @@
 <?php
+namespace tests;
+
+use PHPUnit\Framework\TestCase;
 use mikehaertl\pdftk\DataFields;
 
-class DataFieldsTest extends \PHPUnit\Framework\TestCase
+class DataFieldsTest extends TestCase
 {
     public function testDataFieldParsing()
     {

tests/FdfFileTest.php

@@ -1,7 +1,10 @@
 <?php
+namespace tests;
+
+use PHPUnit\Framework\TestCase;
 use mikehaertl\pdftk\FdfFile;
 
-class FdfFileTest extends \PHPUnit\Framework\TestCase
+class FdfFileTest extends TestCase
 {
     public function testFdfFileCreation()
     {

tests/InfoFieldsTest.php

@@ -1,7 +1,10 @@
 <?php
+namespace tests;
+
+use PHPUnit\Framework\TestCase;
 use mikehaertl\pdftk\InfoFields;
 
-class InfoFieldsTest extends \PHPUnit\Framework\TestCase
+class InfoFieldsTest extends TestCase
 {
     public function testInfoFieldParsing()
     {

tests/InfoFileTest.php

@@ -1,7 +1,10 @@
 <?php
+namespace tests;
+
+use PHPUnit\Framework\TestCase;
 use mikehaertl\pdftk\InfoFile;
 
-class InfoFileTest extends \PHPUnit\Framework\TestCase
+class InfoFileTest extends TestCase
 {
     public function testInfoFileCreation()
     {