Add Symfony 6 support

Author: calliostro

.travis.yml

@@ -14,6 +14,8 @@ matrix:
   fast_finish: true
   include:
     # Minimum supported dependencies with the latest and oldest PHP version
+    - php: 8.1
+      env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_DEPRECATIONS_HELPER=disabled=1"
     - php: 8.0
       env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_DEPRECATIONS_HELPER=disabled=1"
     # Minimum PHP 7.4 / Symfony 5 throws "require(): read of xxx bytes failed with errno=13 Permission denied" when
@@ -24,15 +26,17 @@ matrix:
       env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_DEPRECATIONS_HELPER="disabled=1"
 
       # Test the latest stable release
-    - php: 7.3
-      env: SYMFONY_DEPRECATIONS_HELPER="max[direct]=0"
-    - php: 7.4
-      env: SYMFONY_DEPRECATIONS_HELPER="max[direct]=0"
+    - php: 8.1
+      env: COVERAGE=true PHPUNIT_FLAGS="-v --coverage-text"
     - php: 8.0
       env: COVERAGE=true PHPUNIT_FLAGS="-v --coverage-text"
+    - php: 7.4
+      env: SYMFONY_DEPRECATIONS_HELPER="max[direct]=0"
+    - php: 7.3
+      env: SYMFONY_DEPRECATIONS_HELPER="max[direct]=0"
 
       # Latest commit to master
-    - php: 8.0
+    - php: 8.1
       env: STABILITY="dev"
 
   allow_failures:

README.md

@@ -1,12 +1,12 @@
 Spotify Web API Bundle
 ======================
 
-[![Build Status](https://api.travis-ci.com/calliostro/spotify-web-api-bundle.svg)](https://www.travis-ci.com/github/calliostro/spotify-web-api-bundle)
+[![Build Status](https://app.travis-ci.com/calliostro/spotify-web-api-bundle.svg?branch=main)](https://www.travis-ci.com/github/calliostro/spotify-web-api-bundle)
 [![Version](https://poser.pugx.org/calliostro/spotify-web-api-bundle/version)](//packagist.org/packages/calliostro/spotify-web-api-bundle)
 [![License](https://poser.pugx.org/calliostro/spotify-web-api-bundle/license)](//packagist.org/packages/calliostro/spotify-web-api-bundle)
 
 This bundle provides a simple integration of [jwilsson/spotify-web-api-php](https://github.com/jwilsson/spotify-web-api-php)
-into Symfony 5.
+into Symfony 5 or Symfony 6.
 
 
 Installation

composer.json

@@ -1,21 +1,21 @@
 {
     "name": "calliostro/spotify-web-api-bundle",
-    "description": "Spotify Web API client for PHP 7.3 or 8.0 and Symfony 5",
+    "description": "Spotify Web API client for Symfony 5 or Symfony 6",
     "type": "symfony-bundle",
     "require": {
         "php": "^7.3 || ^8.0",
         "jwilsson/spotify-web-api-php": "^5.0",
-        "symfony/config": "^5.0",
-        "symfony/dependency-injection": "^5.0",
-        "symfony/http-kernel": "^5.0"
+        "symfony/config": "^5.0 || ^6.0",
+        "symfony/dependency-injection": "^5.0 || ^6.0",
+        "symfony/http-kernel": "^5.0 || ^6.0"
     },
     "autoload": {
         "psr-4": {
             "Calliostro\\SpotifyWebApiBundle\\": "src/"
         }
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "^5.0"
+        "symfony/phpunit-bridge": "^5.0 || ^6.0"
     },
     "autoload-dev": {
         "psr-4": {

src/CalliostroSpotifyWebApiBundle.php

@@ -4,6 +4,6 @@
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
-class CalliostroSpotifyWebApiBundle extends Bundle
+final class CalliostroSpotifyWebApiBundle extends Bundle
 {
 }

tests/FunctionalTest.php

@@ -10,7 +10,7 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Kernel;
 
-class FunctionalTest extends TestCase
+final class FunctionalTest extends TestCase
 {
     public function testServiceWiring(): void
     {
@@ -54,7 +54,7 @@ public function registerContainerConfiguration(LoaderInterface $loader): void
         });
     }
 
-    public function getCacheDir()
+    public function getCacheDir(): string
     {
         return $this->getProjectDir() . '/var/cache/'.$this->environment.'/'.spl_object_hash($this);
     }