compatibility with v0.2 model classes

Author: xabbuh

CHANGELOG.md

@@ -4,6 +4,8 @@ CHANGELOG
 0.2.0
 -----
 
+* made the package compatible with version 0.2 of the `php-xapi/model` package
+
 * replaced the JMS Serializer with the Symfony Serializer component
 
 0.1.1

composer.json

@@ -13,11 +13,11 @@
     ],
     "require": {
         "php": ">=5.3.0",
-        "php-xapi/model": "^0.1.0",
+        "php-xapi/model": "^0.2.0",
         "symfony/serializer": "~2.8|~3.0"
     },
     "require-dev": {
-        "php-xapi/test-fixtures": "^0.1.0"
+        "php-xapi/test-fixtures": "^0.2.0"
     },
     "conflict": {
         "xabbuh/xapi-serializer": "*"
@@ -34,7 +34,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "0.1.x-dev"
+            "dev-master": "0.2.x-dev"
         }
     }
 }

src/Normalizer/ActorNormalizer.php

@@ -11,10 +11,10 @@
 
 namespace Xabbuh\XApi\Serializer\Normalizer;
 
-use Xabbuh\XApi\Model\Account;
 use Xabbuh\XApi\Model\Actor;
 use Xabbuh\XApi\Model\Agent;
 use Xabbuh\XApi\Model\Group;
+use Xabbuh\XApi\Model\InverseFunctionalIdentifier;
 
 /**
  * Normalizes and denormalizes xAPI statement actors.
@@ -34,21 +34,7 @@ public function normalize($object, $format = null, array $context = array())
 
         $data = array();
 
-        if (null !== $mbox = $object->getMbox()) {
-            $data['mbox'] = $mbox;
-        }
-
-        if (null !== $mboxSha1Sum = $object->getMboxSha1Sum()) {
-            $data['mbox_sha1sum'] = $mboxSha1Sum;
-        }
-
-        if (null !== $openId = $object->getOpenId()) {
-            $data['openid'] = $openId;
-        }
-
-        if (null !== $account = $object->getAccount()) {
-            $data['account'] = $this->normalizeAttribute($account);
-        }
+        $this->normalizeInverseFunctionalIdentifier($object->getInverseFunctionalIdentifier(), $data);
 
         if (null !== $name = $object->getName()) {
             $data['name'] = $name;
@@ -82,17 +68,14 @@ public function supportsNormalization($data, $format = null)
      */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
-        $mbox = isset($data['mbox']) ? $data['mbox'] : null;
-        $mboxSha1Sum = isset($data['mboxSha1Sum']) ? $data['mboxSha1Sum'] : null;
-        $openId = isset($data['openid']) ? $data['openid'] : null;
+        $iri = $this->denormalizeInverseFunctionalIdentifier($data, $format, $context);
         $name = isset($data['name']) ? $data['name'] : null;
-        $account = $this->denormalizeAccount($data, $format, $context);
 
         if (isset($data['objectType']) && 'Group' === $data['objectType']) {
-            return $this->denormalizeGroup($mbox, $mboxSha1Sum, $openId, $account, $name, $data, $format, $context);
+            return $this->denormalizeGroup($iri, $name, $data, $format, $context);
         }
 
