Merge pull request #18 from rezaf-dev/master

Support Symfony 6.0+

Author: vatri

composer.json

@@ -4,7 +4,7 @@
     "description": "Google Drive API Bundle",
     "require": {
         "google/apiclient": "^2.2",
-        "symfony/framework-bundle": "^4.0|^5.1"
+        "symfony/framework-bundle": "^4.0|^5.1|^6.0"
     },
     "license": "MIT",
     "authors": [

src/Controller/VatriGoogleDriveAuthController.php

@@ -3,6 +3,7 @@
 namespace Vatri\GoogleDriveBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
@@ -27,10 +28,12 @@ class VatriGoogleDriveAuthController extends AbstractController
      */
     private $driveApiService;
 
-	public function __construct(ParameterBagInterface $parameterBag, SessionInterface $session, DriveApiService $driveApiService)
+	public function __construct(ParameterBagInterface $parameterBag, RequestStack $requestStack, DriveApiService $driveApiService)
     {
+		try {
+            $this->session = $requestStack->getSession();
+        } catch (\Exception $exception){}
 		$this->parameterBag      = $parameterBag;
-		$this->session           = $session;
         $this->driveApiService = $driveApiService;
 	}
     /**

src/Resources/config/vatri_google_drive.yaml

@@ -15,7 +15,7 @@ services:
 
   vatri_google_drive.api_service:
     class: Vatri\GoogleDriveBundle\Service\DriveApiService
-    arguments: [ '@session', '@parameter_bag', '@vatri_google_drive.cookie_token_storage' ]
+    arguments: [ '@request_stack', '@parameter_bag', '@vatri_google_drive.cookie_token_storage' ]
 
   # Alias:
   Vatri\GoogleDriveBundle\Service\DriveApiService: '@vatri_google_drive.api_service'
@@ -26,5 +26,5 @@ services:
     autoconfigure: true
     arguments:
       $parameterBag: '@parameter_bag'
-      $session: '@session'
+      $requestStack: '@request_stack'
       $driveApiService: '@vatri_google_drive.api_service'

src/Service/DriveApiService.php

@@ -6,6 +6,7 @@
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
+use Symfony\Component\HttpFoundation\RequestStack;
 use Vatri\GoogleDriveBundle\DriveServiceResponse;
 
 
@@ -33,9 +34,11 @@ class DriveApiService
     private $token_storage;
 
 
-    public function __construct(SessionInterface $session, ParameterBagInterface $parameters, TokenStorageInterface $tokenStorage)
+    public function __construct(RequestStack $requestStack, ParameterBagInterface $parameters, TokenStorageInterface $tokenStorage)
     {
-        $this->session = $session;
+        try {
+            $this->session = $requestStack->getSession();
+        } catch (\Exception $exception) {}
         $this->parameters = $parameters;
         $this->token_storage = $tokenStorage;
     }