Upgraded Porter to take advantage of importOne().

Provider · Aug 16, 2016 · 107ea82 · 107ea82
1 parent a8b7bf6
commit 107ea82
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 32 deletions.
diff --git a/composer.json b/composer.json
@@ -8,7 +8,7 @@
         }
     ],
     "require": {
-        "scriptfusion/porter": "0.7"
+        "scriptfusion/porter": "^0.7"
     },
     "require-dev": {
         "phpunit/phpunit": "^4",

diff --git a/composer.lock b/composer.lock
diff --git a/test/Functional/CreateChargeTest.php b/test/Functional/CreateChargeTest.php
@@ -11,29 +11,23 @@ final class CreateChargeTest extends PorterTest
 {
     public function testChargeCard()
     {
-        $results = $this->porter->import(
+        self::assertValidCharge($this->porter->importOne(
             new ImportSpecification(new CreateCharge(TestObjectFactory::createCard(), 1337, 'GBP'))
-        );
-
-        self::assertValidCharge($results->current());
+        ));
     }
 
     public function testChargeToken()
     {
-        $results = $this->porter->import(
+        self::assertValidCharge($this->porter->importOne(
             new ImportSpecification(new CreateCharge(TestObjectFactory::createToken(), 1338, 'USD'))
-        );
-
-        self::assertValidCharge($results->current());
+        ));
     }
 
     public function testChargeCustomer()
     {
-        $results = $this->porter->import(
+        self::assertValidCharge($this->porter->importOne(
             new ImportSpecification(new CreateCharge(TestObjectFactory::createCustomer(), 1339, 'JPY'))
-        );
-
-        self::assertValidCharge($results->current());
+        ));
     }
 
     private static function assertValidCharge(array $charge)

diff --git a/test/Functional/CreateCustomerTest.php b/test/Functional/CreateCustomerTest.php
@@ -11,16 +11,16 @@ final class CreateCustomerTest extends PorterTest
 {
     public function testCreateCustomerFromCard()
     {
-        $results = $this->porter->import(new ImportSpecification(new CreateCustomer(TestObjectFactory::createCard())));
-
-        self::assertValidCustomer($results->current());
+        self::assertValidCustomer($this->porter->importOne(
+            new ImportSpecification(new CreateCustomer(TestObjectFactory::createCard()))
+        ));
     }
 
     public function testCreateCustomerFromToken()
     {
-        $results = $this->porter->import(new ImportSpecification(new CreateCustomer(TestObjectFactory::createToken())));
-
-        self::assertValidCustomer($results->current());
+        self::assertValidCustomer($this->porter->importOne(
+            new ImportSpecification(new CreateCustomer(TestObjectFactory::createToken()))
+        ));
     }
 
     private static function assertValidCustomer(array $customer)

diff --git a/test/Functional/CreateTokenTest.php b/test/Functional/CreateTokenTest.php
@@ -11,9 +11,9 @@ final class CreateTokenTest extends PorterTest
 {
     public function testCreateToken()
     {
-        $results = $this->porter->import(new ImportSpecification(new CreateToken(TestObjectFactory::createCard())));
+        $token = $this->porter->importOne(new ImportSpecification(new CreateToken(TestObjectFactory::createCard())));
 
-        self::assertArrayHasKey('id', $result = $results->current());
-        self::assertTrue(Token::isValidIdentifier($result['id']));
+        self::assertArrayHasKey('id', $token);
+        self::assertTrue(Token::isValidIdentifier($token['id']));
     }
 }
diff --git a/test/TestObjectFactory.php b/test/TestObjectFactory.php
@@ -29,15 +29,14 @@ public static function createCard()
     public static function createToken()
     {
         return new Token(
-            self::createPorter()->import(new ImportSpecification(new CreateToken(self::createCard())))->current()['id']
+            self::createPorter()->importOne(new ImportSpecification(new CreateToken(self::createCard())))['id']
         );
     }
 
     public static function createCustomer()
     {
         return new Customer(
-            self::createPorter()->import(new ImportSpecification(new CreateCustomer(self::createCard())))
-                ->current()['id']
+            self::createPorter()->importOne(new ImportSpecification(new CreateCustomer(self::createCard())))['id']
         );
     }
 }