-        return new Agent($mbox, $mboxSha1Sum, $openId, $account, $name);
+        return new Agent($iri, $name);
     }
 
     /**
@@ -103,16 +86,58 @@ public function supportsDenormalization($data, $type, $format = null)
         return 'Xabbuh\XApi\Model\Actor' === $type;
     }
 
+    private function normalizeInverseFunctionalIdentifier(InverseFunctionalIdentifier $iri = null, &$data)
+    {
+        if (null === $iri) {
+            return;
+        }
+
+        if (null !== $mbox = $iri->getMbox()) {
+            $data['mbox'] = $mbox;
+        }
+
+        if (null !== $mboxSha1Sum = $iri->getMboxSha1Sum()) {
+            $data['mbox_sha1sum'] = $mboxSha1Sum;
+        }
+
+        if (null !== $openId = $iri->getOpenId()) {
+            $data['openid'] = $openId;
+        }
+
+        if (null !== $account = $iri->getAccount()) {
+            $data['account'] = $this->normalizeAttribute($account);
+        }
+    }
+
+    private function denormalizeInverseFunctionalIdentifier($data, $format = null, array $context = array())
+    {
+        if (isset($data['mbox'])) {
+            return InverseFunctionalIdentifier::withMbox($data['mbox']);
+        }
+
+        if (isset($data['mboxSha1Sum'])) {
+            return InverseFunctionalIdentifier::withMboxSha1Sum($data['mboxSha1Sum']);
+        }
+
+        if (isset($data['openid'])) {
+            return InverseFunctionalIdentifier::withOpenId($data['openid']);
+        }
+
+        if (isset($data['account'])) {
+            return InverseFunctionalIdentifier::withAccount($this->denormalizeAccount($data, $format, $context));
+        }
+    }
+
     private function denormalizeAccount($data, $format = null, array $context = array())
     {
         if (!isset($data['account'])) {
             return null;
         }
 
-        return $this->denormalizeData($data['account'], 'Xabbuh\XApi\Model\Account', $format,$context);
+        return $this->denormalizeData($data['account'], 'Xabbuh\XApi\Model\Account', $format, $context);
     }
 
-    private function denormalizeGroup($mbox, $mboxSha1Sum, $openId, Account $account = null, $name, $data, $format = null, array $context = array())
+    private function denormalizeGroup(InverseFunctionalIdentifier $iri = null, $name, $data, $format = null, array $context = array())
     {
         $members = array();
 
@@ -122,6 +147,6 @@ private function denormalizeGroup($mbox, $mboxSha1Sum, $openId, Account $account
             }
         }
 
-        return new Group($mbox, $mboxSha1Sum, $openId, $account, $name, $members);
+        return new Group($iri, $name, $members);
     }
 }

tests/ActorSerializerTest.php

@@ -37,7 +37,7 @@ public function testDeserializeAgent()
 
         $this->assertInstanceOf('\Xabbuh\XApi\Model\Agent', $actor);
         $this->assertEquals('Christian', $actor->getName());
-        $this->assertEquals('mailto:christian@example.com', $actor->getMbox());
+        $this->assertEquals('mailto:christian@example.com', $actor->getInverseFunctionalIdentifier()->getMbox());
     }
 
     public function testDeserializeAgentWithoutObjectType()
@@ -53,17 +53,18 @@ public function testDeserializeGroup()
         $group = $this->actorSerializer->deserializeActor(ActorJsonFixtures::getGroup());
 
         $this->assertEquals('Example Group', $group->getName());
-        $this->assertEquals('http://example.com/homePage', $group->getAccount()->getHomePage());
-        $this->assertEquals('GroupAccount', $group->getAccount()->getName());
+        $this->assertEquals('http://example.com/homePage', $group->getInverseFunctionalIdentifier()->getAccount()->getHomePage());
+        $this->assertEquals('GroupAccount', $group->getInverseFunctionalIdentifier()->getAccount()->getName());
 
         $members = $group->getMembers();
         $this->assertEquals(2, count($members));
 
         $this->assertEquals('Andrew Downes', $members[0]->getName());
-        $this->assertEquals('mailto:andrew@example.com', $members[0]->getMbox());
+        $this->assertEquals('http://example.com/account', $members[0]->getInverseFunctionalIdentifier()->getAccount()->getHomePage());
+        $this->assertEquals('Member of a group', $members[0]->getInverseFunctionalIdentifier()->getAccount()->getName());
 
         $this->assertEquals('Aaron Silvers', $members[1]->getName());
-        $this->assertEquals('aaron.openid.example.org', $members[1]->getOpenId());
+        $this->assertEquals('aaron.openid.example.org', $members[1]->getInverseFunctionalIdentifier()->getOpenId());
     }
 
     public function testSerializeAgent()

tests/Fixtures/data/group.json

@@ -8,7 +8,6 @@
     "member": [
         {
             "name": "Andrew Downes",
-            "mbox": "mailto:andrew@example.com",
             "account": {
                 "name": "Member of a group",
                 "homePage": "http://example.com/account"