make the client compatible with version 0.2 models

xabbuh · xabbuh · commit 8eaefe8400cb · 2016-03-26T13:07:19.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+0.2.0
+-----
+
+* made the client compatible with version 0.2 of the `php-xapi/model` package
+
 0.1.0
 -----
 
diff --git a/Tests/Api/AgentProfileApiClientTest.php b/Tests/Api/AgentProfileApiClientTest.php
@@ -15,6 +15,7 @@
 use Xabbuh\XApi\DataFixtures\DocumentFixtures;
 use Xabbuh\XApi\Model\Agent;
 use Xabbuh\XApi\Model\AgentProfile;
+use Xabbuh\XApi\Model\InverseFunctionalIdentifier;
 use Xabbuh\XApi\Serializer\ActorSerializer;
 use Xabbuh\XApi\Serializer\DocumentDataSerializer;
 
@@ -125,7 +126,7 @@ public function testGetDocument()
 
     private function createAgentProfile()
     {
-        $agent = new Agent();
+        $agent = new Agent(InverseFunctionalIdentifier::withMbox('mailto:christian@example.com'));
         $profile = new AgentProfile('profile-id', $agent);
 
         return $profile;
diff --git a/Tests/Api/ApiClientTest.php b/Tests/Api/ApiClientTest.php
@@ -11,7 +11,7 @@
 
 namespace Xabbuh\XApi\Client\Tests\Api;
 
-use JMS\Serializer\SerializerInterface;
+use Symfony\Component\Serializer\SerializerInterface;
 use Xabbuh\XApi\Client\Request\HandlerInterface;
 use Xabbuh\XApi\Common\Exception\NotFoundException;
 use Xabbuh\XApi\Serializer\ActorSerializer;
@@ -65,7 +65,7 @@ protected function createSerializerRegistry()
 
     protected function createSerializerMock()
     {
-        return $this->getMock('\JMS\Serializer\SerializerInterface');
+        return $this->getMock('\Symfony\Component\Serializer\SerializerInterface');
     }
 
     protected function validateDeserializer($data, $type, $returnValue)
diff --git a/Tests/Api/StateApiClientTest.php b/Tests/Api/StateApiClientTest.php
@@ -15,6 +15,7 @@
 use Xabbuh\XApi\DataFixtures\DocumentFixtures;
 use Xabbuh\XApi\Model\Activity;
 use Xabbuh\XApi\Model\Agent;
+use Xabbuh\XApi\Model\InverseFunctionalIdentifier;
 use Xabbuh\XApi\Model\State;
 use Xabbuh\XApi\Serializer\ActorSerializer;
 use Xabbuh\XApi\Serializer\DocumentDataSerializer;
@@ -126,7 +127,7 @@ public function testGetDocument()
 
     private function createState()
     {
-        $agent = new Agent('mailto:alice@example.com');
+        $agent = new Agent(InverseFunctionalIdentifier::withMbox('mailto:alice@example.com'));
         $activity = new Activity('activity-id');
         $state = new State($activity, $agent, 'state-id');
 
diff --git a/Tests/Api/StatementsApiClientTest.php b/Tests/Api/StatementsApiClientTest.php
@@ -14,6 +14,7 @@
 use Xabbuh\XApi\Client\Api\StatementsApiClient;
 use Xabbuh\XApi\DataFixtures\StatementFixtures;
 use Xabbuh\XApi\Model\Agent;
+use Xabbuh\XApi\Model\InverseFunctionalIdentifier;
 use Xabbuh\XApi\Model\Statement;
 use Xabbuh\XApi\Model\StatementReference;
 use Xabbuh\XApi\Model\StatementResult;
@@ -159,7 +160,7 @@ public function testVoidStatement()
     {
         $voidedStatementId = '12345678-1234-5678-1234-567812345679';
         $voidingStatementId = '12345678-1234-5678-1234-567812345678';
-        $agent = new Agent('mailto:john.doe@example.com');
+        $agent = new Agent(InverseFunctionalIdentifier::withMbox('mailto:john.doe@example.com'));
         $statementReference = new StatementReference($voidedStatementId);
         $voidingStatement = new Statement(null, $agent, Verb::createVoidVerb(), $statementReference);
         $voidedStatement = $this->createStatement($voidedStatementId);
@@ -286,7 +287,7 @@ public function testGetStatementsWithAgentInStatementsFilter()
     {
         // {"mbox":"mailto:alice@example.com","objectType":"Agent"}
         $filter = new StatementsFilter();
-        $agent = new Agent('mailto:alice@example.com');
+        $agent = new Agent(InverseFunctionalIdentifier::withMbox('mailto:alice@example.com'));
         $filter->byActor($agent);
         $statementResult = $this->createStatementResult();
         $agentJson = '{"mbox":"mailto:alice@example.com","objectType":"Agent"}';
diff --git a/composer.json b/composer.json
@@ -15,11 +15,11 @@
         "php": ">=5.3.0",
         "guzzle/guzzle": "~3.7",
         "php-xapi/exception": "^0.1.0",
-        "php-xapi/model": "^0.1.0",
-        "php-xapi/serializer": "^0.1.0"
+        "php-xapi/model": "^0.2.0",
+        "php-xapi/serializer": "^0.2.0"
     },
     "require-dev": {
-        "php-xapi/test-fixtures": "^0.1.0"
+        "php-xapi/test-fixtures": "^0.2.0"
     },
     "conflict": {
         "xabbuh/xapi-client": "*"

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace Xabbuh\XApi\Client\Tests\Api;`
`13`	`13`
`14`		`-use JMS\Serializer\SerializerInterface;`
	`14`	`+use Symfony\Component\Serializer\SerializerInterface;`
`15`	`15`	`use Xabbuh\XApi\Client\Request\HandlerInterface;`
`16`	`16`	`use Xabbuh\XApi\Common\Exception\NotFoundException;`
`17`	`17`	`use Xabbuh\XApi\Serializer\ActorSerializer;`
`@@ -65,7 +65,7 @@ protected function createSerializerRegistry()`
`65`	`65`
`66`	`66`	`protected function createSerializerMock()`
`67`	`67`	`{`
`68`		`- return $this->getMock('\JMS\Serializer\SerializerInterface');`
	`68`	`+ return $this->getMock('\Symfony\Component\Serializer\SerializerInterface');`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`protected function validateDeserializer($data, $type, $returnValue)`