add api_type flag to build the right api client version

.github/workflows/infection.yaml

@@ -23,8 +23,8 @@ jobs:
 
             -   name: Infection
                 run: |
-                    wget -q https://github.com/infection/infection/releases/download/0.26.18/infection.phar
-                    wget -q https://github.com/infection/infection/releases/download/0.26.18/infection.phar.asc
+                    wget -q https://github.com/infection/infection/releases/download/0.26.20/infection.phar
+                    wget -q https://github.com/infection/infection/releases/download/0.26.20/infection.phar.asc
                     chmod +x infection.phar
                     ./infection.phar
 

phpunit.xml

@@ -1,31 +1,36 @@
-<?xml version="1.0"?>
-<phpunit
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
-        backupGlobals="true"
-        colors="false"
-        processIsolation="false"
-        stopOnError="false"
-        stopOnFailure="false"
-        stopOnIncomplete="false"
-        stopOnSkipped="false"
-        stopOnRisky="false"
-        timeoutForSmallTests="1"
-        timeoutForMediumTests="10"
-        timeoutForLargeTests="60"
-        cacheDirectory=".phpunit.cache"
-        backupStaticProperties="false"
-        requireCoverageMetadata="false">
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd"
+         backupGlobals="true"
+         colors="false"
+         processIsolation="false"
+         stopOnError="false"
+         stopOnFailure="false"
+         stopOnIncomplete="false"
+         stopOnSkipped="false"
+         stopOnRisky="false"
+         timeoutForSmallTests="1"
+         timeoutForMediumTests="10"
+         timeoutForLargeTests="60"
+         cacheDirectory=".phpunit.cache"
+         backupStaticProperties="false"
+         requireCoverageMetadata="false"
+         bootstrap="vendor/autoload.php"
+         executionOrder="depends,defects"
+         beStrictAboutCoverageMetadata="true"
+         beStrictAboutOutputDuringTests="true"
+         failOnRisky="true"
+         failOnWarning="true">
     <testsuites>
         <testsuite name="Functional tests">
-            <directory>tests/functional/</directory>
+            <directory>tests/functional</directory>
         </testsuite>
     </testsuites>
-    <coverage>
+    <source restrictDeprecations="true" restrictNotices="true" restrictWarnings="true">
         <include>
-            <directory suffix=".php">src</directory>
+            <directory>src</directory>
         </include>
-    </coverage>
+    </source>
     <php>
         <ini name="allow_url_include" value="1" />
     </php>

src/ApiType.php

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Kiboko\Plugin\Sylius;
+
+enum ApiType: string
+{
+    case ADMIN = 'admin';
+    case SHOP = 'shop';
+}

src/Builder/Capacity/All.php

