fix deptrac

rez1dent3 · rez1dent3 · commit ac2b1278f0e1 · 2022-05-02T10:49:56.000+03:00
diff --git a/depfile.yaml b/depfile.yaml
@@ -13,6 +13,8 @@ layers:
     collectors:
       - type: className
         regex: ^Bavix\\Wallet\\Interfaces\\.*
+      - type: className
+        regex: ^Bavix\\Wallet\\External\\.*
 
   - name: UI
     collectors:
diff --git a/src/External/ExtraDtoInterface.php b/src/External/ExtraDtoInterface.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Bavix\Wallet\Internal\Dto;
+namespace Bavix\Wallet\External;
 
 interface ExtraDtoInterface
 {
diff --git a/src/External/OptionDtoInterface.php b/src/External/OptionDtoInterface.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Bavix\Wallet\Internal\Dto;
+namespace Bavix\Wallet\External;
 
 interface OptionDtoInterface
 {
diff --git a/src/Interfaces/Exchangeable.php b/src/Interfaces/Exchangeable.php
@@ -6,7 +6,7 @@
 
 use Bavix\Wallet\Exceptions\BalanceIsEmpty;
 use Bavix\Wallet\Exceptions\InsufficientFunds;
-use Bavix\Wallet\Internal\Dto\ExtraDtoInterface;
+use Bavix\Wallet\External\ExtraDtoInterface;
 use Bavix\Wallet\Internal\Exceptions\ExceptionInterface;
 use Bavix\Wallet\Internal\Exceptions\LockProviderNotFoundException;
 use Bavix\Wallet\Internal\Exceptions\RecordNotFoundException;
diff --git a/src/Interfaces/Wallet.php b/src/Interfaces/Wallet.php
@@ -7,7 +7,7 @@
 use Bavix\Wallet\Exceptions\AmountInvalid;
 use Bavix\Wallet\Exceptions\BalanceIsEmpty;
 use Bavix\Wallet\Exceptions\InsufficientFunds;
-use Bavix\Wallet\Internal\Dto\ExtraDtoInterface;
+use Bavix\Wallet\External\ExtraDtoInterface;
 use Bavix\Wallet\Internal\Exceptions\ExceptionInterface;
 use Bavix\Wallet\Internal\Exceptions\LockProviderNotFoundException;
 use Bavix\Wallet\Internal\Exceptions\TransactionFailedException;
diff --git a/src/Interfaces/WalletFloat.php b/src/Interfaces/WalletFloat.php
@@ -7,7 +7,7 @@
 use Bavix\Wallet\Exceptions\AmountInvalid;
 use Bavix\Wallet\Exceptions\BalanceIsEmpty;
 use Bavix\Wallet\Exceptions\InsufficientFunds;
-use Bavix\Wallet\Internal\Dto\ExtraDtoInterface;
+use Bavix\Wallet\External\ExtraDtoInterface;
 use Bavix\Wallet\Internal\Exceptions\ExceptionInterface;
 use Bavix\Wallet\Internal\Exceptions\LockProviderNotFoundException;
 use Bavix\Wallet\Internal\Exceptions\TransactionFailedException;
diff --git a/src/Internal/Assembler/ExtraDtoAssembler.php b/src/Internal/Assembler/ExtraDtoAssembler.php
@@ -4,8 +4,8 @@
 
 namespace Bavix\Wallet\Internal\Assembler;
 
+use Bavix\Wallet\External\ExtraDtoInterface;
 use Bavix\Wallet\Internal\Dto\ExtraDto;
-use Bavix\Wallet\Internal\Dto\ExtraDtoInterface;
 
 final class ExtraDtoAssembler implements ExtraDtoAssemblerInterface
 {
diff --git a/src/Internal/Assembler/ExtraDtoAssemblerInterface.php b/src/Internal/Assembler/ExtraDtoAssemblerInterface.php
@@ -4,7 +4,7 @@
 
 namespace Bavix\Wallet\Internal\Assembler;
 
-use Bavix\Wallet\Internal\Dto\ExtraDtoInterface;
+use Bavix\Wallet\External\ExtraDtoInterface;
 
 interface ExtraDtoAssemblerInterface
 {
diff --git a/src/Internal/Assembler/OptionDtoAssembler.php b/src/Internal/Assembler/OptionDtoAssembler.php
@@ -4,8 +4,8 @@
 
 namespace Bavix\Wallet\Internal\Assembler;
 
+use Bavix\Wallet\External\OptionDtoInterface;
 use Bavix\Wallet\Internal\Dto\OptionDto;
-use Bavix\Wallet\Internal\Dto\OptionDtoInterface;
 
 final class OptionDtoAssembler implements OptionDtoAssemblerInterface
 {
diff --git a/src/Internal/Assembler/OptionDtoAssemblerInterface.php b/src/Internal/Assembler/OptionDtoAssemblerInterface.php
@@ -4,7 +4,7 @@
 
 namespace Bavix\Wallet\Internal\Assembler;
 
-use Bavix\Wallet\Internal\Dto\OptionDtoInterface;
+use Bavix\Wallet\External\OptionDtoInterface;
 
 interface OptionDtoAssemblerInterface
 {
diff --git a/src/Internal/Dto/ExtraDto.php b/src/Internal/Dto/ExtraDto.php
@@ -4,6 +4,9 @@
 
 namespace Bavix\Wallet\Internal\Dto;
 
+use Bavix\Wallet\External\ExtraDtoInterface;
+use Bavix\Wallet\External\OptionDtoInterface;
+
 /** @internal */
 final class ExtraDto implements ExtraDtoInterface
 {
diff --git a/src/Internal/Dto/OptionDto.php b/src/Internal/Dto/OptionDto.php
@@ -4,6 +4,8 @@
 
 namespace Bavix\Wallet\Internal\Dto;
 
+use Bavix\Wallet\External\OptionDtoInterface;
+
 /** @internal */
 final class OptionDto implements OptionDtoInterface
 {
diff --git a/src/Objects/Extra.php b/src/Objects/Extra.php
@@ -4,8 +4,8 @@
 
 namespace Bavix\Wallet\Objects;
 
-use Bavix\Wallet\Internal\Dto\ExtraDtoInterface;
-use Bavix\Wallet\Internal\Dto\OptionDtoInterface;
+use Bavix\Wallet\External\ExtraDtoInterface;
+use Bavix\Wallet\External\OptionDtoInterface;
 
 final class Extra implements ExtraDtoInterface
 {
diff --git a/src/Objects/Option.php b/src/Objects/Option.php
@@ -4,7 +4,7 @@
 
 namespace Bavix\Wallet\Objects;
 
-use Bavix\Wallet\Internal\Dto\OptionDtoInterface;
+use Bavix\Wallet\External\OptionDtoInterface;
 
 final class Option implements OptionDtoInterface
 {
diff --git a/src/Services/CommonServiceLegacy.php b/src/Services/CommonServiceLegacy.php
@@ -4,9 +4,9 @@
 
 namespace Bavix\Wallet\Services;
 
+use Bavix\Wallet\External\ExtraDtoInterface;
 use Bavix\Wallet\Interfaces\Wallet;
 use Bavix\Wallet\Internal\Assembler\TransferDtoAssemblerInterface;
-use Bavix\Wallet\Internal\Dto\ExtraDtoInterface;
 use Bavix\Wallet\Internal\Dto\TransactionDtoInterface;
 use Bavix\Wallet\Internal\Dto\TransferLazyDtoInterface;
 use Bavix\Wallet\Internal\Exceptions\ExceptionInterface;
diff --git a/src/Services/PrepareService.php b/src/Services/PrepareService.php
@@ -5,11 +5,11 @@
 namespace Bavix\Wallet\Services;
 
 use Bavix\Wallet\Exceptions\AmountInvalid;
+use Bavix\Wallet\External\ExtraDtoInterface;
 use Bavix\Wallet\Interfaces\Wallet;
 use Bavix\Wallet\Internal\Assembler\ExtraDtoAssemblerInterface;
 use Bavix\Wallet\Internal\Assembler\TransactionDtoAssemblerInterface;
 use Bavix\Wallet\Internal\Assembler\TransferLazyDtoAssemblerInterface;
-use Bavix\Wallet\Internal\Dto\ExtraDtoInterface;
 use Bavix\Wallet\Internal\Dto\TransactionDtoInterface;
 use Bavix\Wallet\Internal\Dto\TransferLazyDtoInterface;
 use Bavix\Wallet\Internal\Service\MathServiceInterface;
diff --git a/src/Services/PrepareServiceInterface.php b/src/Services/PrepareServiceInterface.php
@@ -5,8 +5,8 @@
 namespace Bavix\Wallet\Services;
 
 use Bavix\Wallet\Exceptions\AmountInvalid;
+use Bavix\Wallet\External\ExtraDtoInterface;
 use Bavix\Wallet\Interfaces\Wallet;
-use Bavix\Wallet\Internal\Dto\ExtraDtoInterface;
 use Bavix\Wallet\Internal\Dto\TransactionDtoInterface;
 use Bavix\Wallet\Internal\Dto\TransferLazyDtoInterface;
 
diff --git a/src/Traits/CanExchange.php b/src/Traits/CanExchange.php
@@ -6,10 +6,10 @@
 
 use Bavix\Wallet\Exceptions\BalanceIsEmpty;
 use Bavix\Wallet\Exceptions\InsufficientFunds;
+use Bavix\Wallet\External\ExtraDtoInterface;
 use Bavix\Wallet\Interfaces\Wallet;
 use Bavix\Wallet\Internal\Assembler\ExtraDtoAssemblerInterface;
 use Bavix\Wallet\Internal\Assembler\TransferLazyDtoAssemblerInterface;
-use Bavix\Wallet\Internal\Dto\ExtraDtoInterface;
 use Bavix\Wallet\Internal\Exceptions\ExceptionInterface;
 use Bavix\Wallet\Internal\Exceptions\LockProviderNotFoundException;
 use Bavix\Wallet\Internal\Exceptions\RecordNotFoundException;
diff --git a/src/Traits/HasWallet.php b/src/Traits/HasWallet.php
@@ -4,12 +4,11 @@
 
 namespace Bavix\Wallet\Traits;
 
-use function app;
 use Bavix\Wallet\Exceptions\AmountInvalid;
 use Bavix\Wallet\Exceptions\BalanceIsEmpty;
 use Bavix\Wallet\Exceptions\InsufficientFunds;
+use Bavix\Wallet\External\ExtraDtoInterface;
 use Bavix\Wallet\Interfaces\Wallet;
-use Bavix\Wallet\Internal\Dto\ExtraDtoInterface;
 use Bavix\Wallet\Internal\Exceptions\ExceptionInterface;
 use Bavix\Wallet\Internal\Exceptions\LockProviderNotFoundException;
 use Bavix\Wallet\Internal\Exceptions\TransactionFailedException;
@@ -22,11 +21,12 @@
 use Bavix\Wallet\Services\CommonServiceLegacy;
 use Bavix\Wallet\Services\ConsistencyServiceInterface;
 use Bavix\Wallet\Services\RegulatorServiceInterface;
-use function config;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\RecordsNotFoundException;
 use Illuminate\Support\Collection;
+use function app;
+use function config;
 
 /**
  * Trait HasWallet.
diff --git a/src/Traits/HasWalletFloat.php b/src/Traits/HasWalletFloat.php
@@ -7,8 +7,8 @@
 use Bavix\Wallet\Exceptions\AmountInvalid;
 use Bavix\Wallet\Exceptions\BalanceIsEmpty;
 use Bavix\Wallet\Exceptions\InsufficientFunds;
+use Bavix\Wallet\External\ExtraDtoInterface;
 use Bavix\Wallet\Interfaces\Wallet;
-use Bavix\Wallet\Internal\Dto\ExtraDtoInterface;
 use Bavix\Wallet\Internal\Exceptions\ExceptionInterface;
 use Bavix\Wallet\Internal\Exceptions\LockProviderNotFoundException;
 use Bavix\Wallet\Internal\Exceptions\TransactionFailedException;

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`declare(strict_types=1);`
`4`	`4`
`5`		`-namespace Bavix\Wallet\Internal\Dto;`
	`5`	`+namespace Bavix\Wallet\External;`
`6`	`6`
`7`	`7`	`interface ExtraDtoInterface`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@`
`4`	`4`
`5`	`5`	`namespace Bavix\Wallet\Internal\Assembler;`
`6`	`6`
	`7`	`+use Bavix\Wallet\External\ExtraDtoInterface;`
`7`	`8`	`use Bavix\Wallet\Internal\Dto\ExtraDto;`
`8`		`-use Bavix\Wallet\Internal\Dto\ExtraDtoInterface;`
`9`	`9`
`10`	`10`	`final class ExtraDtoAssembler implements ExtraDtoAssemblerInterface`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace Bavix\Wallet\Internal\Assembler;`
`6`	`6`
`7`		`-use Bavix\Wallet\Internal\Dto\ExtraDtoInterface;`
	`7`	`+use Bavix\Wallet\External\ExtraDtoInterface;`
`8`	`8`
`9`	`9`	`interface ExtraDtoAssemblerInterface`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@`
`4`	`4`
`5`	`5`	`namespace Bavix\Wallet\Internal\Assembler;`
`6`	`6`
	`7`	`+use Bavix\Wallet\External\OptionDtoInterface;`
`7`	`8`	`use Bavix\Wallet\Internal\Dto\OptionDto;`
`8`		`-use Bavix\Wallet\Internal\Dto\OptionDtoInterface;`
`9`	`9`
`10`	`10`	`final class OptionDtoAssembler implements OptionDtoAssemblerInterface`
`11`	`11`	`{`