UBR-118: Identity now uses CultureFeed_Uitpas_Passholder_Card instead…

… of CultureFeed_Uitpas_CardInfo as the type of its card property.
cultuurnet · Jul 30, 2015 · 0fadc9b · 0fadc9b
1 parent dcfea88
commit 0fadc9b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 14 deletions.
diff --git a/CultureFeed/CultureFeed/Uitpas/CardInfo.php b/CultureFeed/CultureFeed/Uitpas/CardInfo.php
@@ -28,16 +28,8 @@ class CultureFeed_Uitpas_CardInfo {
   public static function createFromXml(CultureFeed_SimpleXMLElement $object) {
     $instance = new static();
 
-    $cardSystemXml = $object->xpath('cardSystem', FALSE);
-    if ($cardSystemXml instanceof CultureFeed_SimpleXMLElement) {
-      $instance->cardSystem = CultureFeed_Uitpas_CardSystem::createFromXML($cardSystemXml);
-    }
-
+    $instance->cardSystem = CultureFeed_Uitpas_CardSystem::createFromXML($object->xpath('cardSystem', FALSE));
     $instance->uitpasNumber = $object->xpath_str('uitpasNumber');
-    if (empty($instance->uitpasNumber)) {
-      $instance->uitpasNumber = $object->xpath_str('uitpasNumber/uitpasNumber');
-    }
-
     $instance->status = $object->xpath_str('status');
 
     return $instance;

diff --git a/CultureFeed/CultureFeed/Uitpas/Identity.php b/CultureFeed/CultureFeed/Uitpas/Identity.php
@@ -2,7 +2,7 @@
 
 class CultureFeed_Uitpas_Identity extends CultureFeed_Uitpas_ValueObject {
   /**
-   * @var \CultureFeed_Uitpas_CardInfo
+   * @var \CultureFeed_Uitpas_Passholder_Card
    */
   public $card;
 
@@ -19,7 +19,7 @@ public static function createFromXml(CultureFeed_SimpleXMLElement $object) {
     $identity = new static();
 
     $cardXml = $object->xpath('card', false);
-    $identity->card = CultureFeed_Uitpas_CardInfo::createFromXml($cardXml);
+    $identity->card = CultureFeed_Uitpas_Passholder_Card::createFromXml($cardXml);
 
     $passHolderXml = $object->xpath('passHolder', false);
     if ($passHolderXml instanceof CultureFeed_SimpleXMLElement) {

diff --git a/CultureFeed/test/uitpas/CultureFeed_Uitpas_PasHoudersAPITest.php b/CultureFeed/test/uitpas/CultureFeed_Uitpas_PasHoudersAPITest.php
@@ -84,11 +84,11 @@ public function testIndentify()
 
     $this->assertInstanceOf('CultureFeed_Uitpas_Identity', $identity);
 
-    $this->assertInstanceOf('CultureFeed_Uitpas_CardInfo', $identity->card);
+    $this->assertInstanceOf('CultureFeed_Uitpas_Passholder_Card', $identity->card);
     $this->assertEquals($data['identification'], $identity->card->uitpasNumber);
     $this->assertEquals('ACTIVE', $identity->card->status);
-    $this->assertFalse($identity->card->kansenStatuut());
-    $this->assertNull($identity->card->cardSystem);
+    $this->assertFalse($identity->card->kansenpas);
+    $this->assertEmpty($identity->card->city);
 
     $this->assertInstanceOf('CultureFeed_Uitpas_Passholder', $identity->passHolder);
     $this->assertEquals('Boadu', $identity->passHolder->name);