updated tests and models

MangoPay/ApiVirtualAccounts.php

@@ -40,16 +40,17 @@ public function GetAll($walletId, $pagination = null, $sorting = null)
      * @param string $virtualAccountId
      * @return \MangoPay\VirtualAccount
      */
-    public function Deactivate($virtualAccount, $walletId, $virtualAccountId)
+    public function Deactivate($walletId, $virtualAccountId)
     {
-        return $this->SaveObject('virtual_account_deactivate', $virtualAccount, '\MangoPay\VirtualAccount', $walletId, $virtualAccountId);
+        $empty_object = "";
+        return $this->SaveObject('virtual_account_deactivate', $empty_object, '\MangoPay\VirtualAccount', $walletId, $virtualAccountId);
     }
 
     /**
      * @return \MangoPay\VirtualAccountAvailabilities
      */
     public function GetAvailabilities()
     {
-        return $this->GetObject('virtual_account_get_availabilities','\MangoPay\VirtualAccountAvailabilities');
+        return $this->GetObject('virtual_account_get_availabilities', '\MangoPay\VirtualAccountAvailabilities');
     }
-}
+}

MangoPay/InternationalAccount.php

@@ -2,7 +2,7 @@
 
 namespace MangoPay;
 
-class InternationalAccount
+class InternationalAccount extends Libraries\Dto
 {
     /**
      * @var string
@@ -13,4 +13,4 @@ class InternationalAccount
      * @var string
      */
     public $Bic;
-}
+}

MangoPay/InternationalAccountDetails.php

@@ -2,7 +2,7 @@
 
 namespace MangoPay;
 
-class InternationalAccountDetails
+class InternationalAccountDetails extends Libraries\Dto
 {
     /**
      * Information about the address associated with the international IBAN account.
@@ -15,4 +15,4 @@ class InternationalAccountDetails
      * @var InternationalAccount
      */
     public $Account;
-}
+}

MangoPay/LocalAccount.php

@@ -2,15 +2,17 @@
 
 namespace MangoPay;
 
-class LocalAccount
+class LocalAccount extends Libraries\Dto
 {
     /**
      * The account number of the account
+     * @var string
      */
     public $AccountNumber;
 
     /**
      * The sort code of the account.
+     * @var string
      */
     public $SortCode;
-}
+}

MangoPay/LocalAccountDetails.php

@@ -2,7 +2,7 @@
 
 namespace MangoPay;
 
-class LocalAccountDetails
+class LocalAccountDetails extends Libraries\Dto
 {
     /**
      * Information about the address associated with the local IBAN account.
@@ -15,4 +15,4 @@ class LocalAccountDetails
      * @var LocalAccount
      */
     public $Account;
-}
+}

MangoPay/VirtualAccount.php

@@ -73,6 +73,4 @@ class VirtualAccount extends Libraries\EntityBase
      * @var \MangoPay\VirtualAccountCapabilities
      */
     public $Capabilities;
-
-
-}
+}

MangoPay/VirtualAccountAddress.php

@@ -28,5 +28,4 @@ class VirtualAccountAddress extends Libraries\Dto
      * @var string
      */
     public $Country;
-
-}
+}

MangoPay/VirtualAccountAvailabilities.php

@@ -2,7 +2,7 @@
 
 namespace MangoPay;
 
-class VirtualAccountAvailabilities extends Libraries\EntityBase
+class VirtualAccountAvailabilities extends Libraries\Dto
 {
     /**
      * * @var VirtualAccountAvailability[]
@@ -13,18 +13,4 @@ class VirtualAccountAvailabilities extends Libraries\EntityBase
      * * @var VirtualAccountAvailability[]
      */
     public $UserOwned;
-
-    /**
-     * Get array with mapping which property is object and what type of object
-     * @return array
-     */
-    public function GetSubObjects()
-    {
-        $subObjects = parent::GetSubObjects();
-
-        $subObjects['Collection'] = '\MangoPay\VirtualAccountAvailability';
-        $subObjects['UserOwned'] = '\MangoPay\VirtualAccountAvailability';
-
-        return $subObjects;
-    }
-}
+}

MangoPay/VirtualAccountAvailability.php

@@ -21,17 +21,4 @@ class VirtualAccountAvailability extends Libraries\EntityBase
      * @var CurrencyIso[]
      * */
     public $Currencies;
-
-    /**
-     * Get array with mapping which property is object and what type of object
-     * @return array
-     */
-    public function GetSubObjects()
-    {
-        $subObjects = parent::GetSubObjects();
-
-        $subObjects['Currencies'] = '\MangoPay\CurrencyIso';
-
-        return $subObjects;
-    }
-}
+}

MangoPay/VirtualAccountCapabilities.php

@@ -2,17 +2,17 @@
 
 namespace MangoPay;
 
-class VirtualAccountCapabilities
+class VirtualAccountCapabilities extends Libraries\Dto
 {
     /**
      * Whether local bank wires can be made to this account.
-     * @var Boolean
+     * @var bool
      */
     public $LocalPayInAvailable;
 
     /**
      * Whether international bank wires can be made to this account
-     * @var Boolean
+     * @var bool
      */
     public $InternationalPayInAvailable;
 
@@ -21,4 +21,4 @@ class VirtualAccountCapabilities
      * @var CurrencyIso[]
      */
     public $Currencies;
-}
+}

