[7.x] Mainline 7x

.github/workflows/code-style.yaml

@@ -17,7 +17,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 7.4
+          php-version: 8.0
 
       - name: Validate composer.json and composer.lock
         run: composer validate --strict

.github/workflows/phpunits.yaml

@@ -122,10 +122,10 @@ jobs:
 
       - name: Run test suite
         run: |
-          if [[ $DB_CONNECTION == "testing" ]]; then
-            composer paraunit
-          else
+          if [[ $DB_CONNECTION == "mariadb" ]]; then
             composer unit
+          else
+            composer parabench
           fi
         env:
           CACHE_DRIVER: ${{ matrix.caches }}

.github/workflows/psalm.yaml

@@ -0,0 +1,38 @@
+name: psalm
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  psalm:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.0
+
+      - name: Validate composer.json and composer.lock
+        run: composer validate --strict
+
+      - name: Cache Composer packages
+        id: composer-cache
+        uses: actions/cache@v2
+        with:
+          path: vendor
+          key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-php-
+
+      - name: Install dependencies
+        run: composer install --prefer-dist --no-progress
+
+      - name: Run psalm
+        run: composer psalm

.phpstorm.meta.php

@@ -2,34 +2,44 @@
 
 namespace PHPSTORM_META {
 
-    use Bavix\Wallet\Interfaces\Mathable;
-    use Bavix\Wallet\Interfaces\Rateable;
-    use Bavix\Wallet\Interfaces\Storable;
-    use Bavix\Wallet\Models\Transaction;
-    use Bavix\Wallet\Models\Transfer;
-    use Bavix\Wallet\Models\Wallet;
-    use Bavix\Wallet\Objects\Bring;
+    use Bavix\Wallet\Internal\BasketInterface;
+    use Bavix\Wallet\Internal\BookkeeperInterface;
+    use Bavix\Wallet\Internal\CartInterface;
+    use Bavix\Wallet\Internal\ConsistencyInterface;
+    use Bavix\Wallet\Internal\ExchangeInterface;
+    use Bavix\Wallet\Internal\LockInterface;
+    use Bavix\Wallet\Internal\MathInterface;
+    use Bavix\Wallet\Internal\PurchaseInterface;
+    use Bavix\Wallet\Internal\StorageInterface;
+    use Bavix\Wallet\Internal\UuidInterface;
     use Bavix\Wallet\Objects\Cart;
-    use Bavix\Wallet\Objects\EmptyLock;
-    use Bavix\Wallet\Objects\Operation;
     use Bavix\Wallet\Services\CommonService;
-    use Bavix\Wallet\Services\ExchangeService;
+    use Bavix\Wallet\Services\DbService;
+    use Bavix\Wallet\Services\LockService;
+    use Bavix\Wallet\Services\MetaService;
     use Bavix\Wallet\Services\WalletService;
 
     override(\app(0), map([
+        BasketInterface::class => BasketInterface::class,
+        BookkeeperInterface::class => BookkeeperInterface::class,
+        CartInterface::class => CartInterface::class,
+        ConsistencyInterface::class => ConsistencyInterface::class,
+        ExchangeInterface::class => ExchangeInterface::class,
+        LockInterface::class => LockInterface::class,
+        MathInterface::class => MathInterface::class,
+        PurchaseInterface::class => PurchaseInterface::class,
+        StorageInterface::class => StorageInterface::class,
+        UuidInterface::class => UuidInterface::class,
+
+        // deprecated's
         Cart::class => Cart::class,
-        Bring::class => Bring::class,
-        Operation::class => Operation::class,
-        EmptyLock::class => EmptyLock::class,
-        ExchangeService::class => ExchangeService::class,
+
+        // old
         CommonService::class => CommonService::class,
+        DbService::class => DbService::class,
+        LockService::class => LockService::class,
+        MetaService::class => MetaService::class,
         WalletService::class => WalletService::class,
-        Wallet::class => Wallet::class,
-        Transfer::class => Transfer::class,
-        Transaction::class => Transaction::class,
-        Mathable::class => Mathable::class,
-        Rateable::class => Rateable::class,
-        Storable::class => Storable::class,
     ]));
 
 }

composer.json

@@ -27,7 +27,8 @@
     "illuminate/database": "^6.0|^7.0|^8.0",
     "doctrine/dbal": "^2.8|^3.0",
     "ramsey/uuid": "^3.0|^4.0",
