wip

Author: ondrajodas

phpstan-baseline.neon

@@ -1,15 +1,5 @@
 parameters:
 	ignoreErrors:
-		-
-			message: "#^Cannot access offset 'access_token' on mixed\\.$#"
-			count: 1
-			path: src/Component.php
-
-		-
-			message: "#^Cannot access offset 'refresh_token' on mixed\\.$#"
-			count: 1
-			path: src/Component.php
-
 		-
 			message: "#^Method Keboola\\\\GoogleAnalyticsExtractor\\\\Component\\:\\:getProfilesPropertiesAction\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -55,16 +45,6 @@ parameters:
 			count: 1
 			path: src/Component.php
 
-		-
-			message: "#^Parameter \\#3 \\$accessToken of class Keboola\\\\Google\\\\ClientBundle\\\\Google\\\\RestApi constructor expects string, mixed given\\.$#"
-			count: 1
-			path: src/Component.php
-
-		-
-			message: "#^Parameter \\#4 \\$refreshToken of class Keboola\\\\Google\\\\ClientBundle\\\\Google\\\\RestApi constructor expects string, mixed given\\.$#"
-			count: 1
-			path: src/Component.php
-
 		-
 			message: "#^Cannot access offset 'enabled' on mixed\\.$#"
 			count: 1

phpstan.neon

@@ -6,4 +6,3 @@ parameters:
         - '#Call to an undefined method Symfony\\Component\\Config\\Definition\\Builder\\NodeDefinition\:\:ignoreExtraKeys\(\).#'
         - '#Cannot call method integerNode\(\) on Symfony\\Component\\Config\\Definition\\Builder\\NodeParentInterface\|null\.#'
         - '#Cannot call method scalarNode\(\) on Symfony\\Component\\Config\\Definition\\Builder\\NodeParentInterface\|null\.#'
-        - '#logger of class Keboola\\Google\\ClientBundle\\Google\\RestApi constructor expects Monolog\\Logger\|null, Psr\\Log\\LoggerInterface given\.#'

src/Component.php

@@ -307,6 +307,7 @@ private function getGoogleRestApi(): RestApi
                 $this->getLogger(),
             );
         } else {
+            /** @var array{access_token?: string, refresh_token?: string}|null $tokenData */
             $tokenData = json_decode($this->getConfig()->getOAuthApiData(), true);
             if (!isset($tokenData['access_token'], $tokenData['refresh_token'])) {
                 throw new UserException('The token data are broken. Please try to reauthorize.');

src/Configuration/Config.php

@@ -125,6 +125,6 @@ public function processProperties(string $configDefinition): bool
 
     public function getCredentials(): string
     {
-        return $this->getValue(['parameters', 'credentials'], '');
+        return $this->getStringValue(['parameters', 'credentials'], '');
     }
 }

src/Configuration/ConfigGetProfilesPropertiesDefinition.php

@@ -13,10 +13,7 @@ public function getParametersDefinition(): ArrayNodeDefinition
     {
         $parametersNode = parent::getParametersDefinition();
 
-        $parametersNode
-            ->children()
-                ->scalarNode('credentials')->end()
-            ->end();
+        $parametersNode->children()->scalarNode('credentials')->end();
 
         return $parametersNode;
     }

tests/Keboola/GoogleAnalyticsExtractor/ApplicationTest.php

@@ -94,7 +94,6 @@ public function testAppRunAdaptive(): void
 
     public function testAppRunMCF(): void
     {
-        $this->markTestSkipped();
         $this->config = $this->getConfig('_mcf');
         $this->runProcess();
 

tests/Keboola/GoogleAnalyticsExtractor/Extractor/ExtractorTest.php

@@ -37,7 +37,7 @@ public function setUp(): void
         $this->config = $this->getConfig();
         $this->logger = new TestLogger();
         $client = new Client(
-            new RestApi(
+            RestApi::createWithOAuth(
                 (string) getenv('CLIENT_ID'),
                 (string) getenv('CLIENT_SECRET'),
                 (string) getenv('ACCESS_TOKEN'),

tests/Keboola/GoogleAnalyticsExtractor/GoogleAnalytics/ClientTest.php

@@ -25,7 +25,7 @@ public function setUp(): void
         $this->logger->pushHandler($testHandler);
 
         $this->client = new Client(
-            new RestApi(
+            RestApi::createWithOAuth(
                 (string) getenv('CLIENT_ID'),
                 (string) getenv('CLIENT_SECRET'),
                 (string) getenv('ACCESS_TOKEN'),