Merge pull request #144 from bavix/l7

add support laravel 7.x

Author: rez1dent3

.scrutinizer.yml

@@ -1,4 +1,8 @@
 build:
+  dependencies:
+    override:
+      - composer install
+
   environment:
     php:
       version: 7.2
@@ -13,12 +17,12 @@ build:
       tests:
         override:
         - php-scrutinizer-run
-        - command: 'vendor/bin/phpunit --dump-xdebug-filter xdebug-filter.php'
+        - command: vendor/bin/phpunit --dump-xdebug-filter xdebug-filter.php
         -
-          command: 'vendor/bin/phpunit --prepend xdebug-filter.php --coverage-clover=some-file'
+          command: vendor/bin/phpunit --prepend xdebug-filter.php --coverage-clover=clover.xml
           coverage:
-            file: 'some-file'
-            format: 'clover'
+            file: clover.xml
+            format: php-clover
 
 filter:
   excluded_paths: [docs/*, resources/*, tests/*, database/*, config/*]

.travis.yml

@@ -2,15 +2,14 @@ language: php
 php:
   - '7.2'
   - '7.3'
-  - '7.4snapshot'
+  - '7.4'
   - 'nightly'
 
 services:
   - memcached
 
 matrix:
   allow_failures:
-    - php: '7.4snapshot'
     - php: 'nightly'
 
 before_script:
@@ -19,13 +18,13 @@ before_script:
   - bash <(curl -s https://raw.githubusercontent.com/php-cache/cache/master/build/php/7.2/Memcached.sh)
   - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
   - chmod +x ./cc-test-reporter
-  - if [ $(phpenv version-name) = "7.3" ]; then ./cc-test-reporter before-build; fi
+  - if [ $(phpenv version-name) = "7.4" ]; then ./cc-test-reporter before-build; fi
   - composer install
 
 script:
   - ./vendor/bin/phpunit --coverage-xml=build/coverage-xml --log-junit=build/junit.xml
   - ./vendor/bin/infection --coverage=build --min-msi=60 -j$(nproc)
 
 after_success:
-  - if [ $(phpenv version-name) = "7.3" ]; then ./cc-test-reporter after-build --coverage-input-type clover --exit-code $TRAVIS_TEST_RESULT; fi
+  - if [ $(phpenv version-name) = "7.4" ]; then ./cc-test-reporter after-build --coverage-input-type clover --exit-code $TRAVIS_TEST_RESULT; fi
   - bash <(curl -s https://codecov.io/bash)

README.md

@@ -24,7 +24,7 @@ laravel-wallet - Easy work with virtual wallet.
 * **Package**: laravel-wallet
 * **Version**: [![Latest Stable Version](https://poser.pugx.org/bavix/laravel-wallet/v/stable)](https://packagist.org/packages/bavix/laravel-wallet)
 * **PHP Version**: 7.2+ 
-* **Laravel Version**: `5.5`, `5.6`, `5.7`, `5.8`, `6.x`
+* **Laravel Version**: `5.5`, `5.6`, `5.7`, `5.8`, `6.x`, `7.x`
 * **[Composer](https://getcomposer.org/):** `composer require bavix/laravel-wallet`
 
 ### Upgrade Guide

changelog.md

@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [4.2.0] - 2020-03-08
+
+### Added
+- Add laravel 7 support
+
 ## [4.1.2] - 2020-01-20
 ### Added
 - add `$amountFloat` to Transaction model
@@ -448,7 +453,8 @@ The operation is now executed in the transaction and updates the new `refund` fi
 - Exceptions: AmountInvalid, BalanceIsEmpty.
 - Models: Transfer, Transaction.
 
-[Unreleased]: https://github.com/bavix/laravel-wallet/compare/4.1.2...HEAD
+[Unreleased]: https://github.com/bavix/laravel-wallet/compare/4.2.0...HEAD
+[4.2.0]: https://github.com/bavix/laravel-wallet/compare/4.1.2...4.2.0
 [4.1.2]: https://github.com/bavix/laravel-wallet/compare/4.1.1...4.1.2
 [4.1.1]: https://github.com/bavix/laravel-wallet/compare/4.1.0...4.1.1
 [4.1.0]: https://github.com/bavix/laravel-wallet/compare/4.0.1...4.1.0

composer.json

@@ -3,13 +3,13 @@
   "description": "Easy work with virtual wallet.",
   "keywords": [
     "laravel",
-    "laravel5",
     "laravel6",
+    "laravel7",
     "credits",
     "bavix",
     "currency",
-    "laravel5-package",
     "laravel6-package",
+    "laravel7-package",
     "laravel-wallet",
     "virtual",
     "wallet",
@@ -27,17 +27,17 @@
   "require": {
     "php": "^7.2|^8.0",
     "ext-pdo": "*",
-    "illuminate/database": "^5.5|^6.0",
-    "nesbot/carbon": "^1.20|^2.0",
+    "illuminate/database": "^6.0|^7.0",
+    "nesbot/carbon": "^2.0",
     "doctrine/dbal": "^2.8",
     "ramsey/uuid": "^3.0"
   },
   "require-dev": {
     "infection/infection": "^0.15",
-    "orchestra/testbench": "^4.5",
+    "orchestra/testbench": "^4.0|^5.0",
     "phpstan/phpstan": "^0.12",
-    "phpunit/phpunit": "^8.5",
-    "laravel/cashier": "^7.0|^8.0|^9.0|^10.0"
+    "phpunit/phpunit": "^8.0|^9.0",
+    "laravel/cashier": "^10.0"
   },
   "suggest": {
     "bavix/laravel-wallet-swap": "Addition to the laravel-wallet library for quick setting of exchange rates",

phpunit.xml

@@ -15,8 +15,8 @@
         </testsuite>
     </testsuites>
     <filter>
-        <whitelist>
-            <directory suffix=".php">src/</directory>
+        <whitelist processUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">./src/</directory>
         </whitelist>
     </filter>
     <logging>

src/Models/Transaction.php

@@ -116,7 +116,7 @@ public function setAmountFloatAttribute(float $amount): void
         $decimalPlaces = app(WalletService::class)
             ->decimalPlaces($this->wallet);
 
-        $this->amount = $amount * $decimalPlaces;
+        $this->amount = (int)round($amount * $decimalPlaces);
     }
 
 }

src/Simple/Store.php

@@ -20,7 +20,10 @@ public function getBalance($object): int
     {
         $wallet = app(WalletService::class)->getWallet($object);
         if (!\array_key_exists($wallet->getKey(), $this->balanceSheets)) {
-            $this->balanceSheets[$wallet->getKey()] = (int)$wallet->getOriginal('balance', 0);
+            $balance = method_exists($wallet, 'getRawOriginal') ?
+                $wallet->getRawOriginal('balance', 0) : $wallet->getOriginal('balance', 0);
+
+            $this->balanceSheets[$wallet->getKey()] = (int)$balance;
         }
 
         return $this->balanceSheets[$wallet->getKey()];

tests/TestCase.php

@@ -109,7 +109,7 @@ protected function getEnvironmentSetUp($app): void
      */
     public function expectExceptionMessageStrict(string $message): void
     {
-        $this->expectExceptionMessageRegExp("~^{$message}$~");
+        $this->expectExceptionMessageMatches("~^{$message}$~");
     }
 
 }