@@ -10,13 +10,9 @@
 
 final class All implements Builder
 {
-    private null|Node\Expr|Node\Identifier $endpoint = null;
-    private null|Node\Expr $search = null;
-    private null|Node\Expr $code = null;
-
-    public function __construct()
-    {
-    }
+    private Node\Expr|Node\Identifier|null $endpoint = null;
+    private ?Node\Expr $search = null;
+    private ?Node\Expr $code = null;
 
     public function withEndpoint(Node\Expr|Node\Identifier $endpoint): self
     {

src/Builder/Capacity/Create.php

@@ -11,13 +11,9 @@
 
 final class Create implements Builder
 {
-    private null|Node\Expr|Node\Identifier $endpoint = null;
-    private null|Node\Expr $code = null;
-    private null|Node\Expr $data = null;
-
-    public function __construct()
-    {
-    }
+    private Node\Expr|Node\Identifier|null $endpoint = null;
+    private ?Node\Expr $code = null;
+    private ?Node\Expr $data = null;
 
     public function withEndpoint(Node\Expr|Node\Identifier $endpoint): self
     {

src/Builder/Capacity/ListPerPage.php

@@ -10,13 +10,9 @@
 
 final class ListPerPage implements Builder
 {
-    private null|Node\Expr|Node\Identifier $endpoint = null;
-    private null|Node\Expr $search = null;
-    private null|Node\Expr $code = null;
-
-    public function __construct()
-    {
-    }
+    private Node\Expr|Node\Identifier|null $endpoint = null;
+    private ?Node\Expr $search = null;
+    private ?Node\Expr $code = null;
 
     public function withEndpoint(Node\Expr|Node\Identifier $endpoint): self
     {

src/Builder/Capacity/Upsert.php

@@ -11,13 +11,9 @@
 
 final class Upsert implements Builder
 {
-    private null|Node\Expr|Node\Identifier $endpoint = null;
-    private null|Node\Expr $code = null;
-    private null|Node\Expr $data = null;
-
-    public function __construct()
-    {
-    }
+    private Node\Expr|Node\Identifier|null $endpoint = null;
+    private ?Node\Expr $code = null;
+    private ?Node\Expr $data = null;
 
     public function withEndpoint(Node\Expr|Node\Identifier $endpoint): self
     {

src/Builder/Client.php

@@ -4,12 +4,15 @@
 
 namespace Kiboko\Plugin\Sylius\Builder;
 
+use Kiboko\Plugin\Sylius\ApiType;
 use Kiboko\Plugin\Sylius\MissingAuthenticationMethodException;
 use PhpParser\Builder;
 use PhpParser\Node;
 
 final class Client implements Builder
 {
+    private ?Node\Expr $clientId = null;
+    private ?Node\Expr $secret = null;
     private ?Node\Expr $username = null;
     private ?Node\Expr $password = null;
     private ?Node\Expr $token = null;
@@ -18,9 +21,19 @@ final class Client implements Builder
     private ?Node\Expr $httpRequestFactory = null;
     private ?Node\Expr $httpStreamFactory = null;
     private ?Node\Expr $fileSystem = null;
+    private ?Node\Expr $client = null;
 
-    public function __construct(private readonly Node\Expr $baseUrl, private readonly Node\Expr $clientId, private readonly Node\Expr $secret)
+    public function __construct(
+        private readonly Node\Expr $baseUrl,
+    ) {
+    }
+
+    public function withSecret(Node\Expr $clientId, Node\Expr $secret): self
     {
+        $this->clientId = $clientId;
+        $this->secret = $secret;
+
+        return $this;
     }
 
     public function withToken(Node\Expr $token, Node\Expr $refreshToken): self
@@ -67,17 +80,16 @@ public function withFileSystem(Node\Expr $fileSystem): self
         return $this;
     }
 
+    public function withClientBuilder(Node\Expr $client): self
+    {
+        $this->client = $client;
+
+        return $this;
+    }
+
     public function getNode(): Node\Expr\MethodCall
     {
-        $instance = new Node\Expr\MethodCall(
-            var: new Node\Expr\New_(
-                new Node\Name\FullyQualified('Diglin\\Sylius\\ApiClient\\SyliusClientBuilder'),
-            ),
-            name: new Node\Identifier('setBaseUri'),
-            args: [
-                new Node\Arg($this->baseUrl),
-            ],
-        );
+        $instance = $this->client;
 
         if (null !== $this->httpClient) {
             $instance = new Node\Expr\MethodCall(
@@ -126,6 +138,17 @@ public function getNode(): Node\Expr\MethodCall
         );
     }
 
+    private function getClientBuilderNode(): Node\Expr\MethodCall
+    {
+        return new Node\Expr\MethodCall(
+            var: $this->client,
+            name: new Node\Identifier('setBaseUri'),
+            args: [
+                new Node\Arg($this->baseUrl),
+            ],
+        );
+    }
+
     private function getFactoryMethod(): string
     {
         if (null !== $this->password) {
@@ -143,19 +166,23 @@ private function getFactoryArguments(): array
     {
         if (null !== $this->password) {
             return [
-                $this->clientId,
-                $this->secret,
                 $this->username,
                 $this->password,
             ];
         }
 
         if (null !== $this->refreshToken) {
+            if ($this->apiType === ApiType::LEGACY->value) {
+                return [
+                    $this->clientId,
+                    $this->secret,
+                    $this->token,
+                    $this->refreshToken,
+                ];
+            }
+
             return [
-                $this->clientId,
-                $this->secret,
                 $this->token,
-                $this->refreshToken,
             ];
         }
 

src/Builder/Extractor.php

@@ -12,9 +12,11 @@ final class Extractor implements StepBuilderInterface
 {
     private ?Node\Expr $logger = null;
     private ?Node\Expr $client = null;
+    private ?Node $type = null;
 
-    public function __construct(private readonly Builder $capacity)
-    {
+    public function __construct(
+        private readonly Builder $capacity,
+    ) {
     }
 
     public function withClient(Node\Expr $client): self
@@ -24,6 +26,13 @@ public function withClient(Node\Expr $client): self
         return $this;
     }
 
+    public function withClientType(Node $type): self
+    {
+        $this->type = $type;
+
+        return $this;
+    }
+
     public function withLogger(Node\Expr $logger): self
     {
         $this->logger = $logger;
@@ -55,18 +64,7 @@ class: new Node\Stmt\Class_(
                             name: new Node\Identifier(name: '__construct'),
                             subNodes: [
                                 'flags' => Node\Stmt\Class_::MODIFIER_PUBLIC,
-                                'params' => [
-                                    new Node\Param(
-                                        var: new Node\Expr\Variable('client'),
-                                        type: new Node\Name\FullyQualified(name: \Diglin\Sylius\ApiClient\SyliusLegacyClientInterface::class),
-                                        flags: Node\Stmt\Class_::MODIFIER_PUBLIC,
-                                    ),
-                                    new Node\Param(
-                                        var: new Node\Expr\Variable('logger'),
-                                        type: new Node\Name\FullyQualified(name: \Psr\Log\LoggerInterface::class),
-                                        flags: Node\Stmt\Class_::MODIFIER_PUBLIC,
-                                    ),
-                                ],
+                                'params' => $this->getParamsNode(),
                             ],
                         ),
                         new Node\Stmt\ClassMethod(
@@ -133,4 +131,20 @@ class: new Node\Stmt\Class_(
             ],
         );
     }
+
+    public function getParamsNode(): array
+    {
+        return [
+            new Node\Param(
+                var: new Node\Expr\Variable('client'),
+                type: $this->type,
+                flags: Node\Stmt\Class_::MODIFIER_PRIVATE,
+            ),
+            new Node\Param(
+                var: new Node\Expr\Variable('logger'),
+                type: new Node\Name\FullyQualified(name: \Psr\Log\LoggerInterface::class),
+                flags: Node\Stmt\Class_::MODIFIER_PRIVATE,
+            ),
+        ];
+    }
 }