Add tests

Author: vienthuong

.gitignore

@@ -1,3 +1,4 @@
 /vendor/
 /var/*
 .idea
+.phpunit.result.cache

composer.json

@@ -29,6 +29,11 @@
             "Vin\\ShopwareSdk\\": "src"
         }
     },
+    "autoload-dev": {
+        "psr-4": {
+            "Vin\\ShopwareSdk\\": "tests/"
+        }
+    },
     "scripts": {
         "ecs": "vendor/bin/ecs check src",
         "check-style": "phpcs src",

phpunit.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit bootstrap="vendor/autoload.php" colors="true">
+    <testsuites>
+        <testsuite name="Shopware SDK Test Suite">
+            <directory>./tests/</directory>
+        </testsuite>
+    </testsuites>
+
+    <php>
+        <ini name="date.timezone" value="UTC"/>
+    </php>
+</phpunit>

script/src/CodeGenerator.php

@@ -125,9 +125,6 @@ private static function generateDefinitionClass(string $entityNamespace, string
             ->setDocblock($docblock);
         $foo->addUse(EntityDefinition::class);
 
-//        $foo->addUse('Vin\ShopwareSdk\Data\Entity\\' . $entityName . '\\' . $entityName . 'Entity');
-//        $foo->addUse('Vin\ShopwareSdk\Data\Entity\\' . $entityName . '\\' . $entityName . 'Collection');
-
         $foo->getMethod('getEntityClass')->setBody('return ' . $entityName . 'Entity::class;');
         $foo->getMethod('getEntityCollection')->setBody('return ' . $entityName . 'Collection::class;');
 
@@ -173,26 +170,25 @@ private static function getTypedProperty(string $entityNamespace, string $entity
             return $prefix . $refClass;
         }
 
-        if ($property->type === 'int') {
-            return $prefix . 'int';
-        }
-
-        if ($property->type === 'float') {
-            return $prefix . 'float';
-        }
-
-        if ($property->type === 'boolean' || $property->type === 'bool') {
-            return $prefix . 'bool';
-        }
-
-        if ($property->type === 'date') {
-            return $prefix . \DateTimeInterface::class;
-        }
-
         if ($property->isJsonField()) {
             return $prefix . 'array';
         }
-        
-        return null;
+
+        switch ($property->type) {
+            case 'bool':
+            case 'float':
+            case 'int': {
+                return $prefix . $property->type;
+            }
+            case 'boolean': {
+                return $prefix . 'bool';
+            }
+            case 'date': {
+                return $prefix . \DateTimeInterface::class;
+            }
+            default: {
+                return null;
+            }
+        }
     }
 }

src/Client/AdminAuthenticator.php

@@ -61,42 +61,29 @@ public function fetchAccessToken(): AccessToken
 
         $tokenPayload = \json_decode($response, true) ?? [];
 
-        if ($this->isTokenExpired($tokenPayload['access_token'])) {
-            return $this->refreshToken();
+        if (empty($tokenPayload['access_token'])) {
+            throw new AuthorizationFailedException('Access token is invalid format', 401);
         }
 
-        return new AccessToken(
+        $callback = $this->tokenCallback;
+
+        $token = new AccessToken(
             $tokenPayload['access_token'],
-            $tokenPayload['expires_in'],
-            $tokenPayload['token_type'],
+            $tokenPayload['expires_in'] ?? 600,
+            $tokenPayload['token_type'] ?? null,
             $tokenPayload['refresh_token'] ?? null
         );
-    }
-
-    public function setTokenCallback(callable $callback): void
-    {
-        $this->tokenCallback = $callback;
-    }
-
-    public function refreshToken(): AccessToken
-    {
-        $response = $this->fetchAccessToken();
-
-        $callback = $this->tokenCallback;
 
         if ($callback && is_callable($callback)) {
-            $callback($response);
+            $callback($token, $tokenPayload);
         }
 
-        return $response;
+        return $token;
     }
 
-    public function isTokenExpired(string $accessToken) : bool
+    public function setTokenCallback(callable $callback): void
     {
-        $payload = json_decode(base64_decode(explode('.', $accessToken)[1]), true);
-        $expiresAt = $payload['exp'];
-
-        return $expiresAt + $this->config['sec_before_refresh'] * 1000 < time();
+        $this->tokenCallback = $callback;
     }
 
     private function buildFormParams(): array

src/Client/GrantType/GrantType.php

@@ -29,7 +29,7 @@ public function __construct(string $grantType, string $clientId)
         $this->clientId = $clientId;
     }
 
-    public static function createFromConfig(array $config): self
+    public static function createFromConfig(array $config): GrantType
     {
         if (empty($config['grant_type'])) {
             throw new \InvalidArgumentException('Grant type is not provided in the config', 400);
@@ -45,7 +45,7 @@ public static function createFromConfig(array $config): self
                 return new ClientCredentialsGrantType($config['client_id'], $config['client_secret']);
             }
             case self::PASSWORD: {
-                return new PasswordGrantType($config['username'], $config['password'], $config['scopes']);
+                return new PasswordGrantType($config['username'], $config['password'], $config['scopes'] ?? 'write');
             }
             default: {
                 throw new \InvalidArgumentException('Grant type ' . $grantType . ' is not supported', 400);

src/Data/AccessToken.php

@@ -19,4 +19,12 @@ public function __construct(string $accessToken, int $expiresIn = 600, string $t
         $this->tokenType = $tokenType;
         $this->refreshToken = $refreshToken;
     }
+
+    public function isExpired() : bool
+    {
+        $payload = json_decode(base64_decode(explode('.', $this->accessToken)[1]), true);
+        $expiresAt = $payload['exp'];
+
+        return $expiresAt * 1000 < time();
+    }
 }

src/Data/Criteria.php

@@ -20,6 +20,21 @@
 
 class Criteria implements ParseAware
 {
+    /**
+     * no total count will be selected. Should be used if no pagination required (fastest)
+     */
+    public const TOTAL_COUNT_MODE_NONE = 0;
+
+    /**
+     * exact total count will be selected. Should be used if an exact pagination is required (slow)
+     */
+    public const TOTAL_COUNT_MODE_EXACT = 1;
+
+    /**
+     * fetches limit * 5 + 1. Should be used if pagination can work with "next page exists" (fast)
+     */
+    public const TOTAL_COUNT_MODE_NEXT_PAGES = 2;
+
     private int $page;
 
     private int $limit;