-    "brick/math": "~0.8"
+    "brick/math": "~0.8",
+    "ext-json": "*"
   },
   "require-dev": {
     "brianium/paratest": "^6.2",

config/config.php

@@ -1,120 +1,71 @@
 <?php
 
+declare(strict_types=1);
+
 use Bavix\Wallet\Models\Transaction;
 use Bavix\Wallet\Models\Transfer;
 use Bavix\Wallet\Models\Wallet;
-use Bavix\Wallet\Objects\Bring;
-use Bavix\Wallet\Objects\Cart;
-use Bavix\Wallet\Objects\EmptyLock;
-use Bavix\Wallet\Objects\Operation;
+use Bavix\Wallet\Services\AtomicService;
+use Bavix\Wallet\Services\BasketService;
+use Bavix\Wallet\Services\BookkeeperService;
 use Bavix\Wallet\Services\CommonService;
+use Bavix\Wallet\Services\ConsistencyService;
+use Bavix\Wallet\Services\DbService;
 use Bavix\Wallet\Services\ExchangeService;
 use Bavix\Wallet\Services\LockService;
 use Bavix\Wallet\Services\MathService;
+use Bavix\Wallet\Services\MetaService;
+use Bavix\Wallet\Services\PurchaseService;
+use Bavix\Wallet\Services\StorageService;
+use Bavix\Wallet\Services\UuidFactoryService;
 use Bavix\Wallet\Services\WalletService;
-use Bavix\Wallet\Simple\Exchange;
-use Bavix\Wallet\Simple\Rate;
-use Bavix\Wallet\Simple\Store;
 
 return [
-    /**
-     * This parameter is necessary for more accurate calculations.
-     * PS, Arbitrary Precision Calculations.
-     */
-    'math' => [
-        'scale' => 64,
-    ],
-
-    /**
-     * The parameter is used for fast packet overload.
-     * You do not need to search for the desired class by code, the library will do it itself.
-     */
-    'package' => [
-        'exchange' => Exchange::class,
-        'rateable' => Rate::class,
-        'storable' => Store::class,
-        'mathable' => MathService::class,
-    ],
-
-    /**
-     * Lock settings for highload projects.
-     *
-     * If you want to replace the default cache with another,
-     * then write the name of the driver cache in the key `wallet.lock.cache`.
-     * @see https://laravel.com/docs/6.x/cache#driver-prerequisites
-     *
-     * @example
-     *  'cache' => 'redis'
-     */
+    // infra settings
+    'cache' => ['driver' => null],
     'lock' => [
-        'cache' => null,
-        'enabled' => false,
+        'driver' => null,
         'seconds' => 1,
     ],
 
-    /**
-     * Sometimes a slug may not match the currency and you need the ability to add an exception.
-     * The main thing is that there are not many exceptions).
-     *
-     * Syntax:
-     *  'slug' => 'currency'
-     *
-     * @example
-     *  'my-usd' => 'USD'
-     *
-     * @deprecated use table "wallets", column meta.currency
-     */
-    'currencies' => [],
+    // long arithmetic
+    'math' => ['scale' => 64],
 
-    /**
-     * Services are the main core of the library and sometimes they need to be improved.
-     * This configuration will help you to quickly customize the library.
-     */
+    // service overload
     'services' => [
+        'basket' => BasketService::class,
+        'bookkeeper' => BookkeeperService::class,
+        'consistency' => ConsistencyService::class,
         'exchange' => ExchangeService::class,
+        'atomic' => AtomicService::class,
+        'math' => MathService::class,
+        'purchase' => PurchaseService::class,
+        'storage' => StorageService::class,
+        'uuid' => UuidFactoryService::class,
+    ],
+
+    // legacy-service overload
+    'legacy' => [
         'common' => CommonService::class,
         'wallet' => WalletService::class,
+        'db' => DbService::class,
         'lock' => LockService::class,
+        'meta' => MetaService::class,
     ],
 
-    'objects' => [
-        'bring' => Bring::class,
-        'cart' => Cart::class,
-        'emptyLock' => EmptyLock::class,
-        'operation' => Operation::class,
-    ],
-
-    /**
-     * Transaction model configuration.
-     */
     'transaction' => [
         'table' => 'transactions',
         'model' => Transaction::class,
-        'casts' => [
-            'amount' => 'string',
-        ],
     ],
 
-    /**
-     * Transfer model configuration.
-     */
     'transfer' => [
         'table' => 'transfers',
         'model' => Transfer::class,
-        'casts' => [
-            'fee' => 'string',
-        ],
     ],
 
-    /**
-     * Wallet model configuration.
-     */
     'wallet' => [
         'table' => 'wallets',
         'model' => Wallet::class,
-        'casts' => [
-            'balance' => 'string',
-        ],
         'creating' => [],
         'default' => [
             'name' => 'Default Wallet',

database/2018_11_15_124230_create_wallets_table.php

@@ -17,6 +17,7 @@ public function up(): void
             $table->morphs('holder');
             $table->string('name');
             $table->string('slug')->index();
+            $table->uuid('uuid')->unique();
             $table->string('description')->nullable();
             $table->json('meta')->nullable();
             $table->decimal('balance', 64, 0)->default(0);

database/2021_11_02_202021_update_wallets_uuid_table.php

@@ -0,0 +1,50 @@
+<?php
+
+declare(strict_types=1);
+
+use Bavix\Wallet\Internal\UuidInterface;
+use Bavix\Wallet\Models\Wallet;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Schema;
+
+class UpdateWalletsUuidTable extends Migration
+{
+    public function up(): void
+    {
+        if (Schema::hasColumn($this->table(), 'uuid')) {
+            return;
+        }
+
+        // upgrade from 6.x
+        Schema::table($this->table(), function (Blueprint $table) {
+            $table->uuid('uuid')
+                ->after('slug')
+                ->nullable()
+                ->unique()
+            ;
+        });
+
+        Wallet::query()->chunk(10000, static function (Collection $wallets) {
+            $wallets->each(function (Wallet $wallet) {
+                $wallet->uuid = app(UuidInterface::class)->uuid4();
+                $wallet->save();
+            });
+        });
+
+        Schema::table($this->table(), static function (Blueprint $table) {
+            $table->uuid('uuid')->change();
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::dropColumns($this->table(), ['uuid']);
+    }
+
+    protected function table(): string
+    {
+        return (new Wallet())->getTable();
+    }
+}

ecs.php

@@ -20,8 +20,11 @@
     //$services->set(DeclareStrictTypesFixer::class);
 
     $parameters = $containerConfigurator->parameters();
+    $parameters->set(Option::PARALLEL, true);
     $parameters->set(Option::PATHS, [
+        __DIR__ . '/config',
         __DIR__ . '/database',
+        __DIR__ . '/resources/lang',
         __DIR__ . '/src',
         __DIR__ . '/tests',
     ]);