MangoPay/VirtualAccountOwner.php

@@ -6,4 +6,4 @@ class VirtualAccountOwner
 {
     const Collection = "COLLECTION";
     const UserOwned = "USER_OWNED";
-}
+}

MangoPay/VirtualAccountPurpose.php

@@ -6,4 +6,4 @@ class VirtualAccountPurpose
 {
     const Collection = "COLLECTION";
     const UserOwned = "USER_OWNED";
-}
+}

tests/Cases/Base.php

@@ -14,6 +14,7 @@
 use MangoPay\ShippingPreference;
 use MangoPay\Tests\Mocks\MockStorageStrategy;
 use MangoPay\Ubo;
+use MangoPay\VirtualAccount;
 use PHPUnit\Framework\TestCase;
 
 set_time_limit(0);
@@ -52,6 +53,7 @@ abstract class Base extends TestCase
      * @var \MangoPay\Wallet
      */
     public static $JohnsWallet;
+    public static $johnsVirtualAccount;
     /**
      * Test Kyc Document belonging to John
      * @var \MangoPay\KycDocument
@@ -259,6 +261,21 @@ protected function getJohnsWallet()
         return self::$JohnsWallet;
     }
 
+    protected function getNewVirtualAccount()
+    {
+        if (self::$johnsVirtualAccount === null) {
+            $wallet = $this->getJohnsWallet();
+            $virtualAccount = new VirtualAccount();
+            $virtualAccount->Country = "FR";
+            $virtualAccount->VirtualAccountPurpose = "Collection";
+            $virtualAccount->Tag = "create virtual account tag";
+
+            self::$johnsVirtualAccount = $this->_api->VirtualAccounts->Create($virtualAccount, $wallet->Id);
+        }
+
+        return self::$johnsVirtualAccount;
+    }
+
     /**
      * Creates Pay-In Card Web object
      * @return \MangoPay\PayIn

tests/Cases/VirtualAccountsTest.php

@@ -17,36 +17,33 @@ class VirtualAccountsTest extends Base
     public static $johnsVirtualAccount;
     public function test_VirtualAccount_Create()
     {
-        $wallet = $this->getJohnsWallet();
-        $virtualAccount = new VirtualAccount();
-        $virtualAccount->Country = "FR";
-        $virtualAccount->VirtualAccountPurpose = "Collection";
-        $virtualAccount->Tag = "create virtual account tag";
-
-        self::$johnsVirtualAccount = $this->_api->VirtualAccounts->Create($virtualAccount, $wallet->Id);
+        $virtualAccount = $this->getNewVirtualAccount();
+        $wallet = $this -> getJohnsWallet();
 
-        $this->assertNotNull(self::$johnsVirtualAccount);
-        $this->assertEquals(self::$johnsVirtualAccount->WalletId, $wallet->Id);
+        $this->assertNotNull($virtualAccount);
+        $this->assertEquals($virtualAccount->WalletId, $wallet->Id);
     }
 
     public function test_VirtualAccount_Get()
     {
-        $wallet = $this->getJohnsWallet();
+        $virtualAccount = $this->getNewVirtualAccount();
+        $wallet = $this -> getJohnsWallet();
+        $fetchedVirtualAccount = $this->_api->VirtualAccounts->Get($wallet->Id, $virtualAccount->Id);
 
-        $virtualAccounts = $this->_api->VirtualAccounts->GetAll($wallet->Id);
-
-        $this->assertNotNull($virtualAccounts);
-        $this->assertTrue(is_array($virtualAccounts), 'Expected an array');
+        $this->assertNotNull($fetchedVirtualAccount);
+        $this->assertEquals($fetchedVirtualAccount->Id, $virtualAccount->Id);
     }
 
     public function test_VirtualAccount_GetAll()
     {
+        $this->getNewVirtualAccount();
         $wallet = $this->getJohnsWallet();
 
         $virtualAccounts = $this->_api->VirtualAccounts->GetAll($wallet->Id);
 
         $this->assertNotNull($virtualAccounts);
         $this->assertTrue(is_array($virtualAccounts), 'Expected an array');
+        $this->assertEquals(1, sizeof($virtualAccounts));
     }
 
     public function test_VirtualAccount_Get_Availabilities()
@@ -60,10 +57,11 @@ public function test_VirtualAccount_Get_Availabilities()
 
     public function test_VirtualAccount_Deactivate()
     {
+        $virtualAccount = $this->getNewVirtualAccount();
         $wallet = $this->getJohnsWallet();
-        self::$johnsVirtualAccount->Active = false;
-        $deactivatedVirtualAccount = $this->_api->VirtualAccounts->Deactivate(self::$johnsVirtualAccount, $wallet->Id, self::$johnsVirtualAccount->Id);
+        $deactivatedVirtualAccount = $this->_api->VirtualAccounts->Deactivate($wallet->Id, $virtualAccount->Id);
 
         $this->assertNotTrue($deactivatedVirtualAccount->Active);
+        $this->assertEquals('CLOSED', $deactivatedVirtualAccount->Status);
     }
-}
+}