Upgrade

.scrutinizer.yml

@@ -5,7 +5,7 @@ build:
 
   environment:
     php:
-      version: 7.2
+      version: 7.3
       pecl_extensions:
         - memcached
     memcached: true
@@ -17,9 +17,8 @@ build:
       tests:
         override:
         - php-scrutinizer-run
-        - command: vendor/bin/phpunit --dump-xdebug-filter xdebug-filter.php
         -
-          command: vendor/bin/phpunit --prepend xdebug-filter.php --coverage-clover=clover.xml
+          command: vendor/bin/phpunit --coverage-clover=clover.xml
           coverage:
             file: clover.xml
             format: php-clover

.travis.yml

@@ -1,6 +1,5 @@
 language: php
 php:
-  - '7.2'
   - '7.3'
   - '7.4'
   - 'nightly'

composer.json

@@ -25,18 +25,19 @@
     }
   ],
   "require": {
-    "php": "^7.2|^8.0",
+    "php": "^7.3|^8.0",
     "ext-pdo": "*",
     "illuminate/database": "^6.0|^7.0|^8.0",
     "doctrine/dbal": "^2.8|^3.0",
     "ramsey/uuid": "^3.0|^4.0"
   },
   "require-dev": {
-    "infection/infection": "0.15.*|0.16.*|0.17.*",
-    "orchestra/testbench": "^4.0|^5.0",
+    "infection/infection": "0.17.*",
+    "laravel/cashier": "^10.0|^11.0|^12.0",
+    "laravel/legacy-factories": "^1.0",
+    "orchestra/testbench": "^4.0|^5.0|^6.0",
     "phpstan/phpstan": "^0.12",
-    "phpunit/phpunit": "^8.0|^9.0",
-    "laravel/cashier": "^10.0|^11.0|^12.0"
+    "phpunit/phpunit": "^8.0|^9.0"
   },
   "suggest": {
     "ext-bcmath": "Used for accurate calculations of large numbers",

config/config.php

@@ -1,27 +1,27 @@
 <?php
 
+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\ExchangeService;
 use Bavix\Wallet\Services\CommonService;
-use Bavix\Wallet\Services\WalletService;
+use Bavix\Wallet\Services\ExchangeService;
 use Bavix\Wallet\Services\LockService;
-use Bavix\Wallet\Models\Transaction;
-use Bavix\Wallet\Models\Transfer;
-use Bavix\Wallet\Models\Wallet;
-use Bavix\Wallet\Simple\Rate;
-use Bavix\Wallet\Simple\Store;
+use Bavix\Wallet\Services\WalletService;
 use Bavix\Wallet\Simple\BCMath;
 use Bavix\Wallet\Simple\Math;
+use Bavix\Wallet\Simple\Rate;
+use Bavix\Wallet\Simple\Store;
 
 $bcLoaded = extension_loaded('bcmath');
 
 return [
     /**
      * This parameter is necessary for more accurate calculations.
-     * PS, Arbitrary Precision Calculations
+     * PS, Arbitrary Precision Calculations.
      */
     'math' => [
         'scale' => 64,
@@ -40,7 +40,7 @@
     ],
 
     /**
-     * Lock settings for highload projects
+     * 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`.
@@ -57,7 +57,7 @@
 
     /**
      * 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)
+     * The main thing is that there are not many exceptions).
      *
      * Syntax:
      *  'slug' => 'currency'

database/migrations_v1/2018_11_06_222923_create_transactions_table.php

@@ -11,7 +11,6 @@
 
 class CreateTransactionsTable extends Migration
 {
-
     /**
      * @return void
      */
@@ -70,5 +69,4 @@ public function down(): void
     {
         Schema::drop($this->table());
     }
-
 }

database/migrations_v1/2018_11_07_192923_create_transfers_table.php

@@ -8,7 +8,6 @@
 
 class CreateTransfersTable extends Migration
 {
-
     /**
      * @return void
      */
@@ -58,5 +57,4 @@ public function down(): void
     {
         Schema::drop($this->table());
     }
-
 }

database/migrations_v1/2018_11_07_202152_update_transfers_table.php

@@ -9,7 +9,6 @@
 
 class UpdateTransfersTable extends Migration
 {
-
     /**
      * @return void
      */
@@ -40,7 +39,7 @@ protected function table(): string
     public function down(): void
     {
         Schema::table($this->table(), function (Blueprint $table) {
-            if (!(DB::connection() instanceof SQLiteConnection)) {
+            if (! (DB::connection() instanceof SQLiteConnection)) {
                 $table->dropIndex('from_to_refund_ind');
                 $table->dropIndex('from_refund_ind');
                 $table->dropIndex('to_refund_ind');
@@ -49,5 +48,4 @@ public function down(): void
             $table->dropColumn('refund');
         });
     }
-
 }

database/migrations_v2/2018_11_15_124230_create_wallets_table.php

@@ -10,7 +10,6 @@
 
 class CreateWalletsTable extends Migration
 {
-
     /**
      * @return string
      */
@@ -37,7 +36,7 @@ public function up(): void
         });
 
         /**
-         * migrate v1 to v2
+         * migrate v1 to v2.
          */
         $default = config('wallet.wallet.default.name', 'Default Wallet');
         $slug = config('wallet.wallet.default.slug', 'default');
@@ -68,5 +67,4 @@ public function down(): void
     {
         Schema::drop($this->table());
     }
-
 }

database/migrations_v2/2018_11_19_164609_update_transactions_table.php

@@ -4,13 +4,12 @@
 use Bavix\Wallet\Models\Wallet;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\SQLiteConnection;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\SQLiteConnection;
 
 class UpdateTransactionsTable extends Migration
 {
-
     /**
      * @return string
      */
@@ -60,11 +59,10 @@ public function up(): void
     public function down(): void
     {
         Schema::table($this->table(), function (Blueprint $table) {
-            if (!(DB::connection() instanceof SQLiteConnection)) {
+            if (! (DB::connection() instanceof SQLiteConnection)) {
                 $table->dropForeign(['wallet_id']);
             }
             $table->dropColumn('wallet_id');
         });
     }
-
 }

database/migrations_v2/2018_11_20_133759_add_fee_transfers_table.php

@@ -7,7 +7,6 @@
 
 class AddFeeTransfersTable extends Migration
 {
-
     /**
      * @return string
      */
@@ -37,5 +36,4 @@ public function down(): void
             $table->dropColumn('fee');
         });
     }
