Merge pull request #27 from sgacode/master

declare php 8.x support, update dependency packages
mnvx · Nov 26, 2024 · 0c9b5dd · 0c9b5dd
2 parents 427eadd + 68ec119
commit 0c9b5dd
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 18 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,11 @@ language: php
 php:
   - 7.2
   - 7.3
+  - 7.4
+  - 8.1
+  - 8.2
+  - 8.3
+  - 8.4
 
 before_script:
   - composer install

diff --git a/composer.json b/composer.json
@@ -11,11 +11,11 @@
     }
   },
   "require": {
-    "php": "^7.2|^8.0",
-    "symfony/process": "^3.1|^4.1|^5.0|^6.0",
+    "php": "^7.2|^7.3|^7.4|^8.0",
+    "symfony/process": "^3.1|^4.1|^5.0|^6.0|^7.0",
     "psr/log": "^1|^2|^3"
   },
   "require-dev": {
-    "phpunit/phpunit": "^8.0"
+    "phpunit/phpunit": "^8.0|^9.0"
   }
 }
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,23 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         bootstrap="tests/bootstrap.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" bootstrap="tests/bootstrap.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+    <coverage processUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">./app</directory>
+        </include>
+    </coverage>
     <testsuites>
         <testsuite name="Application Test Suite">
             <directory suffix="Test.php">./tests</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./app</directory>
-        </whitelist>
-    </filter>
     <php>
     </php>
 </phpunit>
diff --git a/tests/ConverterTest.php b/tests/ConverterTest.php
@@ -57,7 +57,7 @@ public function testConvert(LowrapperParameters $parameters, /*string*/ $command
         $converterStub->convert($parameters);
     }
 
-    public function converterProvider()
+    public static function converterProvider()
     {
         $command = 'libreoffice --headless --invisible --nocrashreport --nodefault --nofirststartwizard --nologo --norestore ';
         return [
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,11 @@ language: php @@
     php:
       - 7.2
       - 7.3
+      - 7.4
+      - 8.1
+      - 8.2
+      - 8.3
+      - 8.4
     before_script:
       - composer install
@@ Expand Down @@