V2: Uses the new TiteLive APIs

.github/workflows/run-tests.yml

@@ -2,30 +2,35 @@ name: run-tests
 
 on:
   push:
-    branches: [main]
+    branches: [main, v2]
   pull_request:
-    branches: [main]
+    branches: [main, v2]
 
 jobs:
   test:
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: true
       matrix:
-        os: [ubuntu-latest]
-        php: [8.2]
-        laravel: [10.*]
-        stability: [prefer-stable]
         include:
-          - laravel: 10.*
-            testbench: 8.*
-            carbon: ^2.63
-
-    name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
+          - php: 8.3
+            env:
+              LARAVEL: 11.*
+              TESTBENCH: 9.*
+          - php: 8.4
+            env:
+              LARAVEL: 11.*
+              TESTBENCH: 9.*
+          - php: 8.4
+            env:
+              LARAVEL: 12.*
+              TESTBENCH: 10.*
+    env: ${{ matrix.env }}
+    name: P${{ matrix.php }} - L${{ matrix.env.LARAVEL }} - TB${{ matrix.env.TESTBENCH }}
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -41,8 +46,8 @@ jobs:
 
       - name: Install dependencies
         run: |
-          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "nesbot/carbon:${{ matrix.carbon }}" --no-interaction --no-update
-          composer update --${{ matrix.stability }} --prefer-dist --no-interaction
+          composer require "laravel/framework:${LARAVEL}" "orchestra/testbench:${TESTBENCH}" --no-interaction --no-update
+          composer update --prefer-stable --prefer-dist --no-interaction
 
       - name: List Installed Dependencies
         run: composer show -D

_ide_helper.php

@@ -0,0 +1,31 @@
+<?php
+/** @noinspection all */
+
+namespace Code16\LaravelTiteliveClient\Models {
+
+    use Carbon\Carbon;
+    use Code16\LaravelTiteliveClient\Enum\BookAvailability;
+    use Illuminate\Database\Eloquent\Model;
+
+    /**
+     * @property string id
+     * @property string title
+     * @property string[] authors
+     * @property string|null translator
+     * @property string description
+     * @property int weight
+     * @property int page_count
+     * @property string[] category_codes
+     * @property string|null readership
+     * @property string editor
+     * @property int price
+     * @property Carbon|null published_date
+     * @property string support
+     * @property string[] visuals
+     * @property BookAvailability availability
+     * @property int stock
+     * @property string[] editions
+     * @property \DateTimeInterface refreshed_at
+     */
+    class Book extends Model {}
+}

composer.json

@@ -8,19 +8,20 @@
         }
     ],
     "require": {
-        "php": "^8.2|^8.3",
+        "php": "^8.2|^8.3|^8.4",
         "ext-intl": "*",
+        "code16/pint-config": "^1.2.1",
         "guzzlehttp/guzzle": "^7.7",
-        "illuminate/contracts": "^10.0|^11.0",
+        "illuminate/contracts": "^10.0|^11.0|^12.0",
         "spatie/laravel-package-tools": "^1.14.0"
     },
     "require-dev": {
         "laravel/pint": "^1.0",
-        "nunomaduro/collision": "^7.8",
-        "orchestra/testbench": "^8.8|^9.0",
-        "pestphp/pest": "^2.0",
-        "pestphp/pest-plugin-arch": "^2.0",
-        "pestphp/pest-plugin-laravel": "^2.0",
+        "nunomaduro/collision": "^8.0",
+        "orchestra/testbench": "^8.8|^9.0|^10.0",
+        "pestphp/pest": "^2.0|^3.0",
+        "pestphp/pest-plugin-arch": "^2.0|^3.0",
+        "pestphp/pest-plugin-laravel": "^2.0|^3.0",
         "spatie/laravel-ray": "^1.26"
     },
     "autoload": {
@@ -35,7 +36,10 @@
         }
     },
     "scripts": {
-        "post-autoload-dump": "@composer run prepare",
+        "post-autoload-dump": [
+            "@php vendor/bin/pint-config install",
+            "@composer run prepare"
+        ],
         "clear": "@php vendor/bin/testbench package:purge-laravel-titelive-client --ansi",
         "prepare": "@php vendor/bin/testbench package:discover --ansi",
         "build": [

config/titelive-client.php

@@ -7,13 +7,17 @@
         'cache_duration' => env('TITELIVE_CLIENT_BOOK_DIRECTORY_CACHE_DURATION_IN_MINUTES', 60 * 24),
         'api' => [
             'login' => env('TITELIVE_LOGIN'),
-            'client_number' => env('TITELIVE_CLIENT_NUM'),
             'password' => env('TITELIVE_PWD'),
-            'endpoint' => env('TITELIVE_ENDPOINT', 'https://search.epagine.fr/ws.php'),
+            'endpoint' => env('TITELIVE_ENDPOINT', 'https://catsearch.epagine.fr/v1/'),
+            'login_endpoint' => env('TITELIVE_LOGIN_ENDPOINT', 'https://login.epagine.fr/v1/'),
             'retry' => [
                 'times' => env('TITELIVE_CLIENT_BOOK_DIRECTORY_API_RETRY_TIMES', 5),
                 'sleep_milliseconds' => env('TITELIVE_CLIENT_BOOK_DIRECTORY_API_RETRY_SLEEP_MILLISECONDS', 2000),
             ],
+            'params' => [
+                'code_support' => env('TITELIVE_CLIENT_API_PARAM_CODE_SUPPORT'),
+            ],
         ],
     ],
+    'book_model_class' => \Code16\LaravelTiteliveClient\Models\Book::class,
 ];