src/Data/Filter/Filter.php

@@ -8,7 +8,7 @@
 
 abstract class Filter implements ParseAware
 {
-    public const TYPE_MULTI = 'prefix';
+    public const TYPE_MULTI = 'multi';
 
     public const TYPE_PREFIX = 'prefix';
 

src/Factory/RepositoryFactory.php

@@ -31,7 +31,7 @@ private static function getDefinition(string $entity): EntityDefinition
         }
 
         if (!array_key_exists($entity, self::$mapping)) {
-            throw new \Exception('Definition not found for Entity ' . $entity);
+            throw new \Exception('Definition not found for Entity: ' . $entity);
         }
 
         $definitionClass = self::$mapping[$entity];

src/Repository/EntityRepository.php

@@ -79,11 +79,11 @@ public function search(Criteria $criteria, Context $context): EntitySearchResult
 
         $aggregations = new AggregationResultCollection($response['aggregations']);
 
-        $result = $this->hydrateSearchResult($response, $context);
+        $entities = $this->hydrateSearchResult($response, $context);
 
         $meta = new SearchResultMeta($response['meta']['total'], $response['meta']['totalCountMode']);
 
-        return new EntitySearchResult($this->entityName, $meta, $result, $aggregations, $criteria, $context);
+        return new EntitySearchResult($this->entityName, $meta, $entities, $aggregations, $criteria, $context);
     }
 
     public function searchIds(Criteria $criteria, Context $context): IdSearchResult

src/Repository/Struct/IdSearchResult.php

@@ -8,15 +8,15 @@
 
 class IdSearchResult
 {
-    public int $total;
+    private int $total;
 
-    public Criteria $criteria;
+    private Criteria $criteria;
 
-    public Context $context;
+    private Context $context;
 
-    public array $ids = [];
+    private array $ids = [];
 
-    public array $data = [];
+    private array $data = [];
 
     public function __construct(int $total, array $ids, Criteria $criteria, Context $context)
     {
@@ -27,6 +27,56 @@ public function __construct(int $total, array $ids, Criteria $criteria, Context
         $this->context = $context;
     }
 
+    public function getTotal(): int
+    {
+        return $this->total;
+    }
+
+    public function setTotal(int $total): void
+    {
+        $this->total = $total;
+    }
+
+    public function getCriteria(): Criteria
+    {
+        return $this->criteria;
+    }
+
+    public function setCriteria(Criteria $criteria): void
+    {
+        $this->criteria = $criteria;
+    }
+
+    public function getContext(): Context
+    {
+        return $this->context;
+    }
+
+    public function setContext(Context $context): void
+    {
+        $this->context = $context;
+    }
+
+    public function getIds(): array
+    {
+        return $this->ids;
+    }
+
+    public function setIds(array $ids): void
+    {
+        $this->ids = $ids;
+    }
+
+    public function getData(): array
+    {
+        return $this->data;
+    }
+
+    public function setData(array $data): void
+    {
+        $this->data = $data;
+    }
+
     public function firstId(): ?string
     {
         if (empty($this->ids)) {

src/Repository/Traits/EntityHydrator.php

@@ -34,7 +34,14 @@ private function hydrateSearchResult(array $response, Context $context): EntityC
             $entities[$entity->id] = $entity;
         }
 
-        return new EntityCollection($entities);
+        $collectionClass = EntityCollection::class;
+
+        if (!empty($response['data'][0]['type'])) {
+            $repository = RepositoryFactory::create($response['data'][0]['type']);
+            $collectionClass = $repository->getDefinition()->getEntityCollection();
+        }
+
+        return new $collectionClass($entities);
     }
 
     private function hydrateEntity(string $entityName, array $entityRaw, array $data, Context $context): Entity