Merge pull request #7 from Baachi/master

Allow Symfony 4
jolicode · Jun 3, 2019 · 15ded09 · 15ded09
2 parents cff49b5 + 8d24bb5
commit 15ded09
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,28 +8,26 @@ sudo: false
 cache:
     directories:
         - $HOME/.composer/cache
-        - $HOME/build/jolicode/ApacheTikaBundle/Tests/bin
 
 env:
     global:
         - deps=high
 
 before_script:
     - if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then phpenv config-rm xdebug.ini; fi
-    - \[ -f $HOME/build/jolicode/ApacheTikaBundle/Tests/bin/tika-app.jar \] || wget -O $HOME/build/jolicode/ApacheTikaBundle/Tests/bin/tika-app.jar http://archive.apache.org/dist/tika/tika-app-1.11.jar
-    - \[ -f $HOME/build/jolicode/ApacheTikaBundle/Tests/bin/tika-server.jar \] || wget -O $HOME/build/jolicode/ApacheTikaBundle/Tests/bin/tika-server.jar -nc http://archive.apache.org/dist/tika/tika-server-1.11.jar
+    - \[ -f $HOME/build/jolicode/ApacheTikaBundle/Tests/bin/tika-app.jar \] || wget -O $HOME/build/jolicode/ApacheTikaBundle/Tests/bin/tika-app.jar http://archive.apache.org/dist/tika/tika-app-1.21.jar
+    - \[ -f $HOME/build/jolicode/ApacheTikaBundle/Tests/bin/tika-server.jar \] || wget -O $HOME/build/jolicode/ApacheTikaBundle/Tests/bin/tika-server.jar -nc http://archive.apache.org/dist/tika/tika-server-1.21.jar
     - java -jar $HOME/build/jolicode/ApacheTikaBundle/Tests/bin/tika-server.jar &
     - sleep 5
 
 matrix:
     include:
-        - php: hhvm
-        - php: 5.4
-        - php: 5.5
-        - php: 5.6
-          env: deps=high
         - php: 7.0
           env: deps=low
+        - php: 7.1
+        - php: 7.2
+        - php: 7.3
+          env: deps=high
 
 install:
     - if [ "$deps" = "low" ]; then composer --prefer-source --prefer-lowest update; fi;

diff --git a/DependencyInjection/ApacheTikaExtension.php b/DependencyInjection/ApacheTikaExtension.php
@@ -40,6 +40,7 @@ public function load(array $configs, ContainerBuilder $container)
             ));
         }
 
+        $client->setPublic(true);
         $container->setDefinition('apache_tika.client', $client);
     }
 }
diff --git a/Makefile b/Makefile
@@ -2,13 +2,13 @@ cs:
 	./vendor/fabpot/php-cs-fixer/php-cs-fixer fix --verbose
 
 start_tika_server:
-	\[ -f Tests/bin/tika-server.jar \] || wget -O Tests/bin/tika-server.jar http://archive.apache.org/dist/tika/tika-server-1.11.jar
+	\[ -f Tests/bin/tika-server.jar \] || wget -O Tests/bin/tika-server.jar http://archive.apache.org/dist/tika/tika-server-1.21.jar
 	@make -s stop
 	java -jar Tests/bin/tika-server.jar &
 	sleep 10
 
 get_tika_app:
-	\[ -f Tests/bin/tika-app.jar \] || wget -O Tests/bin/tika-app.jar http://archive.apache.org/dist/tika/tika-app-1.11.jar
+	\[ -f Tests/bin/tika-app.jar \] || wget -O Tests/bin/tika-app.jar http://archive.apache.org/dist/tika/tika-app-1.21.jar
 
 test: get_tika_app start_tika_server
 	./vendor/bin/phpunit

diff --git a/composer.json b/composer.json
@@ -14,14 +14,12 @@
     "require": {
         "php": "~5.4|^7.0",
         "vaites/php-apache-tika": "~0.3",
-        "symfony/http-kernel": "~2.3|~3.0",
-        "symfony/framework-bundle": "~2.3|~3.0"
+        "symfony/http-kernel": "^2.8|^3.0|^4.0",
+        "symfony/framework-bundle": "^2.8|^3.0|^4.0"
     },
     "require-dev": {
         "fabpot/php-cs-fixer": "^1.11",
-        "phpunit/phpunit": "~4.8|~5.1",
-        "symfony/config": "~2.3|~3.0",
-        "symfony/dependency-injection": "~2.3|~3.0"
+        "phpunit/phpunit": "~4.8|~5.1"
     },
     "autoload": {
         "psr-4": {