From: Raphaël Gertz <git@rapsys.eu>
Date: Thu, 7 Mar 2024 20:47:34 +0000 (+0100)
Subject: Reorder constructor arguments
X-Git-Tag: 0.4.0~46
X-Git-Url: https://git.rapsys.eu/airbundle/commitdiff_plain/d8950f7e2adfbca7f28c64f4e0637e00359f9539?ds=inline;hp=b603574e4355dac6e0a75d5bffd3c027ad19704d

Reorder constructor arguments
Use env variables to set google client, project and secret
Cleanup
---

diff --git a/Command/Calendar2Command.php b/Command/Calendar2Command.php
index 0ddcd3f..c0a739f 100644
--- a/Command/Calendar2Command.php
+++ b/Command/Calendar2Command.php
@@ -60,22 +60,18 @@ class Calendar2Command extends Command {
 
 	/**
 	 * {@inheritdoc}
-	 *
-	 * @param string $project The google project
-	 * @param string $client The google client
-	 * @param string $secret The google secret
 	 */
-	public function __construct(ManagerRegistry $doctrine, RouterInterface $router, SluggerUtil $slugger, TranslatorInterface $translator, string $locale, string $project, string $client, string $secret) {
+	public function __construct(ManagerRegistry $doctrine, string $locale, RouterInterface $router, SluggerUtil $slugger, TranslatorInterface $translator) {
 		//Call parent constructor
-		parent::__construct($doctrine, $router, $slugger, $translator, $locale);
+		parent::__construct($doctrine, $locale, $router, $slugger, $translator);
 
 		//Set google client
 		$this->client = new Client(
 			[
-				'application_name' => $project,
-				'client_id' => $client,
-				'client_secret' => $secret,
-				'redirect_uri' => $this->router->generate('rapsys_air_google_callback', [], UrlGeneratorInterface::ABSOLUTE_URL),
+				'application_name' => $_ENV['RAPSYSAIR_GOOGLE_PROJECT'],
+				'client_id' => $_ENV['RAPSYSAIR_GOOGLE_CLIENT'],
+				'client_secret' => $_ENV['RAPSYSAIR_GOOGLE_SECRET'],
+				'redirect_uri' => $this->router->generate('rapsysair_google_callback', [], UrlGeneratorInterface::ABSOLUTE_URL),
 				'scopes' => $this->scopes,
 				'access_type' => 'offline',
 				#'login_hint' => $user->getMail(),