Merge branch '3.0' of github.com:dystcz/laravel-fakturoid into 3.0

composer.json

@@ -30,6 +30,7 @@
     "fakturoid/fakturoid-php": "^3.0"
   },
   "require-dev": {
+    "dg/bypass-finals": "^1.9",
     "larastan/larastan": "^3.0",
     "laravel/pint": "^1.7",
     "mockery/mockery": "^1.5",

phpunit.xml

@@ -3,6 +3,13 @@
          colors="true" processIsolation="false" stopOnFailure="true"
          xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache"
          backupStaticProperties="false">
+    <extensions>
+        <bootstrap class="DG\BypassFinals\PHPUnitExtension">
+            <parameter name="bypassFinal" value="true"/>
+		    <parameter name="bypassReadOnly" value="false"/>
+		    <parameter name="cacheDirectory" value=".phpunit.cache"/>
+        </bootstrap>
+    </extensions>
     <coverage/>
     <testsuites>
         <testsuite name="Tests">

src/Fakturoid.php

@@ -6,9 +6,6 @@
 use Dystcz\Fakturoid\Contracts\Fakturoid as FakturoidContract;
 use Fakturoid\Exception\AuthorizationFailedException;
 use Fakturoid\FakturoidManager;
-use GuzzleHttp\Client as Guzzle;
-use Illuminate\Support\Facades\App;
-use Illuminate\Support\Facades\Config;
 
 /**
  * @method void setAccountSlug(string $companySlug)
@@ -40,21 +37,11 @@
  */
 class Fakturoid implements FakturoidContract
 {
-    protected FakturoidManager $fakturoid;
-
     /**
      * @throws AuthorizationFailedException
      */
-    public function __construct()
+    public function __construct(protected FakturoidManager $fakturoid)
     {
-        $this->fakturoid = App::make(FakturoidManager::class, [
-            'client' => new Guzzle,
-            'clientId' => Config::get('fakturoid.client_id'),
-            'clientSecret' => Config::get('fakturoid.client_secret'),
-            'userAgent' => Config::get('fakturoid.user_agent'),
-            'accountSlug' => Config::get('fakturoid.account_slug'),
-        ]);
-
         $this->fakturoid->authClientCredentials();
     }
 

src/FakturoidServiceProvider.php

@@ -3,6 +3,10 @@
 namespace Dystcz\Fakturoid;
 
 use Dystcz\Fakturoid\Contracts\Fakturoid as FakturoidContract;
+use Fakturoid\FakturoidManager;
+use GuzzleHttp\Client as Guzzle;
+use Illuminate\Contracts\Foundation\Application;
+use Illuminate\Support\Facades\Config;
 use Illuminate\Support\ServiceProvider;
 
 class FakturoidServiceProvider extends ServiceProvider
@@ -28,6 +32,18 @@ public function register()
     {
         $this->mergeConfigFrom(__DIR__.'/../config/fakturoid.php', 'fakturoid');
 
-        $this->app->singleton(FakturoidContract::class, fn () => new Fakturoid);
+        $this->app->bind('fakturoid', fn (Application $app) => $app->make(FakturoidManager::class, [
+            'client' => new Guzzle,
+            'clientId' => Config::get('fakturoid.client_id'),
+            'clientSecret' => Config::get('fakturoid.client_secret'),
+            'userAgent' => Config::get('fakturoid.user_agent'),
+            'accountSlug' => Config::get('fakturoid.account_slug'),
+        ]));
+
+        $this->app->singleton(
+            FakturoidContract::class,
+            fn (Application $app) => $app->make(Fakturoid::class, [
+                'fakturoid' => $app->make('fakturoid'),
+            ]));
     }
 }

tests/Feature/FakturoidFacadeTest.php

@@ -6,7 +6,7 @@
 
 uses(TestCase::class);
 
-it('can call Fakturoid', function (string $method) {
+it('forwards calls from facade', function (string $method) {
     /** @var TestCase $this */
     $fakturoid = $this->mock(FakturoidContract::class);
 

tests/Feature/FakturoidTest.php

@@ -0,0 +1,61 @@
+<?php
+
+use Dystcz\Fakturoid\Contracts\Fakturoid as FakturoidContract;
+use Dystcz\Fakturoid\Facades\Fakturoid as FakturoidFacade;
+use Dystcz\Fakturoid\Fakturoid;
+use Dystcz\Fakturoid\Tests\TestCase;
+use Fakturoid\Auth\CredentialCallback;
+use Fakturoid\Auth\Credentials;
+use Fakturoid\Enum\AuthTypeEnum;
+use Fakturoid\FakturoidManager;
+
+uses(TestCase::class);
+
+it('forwards calls to FakturoidManager', function (string $method, array $params = []) {
+    /** @var TestCase $this */
+    $fakturoidManager = Mockery::mock(FakturoidManager::class);
+
+    $this->app->instance('fakturoid', $fakturoidManager);
+
+    $fakturoid = Mockery::mock(Fakturoid::class, FakturoidContract::class);
+
+    $fakturoidManager->shouldReceive('authClientCredentials')->once();
+    $fakturoidManager->shouldReceive($method)->once()->with(...$params);
+
+    FakturoidFacade::{$method}(...$params);
+})->with([
+    ['setAccountSlug', ['test']],
+    ['getAuthProvider'],
+    ['getAuthenticationUrl'],
+    ['requestCredentials', ['code']],
+    ['getCredentials'],
+    ['setCredentials', [new Credentials(
+        'refresh_token',
+        'access_token',
+        DateTimeImmutable::createFromFormat(DateTimeInterface::ATOM, '2021-01-01T00:00:00+00:00'),
+        AuthTypeEnum::AUTHORIZATION_CODE_FLOW
+    )]],
+    ['setCredentialsCallback', [
+        new class implements CredentialCallback
+        {
+            public function __invoke(?Credentials $credentials = null): void {}
+        },
+    ]],
+    ['authClientCredentials'],
+    ['getDispatcher'],
+    ['getAccountProvider'],
+    ['getBankAccountsProvider'],
+    ['getEventsProvider'],
+    ['getExpensesProvider'],
+    ['getGeneratorsProvider'],
+    ['getInboxFilesProvider'],
+    ['getInventoryItemsProvider'],
+    ['getInventoryMovesProvider'],
+    ['getInvoicesProvider'],
+    ['getNumberFormatsProvider'],
+    ['getRecurringGeneratorsProvider'],
+    ['getSubjectsProvider'],
+    ['getTodosProvider'],
+    ['getUsersProvider'],
+    ['getWebhooksProvider'],
+]);