Merge branch 'master' of https://github.com/thephpleague/omnipay-common

Author: aimeos

composer.json

@@ -41,6 +41,7 @@
         "gateways": [
             "AuthorizeNet_AIM",
             "AuthorizeNet_SIM",
+            "Buckaroo_CreditCard",
             "Buckaroo_Ideal",
             "Buckaroo_PayPal",
             "CardSave",

src/Omnipay/Common/CreditCard.php

@@ -57,6 +57,7 @@
  * * startMonth
  * * startYear
  * * cvv
+ * * tracks
  * * issueNumber
  * * billingTitle
  * * billingName
@@ -118,7 +119,7 @@ class CreditCard
      */
     protected $supported_cards = array(
         self::BRAND_VISA => '/^4\d{12}(\d{3})?$/',
-        self::BRAND_MASTERCARD => '/^(5[1-5]\d{4}|677189)\d{10}$/',
+        self::BRAND_MASTERCARD => '/^(5[1-5]\d{4}|677189)\d{10}$|^(222[1-9]|2[3-6]\d{2}|27[0-1]\d|2720)\d{12}$/',
         self::BRAND_DISCOVER => '/^(6011|65\d{2}|64[4-9]\d)\d{12}|(62\d{14})$/',
         self::BRAND_AMEX => '/^3[47]\d{13}$/',
         self::BRAND_DINERS_CLUB => '/^3(0[0-5]|[68]\d)\d{11}$/',
@@ -580,6 +581,62 @@ public function setCvv($value)
         return $this->setParameter('cvv', $value);
     }
 
+    /**
+     * Get raw data for all tracks on the credit card magnetic strip.
+     *
+     * @return string
+     */
+    public function getTracks()
+    {
+        return $this->getParameter('tracks');
+    }
+
+    /**
+     * Get raw data for track 1 on the credit card magnetic strip.
+     *
+     * @return string
+     */
+    public function getTrack1()
+    {
+        $track1 = null;
+        if ($tracks = $this->getTracks()) {
+            $pattern = '/\%B\d{1,19}\^.{2,26}\^\d{4}\d*\?/';
+            if (preg_match($pattern, $tracks, $matches) === 1) {
+                $track1 = $matches[0];
+            }
+        }
+        return $track1;
+    }
+
+    /**
+     * Get raw data for track 2 on the credit card magnetic strip.
+     *
+     * @return string
+     */
+    public function getTrack2()
+    {
+        $track2 = null;
+        if ($tracks = $this->getTracks()) {
+            $pattern = '/;\d{1,19}=\d{4}\d*\?/';
+            if (preg_match($pattern, $tracks, $matches) === 1) {
+                $track2 = $matches[0];
+            }
+        }
+        return $track2;
+    }
+
+    /**
+     * Sets raw data from all tracks on the credit card magnetic strip. Used by gateways that support card-present
+     * transactions.
+     *
+     * @param $value
+     * @return CreditCard
+     */
+    public function setTracks($value)
+    {
+        return $this->setParameter('tracks', $value);
+    }
+
     /**
      * Get the card issue number.
      *

tests/Omnipay/Common/CreditCardTest.php

@@ -6,6 +6,9 @@
 
 class CreditCardTest extends TestCase
 {
+    /** @var CreditCard */
+    private $card;
+
     public function setUp()
     {
         $this->card = new CreditCard;
@@ -124,6 +127,13 @@ public function testCustomBrandWorks()
         $this->assertEquals('omniexpress', $this->card->getBrand());
     }
 
+    public function testCustomBrandAddedTwiceReturnsFalse()
+    {
+        $this->assertTrue($this->card->addSupportedBrand('omniexpress', '/^9\d{12}(\d{3})?$/'));
+        $this->assertArrayHasKey('omniexpress', $this->card->getSupportedBrands());
+        $this->assertFalse($this->card->addSupportedBrand('omniexpress', '/^9\d{12}(\d{3})?$/'));
+    }
+
     public function testTitle()
     {
         $this->card->setTitle('Mr.');
@@ -230,6 +240,8 @@ public function testGetBrandMasterCard()
     {
         $card = new CreditCard(array('number' => '5555555555554444'));
         $this->assertSame(CreditCard::BRAND_MASTERCARD, $card->getBrand());
+        $card = new CreditCard(array('number' => '2221000010000015'));
+        $this->assertSame(CreditCard::BRAND_MASTERCARD, $card->getBrand());
     }
 
     public function testGetBrandAmex()
@@ -324,6 +336,26 @@ public function testCvv()
         $this->assertEquals('456', $this->card->getCvv());
     }
 
+    public function testTracks()
+    {
+        $this->card->setTracks('%B4242424242424242^SMITH/JOHN ^1520126100000000000000444000000?;4242424242424242=15201269999944401?');
+        $this->assertSame('%B4242424242424242^SMITH/JOHN ^1520126100000000000000444000000?;4242424242424242=15201269999944401?', $this->card->getTracks());
+    }
+
+    public function testShouldReturnTrack1()
+    {
+        $this->card->setTracks('%B4242424242424242^SMITH/JOHN ^1520126100000000000000444000000?;4242424242424242=15201269999944401?');
+        $actual = $this->card->getTrack1();
+        $this->assertEquals('%B4242424242424242^SMITH/JOHN ^1520126100000000000000444000000?', $actual);
+    }
+
+    public function testShouldReturnTrack2()
+    {
+        $this->card->setTracks('%B4242424242424242^SMITH/JOHN ^1520126100000000000000444000000?;4242424242424242=15201269999944401?');
+        $actual = $this->card->getTrack2();
+        $this->assertEquals(';4242424242424242=15201269999944401?', $actual);
+    }
+
     public function testIssueNumber()
     {
         $this->card->setIssueNumber('12');

tests/Omnipay/Common/Message/AbstractResponseTest.php

@@ -90,6 +90,12 @@ public function testGetRedirectResponseInvalidMethod()
 
         $this->response->getRedirectResponse();
     }
+
+    public function testGetTransactionIdNull()
+    {
+        $this->response = m::mock('\Omnipay\Common\Message\AbstractResponseTest_MockRedirectResponse')->makePartial();
+        $this->assertNull($this->response->getTransactionId());
+    }
 }
 
 class AbstractResponseTest_MockRedirectResponse extends AbstractResponse implements RedirectResponseInterface