tests/WalletFloatTest.php

@@ -5,6 +5,7 @@
 use Bavix\Wallet\Exceptions\AmountInvalid;
 use Bavix\Wallet\Exceptions\BalanceIsEmpty;
 use Bavix\Wallet\Models\Transaction;
+use Bavix\Wallet\Services\WalletService;
 use Bavix\Wallet\Test\Models\UserFloat as User;
 
 class WalletFloatTest extends TestCase
@@ -227,6 +228,39 @@ public function testMantissa(): void
         $this->assertEquals($user->balanceFloat, 10000.00 + 2556.72);
     }
 
+    /**
+     * @return void
+     */
+    public function testUpdateTransaction(): void
+    {
+        /**
+         * @var User $user
+         */
+        $user = factory(User::class)->create();
+        $this->assertEquals($user->balance, 0);
+
+        $user->deposit(1000000);
+        $this->assertEquals($user->balance, 1000000);
+        $this->assertEquals($user->balanceFloat, 10000.00);
+
+        $transaction = $user->withdrawFloat(2556.72);
+        $this->assertEquals($transaction->amount, -255672);
+        $this->assertEquals($transaction->amountFloat, -2556.72);
+        $this->assertEquals($transaction->type, Transaction::TYPE_WITHDRAW);
+
+        $transaction->type = Transaction::TYPE_DEPOSIT;
+        $transaction->amountFloat = 2556.72;
+        $this->assertTrue($transaction->save());
+        $this->assertTrue($user->wallet->refreshBalance());
+
+        $this->assertEquals($transaction->amount, 255672);
+        $this->assertEquals($transaction->amountFloat, 2556.72);
+        $this->assertEquals($transaction->type, Transaction::TYPE_DEPOSIT);
+
+        $this->assertEquals($user->balance, 1000000 + 255672);
+        $this->assertEquals($user->balanceFloat, 10000.00 + 2556.72);
+    }
+
     /**
      * @return void
      */