database/factories/BookFactory.php

@@ -2,15 +2,10 @@
 
 namespace Code16\LaravelTiteliveClient\Database\Factories;
 
-use Code16\LaravelTiteliveClient\Book;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 class BookFactory extends Factory
 {
-    protected $model = Book::class;
-
-    private static int $VISUAL_INDEX = 0;
-
     private static array $VISUALS = [
         '229/9782070585229',
         '904/9782070624904',
@@ -75,6 +70,11 @@ class BookFactory extends Factory
         '613/9782075150613',
     ];
 
+    public function modelName()
+    {
+        return config('titelive-client.book_model_class');
+    }
+
     public function definition()
     {
         return [
@@ -113,16 +113,10 @@ public function definition()
 
     private function getVisual(string $size = 'L'): string
     {
-        $visual = sprintf(
+        return sprintf(
             'https://images.epagine.fr/%s_1_%s.jpg',
-            self::$VISUALS[self::$VISUAL_INDEX],
+            self::$VISUALS[array_rand(self::$VISUALS)],
             ['S' => 'v', 'M' => 'm', 'L' => '75'][$size] ?? '75'
         );
-
-        if (++self::$VISUAL_INDEX >= count(self::$VISUALS)) {
-            self::$VISUAL_INDEX = 0;
-        }
-
-        return $visual;
     }
 }

pint.json

@@ -0,0 +1 @@
+vendor/code16/pint-config/pint.json

src/Api/Clients/BookCache.php

@@ -2,7 +2,7 @@
 
 namespace Code16\LaravelTiteliveClient\Api\Clients;
 
-use Code16\LaravelTiteliveClient\Book;
+use Code16\LaravelTiteliveClient\Models\Book;
 
 interface BookCache
 {

src/Api/Clients/BookCacheMockForDev.php

@@ -2,7 +2,7 @@
 
 namespace Code16\LaravelTiteliveClient\Api\Clients;
 
-use Code16\LaravelTiteliveClient\Book;
+use Code16\LaravelTiteliveClient\Models\Book;
 
 class BookCacheMockForDev implements BookCache
 {

src/Api/Clients/BookDirectoryClient.php

@@ -2,7 +2,7 @@
 
 namespace Code16\LaravelTiteliveClient\Api\Clients;
 
-use Code16\LaravelTiteliveClient\Book;
+use Code16\LaravelTiteliveClient\Models\Book;
 use Illuminate\Support\Collection;
 
 interface BookDirectoryClient

src/Api/Clients/BookDirectoryMockClientForDev.php

@@ -2,11 +2,14 @@
 
 namespace Code16\LaravelTiteliveClient\Api\Clients;
 
-use Code16\LaravelTiteliveClient\Book;
+use Code16\LaravelTiteliveClient\Concerns\UsesBookModel;
+use Code16\LaravelTiteliveClient\Models\Book;
 use Illuminate\Support\Collection;
 
 class BookDirectoryMockClientForDev implements BookDirectoryClient
 {
+    use UsesBookModel;
+
     private array $params = [];
 
     public function getParams(): array

src/Api/Clients/RandomBasedOnRefreshDateBookCache.php

@@ -4,7 +4,7 @@
 
 use Carbon\Carbon;
 use Code16\LaravelTiteliveClient\Api\FindBook;
-use Code16\LaravelTiteliveClient\Book;
+use Code16\LaravelTiteliveClient\Models\Book;
 
 /**
  * This cache strategy is based on a simple rule:

src/Api/Clients/TiteLive/TiteLiveApiCredentialsException.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Code16\LaravelTiteliveClient\Api\Clients\TiteLive;
+
+use Exception;
+
+class TiteLiveApiCredentialsException extends Exception {}

src/Api/Clients/TiteLive/TiteLiveBookNotFoundException.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Code16\LaravelTiteliveClient\Api\Clients\TiteLive;
+
+use Exception;
+
+class TiteLiveBookNotFoundException extends Exception {}