Merge pull request #46 from Matth--/fix/dependencies

PHP8 support

.travis.yml

@@ -1,31 +1,42 @@
 language: php
 sudo: false
 
-php:
-  - '7.3'
+cache:
+  directories:
+    - $HOME/.composer/cache/files
 
-env:
-  - SYMFONY_VERSION="3.4.*"
-  - SYMFONY_VERSION="4.3.*"
-  - SYMFONY_VERSION="4.4.*"
-  - SYMFONY_VERSION="5.0.*"
+matrix:
+  fast_finish: true
+  include:
+    - php: 7.3
+      env: SYMFONY_VERSION="3.4.*"
+    - php: 7.3
+      env: SYMFONY_VERSION="4.4.*"
+    - php: 7.3
+      env: SYMFONY_VERSION="5.1.*"
+    - php: 7.3
+      env: SYMFONY_VERSION="5.2.*"
+    - php: 7.4
+      env: SYMFONY_VERSION="3.4.*"
+    - php: 7.4
+      env: SYMFONY_VERSION="4.4.*"
+    - php: 7.4
+      env: SYMFONY_VERSION="5.1.*"
+    - php: 7.4
+      env: SYMFONY_VERSION="5.2.*"
+    - php: 8.0
+      env: SYMFONY_VERSION="5.2.*" COMPOSER_FLAGS="--ignore-platform-reqs"
 
-before_script:
-  - composer self-update
-  - sed -i -e "s/\^3\.4[|]\^4\.3[|]\^5\.0/$SYMFONY_VERSION/g" composer.json
-  - composer install --dev --prefer-dist --no-interaction -o
+install:
+  - composer require --prefer-dist --no-interaction ${COMPOSER_FLAGS} symfony/symfony:${SYMFONY_VERSION}
 
 script:
   - ./vendor/bin/phpcs -p --standard=./ruleset.xml
-  - ./vendor/bin/phpunit -c phpunit.xml.dist --coverage-clover=coverage.xml
+  - XDEBUG_MODE=coverage ./vendor/bin/phpunit -c phpunit.xml.dist --coverage-clover=coverage.xml
 
 after_success:
   - bash <(curl -s https://codecov.io/bash)
 
-cache:
-  directories:
-    - $COMPOSER_CACHE_DIR
-
 notifications:
   email:
     - [email protected]

Tests/Controller/HandshakeControllerTest.php

@@ -4,8 +4,8 @@
 
 use AtlassianConnectBundle\Controller\HandshakeController;
 use AtlassianConnectBundle\Entity\Tenant;
-use Doctrine\Common\Persistence\ObjectRepository;
 use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\Persistence\ObjectRepository;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Log\Logger;

Tests/Security/JWTAuthenticatorTest.php

@@ -5,8 +5,8 @@
 use AtlassianConnectBundle\Entity\Tenant;
 use AtlassianConnectBundle\Security\JWTAuthenticator;
 use AtlassianConnectBundle\Security\JWTUserProviderInterface;
-use Doctrine\Common\Persistence\ObjectRepository;
 use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\Persistence\ObjectRepository;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;

composer.json

@@ -6,7 +6,7 @@
   "type": "symfony-bundle",
   "license": "MIT",
   "require": {
-    "php": "^7.2",
+    "php": "^7.2|^8.0",
     "ext-json": "*",
     "symfony/dependency-injection": "^3.4|^4.3|^5.0",
     "symfony/http-kernel": "^3.4|^4.3|^5.0",
@@ -18,7 +18,7 @@
     "symfony/console": "^3.4|^4.3|^5.0",
     "doctrine/orm": "^2.5",
     "guzzlehttp/guzzle": "^6.0",
-    "twig/twig": "^2.10|3.0",
+    "twig/twig": "^2.10|^3.0",
     "firebase/php-jwt": "^5.0"
   },
   "require-dev": {