Merge branch '1.x'

Author: vaites

.github/workflows/tests.yml

@@ -33,11 +33,13 @@ jobs:
         - '1.27'
         - '1.28'
         - '1.28.1'
+        - '1.28.2'
         - '2.0.0'
         - '2.1.0'
         - '2.2.0'
         - '2.2.1'
         - '2.3.0'
+        - '2.4.0'
 
    name: PHP ${{ matrix.php }} - TIKA ${{ matrix.tika }}
 
@@ -49,7 +51,7 @@ jobs:
        uses: actions/cache@v1
        with:
          path: bin
-         key: binaries-apache-tika
+         key: binaries-apache-tika-${{ matrix.tika }}
 
      - name: Cache PHP dependencies
        uses: actions/cache@v1
@@ -70,11 +72,12 @@ jobs:
        uses: shivammathur/setup-php@v2
        with:
          php-version: ${{ matrix.php }}
-         extensions: curl, dom, gd, json, libxml, mbstring, zip
-         coverage: none
- 
+         extensions: curl, dom, gd, json, libxml, mbstring, zip, xdebug
+
      - name: Install dependencies
-       run: composer install --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
+       run: |
+        composer config platform.php 7.3.0
+        composer install --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
  
      - name: Download Apache Tika binaries
        run: APACHE_TIKA_VERSION=${{ matrix.tika }} scripts/download.sh
@@ -83,4 +86,8 @@ jobs:
        run: APACHE_TIKA_VERSION=${{ matrix.tika }} scripts/spawn.sh
 
      - name: Execute tests
-       run: APACHE_TIKA_VERSION=${{ matrix.tika }} vendor/bin/phpunit --verbose
+       run: APACHE_TIKA_VERSION=${{ matrix.tika }} vendor/bin/phpunit --verbose
+
+     - name: Code coverage
+       uses: codecov/codecov-action@v2
+ 

.gitignore

@@ -1,5 +1,5 @@
 .phpunit.result.cache
-
 bin
+composer.lock
 reports
 vendor

CHANGELOG.md

@@ -1,9 +1,15 @@
 # Changelog
 
-## v1.2.2
+## v1.2.4
 
 * Fix known issues before parsing response (see [LOG4J2-2537](https://issues.apache.org/jira/browse/LOG4J2-2537))
-* Tested up to Apache Tika 1.28.1 and 2.3.0
+* Tested up to Apache Tika 1.28.2 and 2.4.0
+
+## v1.2.3
+
+* Removed debug statement when the JSON parse fails
+* Added new known issues to README.md
+* Tests runs now on GitHub Actions
 
 ## v1.2.1
 

README.md

@@ -3,7 +3,7 @@
 [![Build status](https://img.shields.io/github/workflow/status/vaites/php-apache-tika/tests/1.x)](https://github.com/vaites/php-apache-tika/actions)
 [![Code coverage](https://img.shields.io/codecov/c/github/vaites/php-apache-tika.svg)](https://codecov.io/github/vaites/php-apache-tika)
 [![Code quality](https://img.shields.io/scrutinizer/quality/g/vaites/php-apache-tika.svg)](https://scrutinizer-ci.com/g/vaites/php-apache-tika/)
-[![Code insight](https://img.shields.io/sensiolabs/i/92852e11-8648-4d48-9698-653aee765df5.svg)](https://insight.sensiolabs.com/projects/92852e11-8648-4d48-9698-653aee765df5)
+[![Code insight](https://img.shields.io/sensiolabs/i/92852e11-8648-4d48-9698-653aee765df5.svg)](https://insight.symfony.com/projects/92852e11-8648-4d48-9698-653aee765df5)
 [![License](https://img.shields.io/github/license/vaites/php-apache-tika.svg?color=%23999999)](https://github.com/vaites/php-apache-tika/blob/master/LICENSE)
 
 # PHP Apache Tika
@@ -31,7 +31,7 @@ to work with the new versions of the tool.
 * Support for local and remote resources
 * No heavyweight library dependencies
 * Compatible with Apache Tika 1.15 or greater
-    * Tested up to 1.28.1 and 2.3.0
+    * Tested up to 1.28.2 and 2.4.0
 * Works on Linux, macOS, Windows and probably on FreeBSD
 
 ## Requirements

composer.json

@@ -41,13 +41,17 @@
         "phpstan/phpstan": "^0.12.26",
         "symfony/var-dumper": "^5.1",
         "filp/whoops": "^2.7",
-        "psy/psysh": "^0.10.8"
+        "psy/psysh": "^0.10.8",
+        "nunomaduro/collision": "^5.11"
     },
     "extra": {
         "supported-versions": [
             "1.15", "1.16", "1.17", "1.18", "1.19", "1.19.1", "1.20", "1.21", 
-            "1.22", "1.23", "1.24", "1.24.1", "1.25", "1.26","1.27", "1.28", "1.28.1", 
-            "2.0.0", "2.1.0", "2.2.0", "2.2.1", "2.3.0"
+            "1.22", "1.23", "1.24", "1.24.1", "1.25", "1.26","1.27", "1.28", "1.28.1", "1.28.2", 
+            "2.0.0", "2.1.0", "2.2.0", "2.2.1", "2.3.0", "2.4.0"
         ]
+    },
+    "scripts": {
+        "test": "vendor/bin/phpunit --coverage-html reports"
     }
 }