-
 }

database/migrations_v2/2018_11_22_131953_add_status_transfers_table.php

@@ -8,7 +8,6 @@
 
 class AddStatusTransfersTable extends Migration
 {
-
     /**
      * @return string
      */
@@ -53,11 +52,10 @@ public function down(): void
     {
         DB::table($this->table())
             ->where('status', Transfer::STATUS_REFUND)
-            ->update(['refund' => true,]);
+            ->update(['refund' => true]);
 
         Schema::table($this->table(), function (Blueprint $table) {
             $table->dropColumn(['status', 'status_last']);
         });
     }
-
 }

database/migrations_v2/2018_11_22_133438_drop_refund_transfers_table.php

@@ -9,7 +9,6 @@
 
 class DropRefundTransfersTable extends Migration
 {
-
     /**
      * @return string
      */
@@ -24,7 +23,7 @@ protected function table(): string
     public function up(): void
     {
         Schema::table($this->table(), function (Blueprint $table) {
-            if (!(DB::connection() instanceof SQLiteConnection)) {
+            if (! (DB::connection() instanceof SQLiteConnection)) {
                 $table->dropIndex('from_to_refund_ind');
                 $table->dropIndex('from_refund_ind');
                 $table->dropIndex('to_refund_ind');
@@ -49,5 +48,4 @@ public function down(): void
             $table->index(['to_type', 'to_id', 'refund'], 'to_refund_ind');
         });
     }
-
 }

database/migrations_v2/2019_05_13_111553_update_status_transfers_table.php

@@ -10,7 +10,6 @@
 
 class UpdateStatusTransfersTable extends Migration
 {
-
     /**
      * @return string
      */
@@ -32,21 +31,23 @@ public function up(): void
         ];
 
         if (DB::connection() instanceof MySqlConnection) {
-            $table = DB::getTablePrefix() . $this->table();
+            $table = DB::getTablePrefix().$this->table();
             $enumString = implode('\', \'', $enums);
             $default = Transfer::STATUS_TRANSFER;
             DB::statement("ALTER TABLE $table CHANGE COLUMN status status ENUM('$enumString') NOT NULL DEFAULT '$default'");
             DB::statement("ALTER TABLE $table CHANGE COLUMN status_last status_last ENUM('$enumString') NULL");
+
             return;
         }
 
         if (DB::connection() instanceof PostgresConnection) {
-            $this->alterEnum(DB::getTablePrefix() . $this->table(), 'status', $enums);
-            $this->alterEnum(DB::getTablePrefix() . $this->table(), 'status_last', $enums);
+            $this->alterEnum(DB::getTablePrefix().$this->table(), 'status', $enums);
+            $this->alterEnum(DB::getTablePrefix().$this->table(), 'status_last', $enums);
+
             return;
         }
 
-        Schema::table($this->table(), function (Blueprint $table) use ($enums) {
+        Schema::table($this->table(), function (Blueprint $table) {
             $table->string('status')
                 ->default(Transfer::STATUS_TRANSFER)
                 ->change();
@@ -77,21 +78,23 @@ public function down(): void
         ];
 
         if (DB::connection() instanceof MySqlConnection) {
-            $table = DB::getTablePrefix() . $this->table();
+            $table = DB::getTablePrefix().$this->table();
             $enumString = implode('\', \'', $enums);
             $default = Transfer::STATUS_PAID;
             DB::statement("ALTER TABLE $table CHANGE COLUMN status status ENUM('$enumString') NOT NULL DEFAULT '$default'");
             DB::statement("ALTER TABLE $table CHANGE COLUMN status_last status_last ENUM('$enumString') NULL");
+
             return;
         }
 
         if (DB::connection() instanceof PostgresConnection) {
-            $this->alterEnum(DB::getTablePrefix() . $this->table(), 'status', $enums);
-            $this->alterEnum(DB::getTablePrefix() . $this->table(), 'status_last', $enums);
+            $this->alterEnum(DB::getTablePrefix().$this->table(), 'status', $enums);
+            $this->alterEnum(DB::getTablePrefix().$this->table(), 'status_last', $enums);
+
             return;
         }
 
-        Schema::table($this->table(), function (Blueprint $table) use ($enums) {
+        Schema::table($this->table(), function (Blueprint $table) {
             $table->string('status')
                 ->default(Transfer::STATUS_PAID)
                 ->change();
@@ -103,7 +106,7 @@ public function down(): void
     }
 
     /**
-     * Alter an enum field constraints
+     * Alter an enum field constraints.
      * @param $table
      * @param $field
      * @param array $options
@@ -120,10 +123,9 @@ protected function alterEnum($table, $field, array $options): void
 
         $enumString = implode(', ', $enumList);
 
-        DB::transaction(function () use ($table, $field, $check, $options, $enumString) {
+        DB::transaction(function () use ($table, $field, $check , $enumString) {
             DB::statement(sprintf('ALTER TABLE %s DROP CONSTRAINT %s;', $table, $check));
             DB::statement(sprintf('ALTER TABLE %s ADD CONSTRAINT %s CHECK (%s::TEXT = ANY (ARRAY[%s]::TEXT[]))', $table, $check, $field, $enumString));
         });
     }
-
 }