pass only IRI string values to the HTTP layer

php-xapi · Sep 26, 2016 · 97e31e8 · 97e31e8
1 parent 2eeb7e1
commit 97e31e8
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 16 deletions.
diff --git a/composer.json b/composer.json
@@ -15,7 +15,7 @@
         "php": ">=5.3.0",
         "guzzle/guzzle": "~3.7",
         "php-xapi/exception": "^0.1.0",
-        "php-xapi/model": "^0.5.0",
+        "php-xapi/model": "^0.5.1",
         "php-xapi/serializer": "^0.3.0"
     },
     "require-dev": {

diff --git a/src/Api/ActivityProfileApiClient.php b/src/Api/ActivityProfileApiClient.php
@@ -44,7 +44,7 @@ public function createOrReplaceDocument(ActivityProfileDocument $document)
     public function deleteDocument(ActivityProfile $profile)
     {
         $this->doDeleteDocument('activities/profile', array(
-            'activityId' => $profile->getActivity()->getId(),
+            'activityId' => $profile->getActivity()->getId()->getValue(),
             'profileId' => $profile->getProfileId(),
         ));
     }
@@ -56,7 +56,7 @@ public function getDocument(ActivityProfile $profile)
     {
         /** @var \Xabbuh\XApi\Model\DocumentData $documentData */
         $documentData = $this->doGetDocument('activities/profile', array(
-            'activityId' => $profile->getActivity()->getId(),
+            'activityId' => $profile->getActivity()->getId()->getValue(),
             'profileId' => $profile->getProfileId(),
         ));
 
@@ -76,7 +76,7 @@ private function doStoreActivityProfileDocument($method, ActivityProfileDocument
             $method,
             'activities/profile',
             array(
-                'activityId' => $profile->getActivity()->getId(),
+                'activityId' => $profile->getActivity()->getId()->getValue(),
                 'profileId' => $profile->getProfileId(),
             ),
             $document

diff --git a/src/Api/StateApiClient.php b/src/Api/StateApiClient.php
@@ -68,7 +68,7 @@ public function createOrReplaceDocument(StateDocument $document)
     public function deleteDocument(State $state)
     {
         $this->doDeleteDocument('activities/state', array(
-            'activityId' => $state->getActivity()->getId(),
+            'activityId' => $state->getActivity()->getId()->getValue(),
             'agent' => $this->actorSerializer->serializeActor($state->getActor()),
             'stateId' => $state->getStateId(),
         ));
@@ -81,7 +81,7 @@ public function getDocument(State $state)
     {
         /** @var \Xabbuh\XApi\Model\DocumentData $documentData */
         $documentData = $this->doGetDocument('activities/state', array(
-            'activityId' => $state->getActivity()->getId(),
+            'activityId' => $state->getActivity()->getId()->getValue(),
             'agent' => $this->actorSerializer->serializeActor($state->getActor()),
             'stateId' => $state->getStateId(),
         ));
@@ -102,7 +102,7 @@ private function doStoreStateDocument($method, StateDocument $document)
             $method,
             'activities/state',
             array(
-                'activityId' => $state->getActivity()->getId(),
+                'activityId' => $state->getActivity()->getId()->getValue(),
                 'agent' => $this->actorSerializer->serializeActor($state->getActor()),
                 'stateId' => $state->getStateId(),
             ),

diff --git a/src/Api/StatementsApiClient.php b/src/Api/StatementsApiClient.php
@@ -12,6 +12,7 @@
 namespace Xabbuh\XApi\Client\Api;
 
 use Xabbuh\XApi\Client\Request\HandlerInterface;
+use Xabbuh\XApi\Model\IRL;
 use Xabbuh\XApi\Model\StatementId;
 use Xabbuh\XApi\Serializer\ActorSerializerInterface;
 use Xabbuh\XApi\Serializer\StatementResultSerializerInterface;
@@ -147,7 +148,7 @@ public function getStatements(StatementsFilter $filter = null)
      */
     public function getNextStatements(StatementResult $statementResult)
     {
-        return $this->doGetStatements($statementResult->getMoreUrlPath());
+        return $this->doGetStatements($statementResult->getMoreUrlPath()->getValue());
     }
 
     /**

diff --git a/tests/Api/ActivityProfileApiClientTest.php b/tests/Api/ActivityProfileApiClientTest.php
@@ -15,6 +15,7 @@
 use Xabbuh\XApi\DataFixtures\DocumentFixtures;
 use Xabbuh\XApi\Model\Activity;
 use Xabbuh\XApi\Model\ActivityProfile;
+use Xabbuh\XApi\Model\IRI;
 use Xabbuh\XApi\Serializer\DocumentDataSerializer;
 
 /**
@@ -112,7 +113,7 @@ public function testGetDocument()
 
     private function createActivityProfile()
     {
-        $activity = new Activity('activity-id');
+        $activity = new Activity(IRI::fromString('activity-id'));
         $activityProfile = new ActivityProfile('profile-id', $activity);
 
         return $activityProfile;

diff --git a/tests/Api/AgentProfileApiClientTest.php b/tests/Api/AgentProfileApiClientTest.php
@@ -16,6 +16,7 @@
 use Xabbuh\XApi\Model\Agent;
 use Xabbuh\XApi\Model\AgentProfile;
 use Xabbuh\XApi\Model\InverseFunctionalIdentifier;
+use Xabbuh\XApi\Model\IRI;
 use Xabbuh\XApi\Serializer\ActorSerializer;
 use Xabbuh\XApi\Serializer\DocumentDataSerializer;
 
@@ -126,7 +127,7 @@ public function testGetDocument()
 
     private function createAgentProfile()
     {
-        $agent = new Agent(InverseFunctionalIdentifier::withMbox('mailto:christian@example.com'));
+        $agent = new Agent(InverseFunctionalIdentifier::withMbox(IRI::fromString('mailto:christian@example.com')));
         $profile = new AgentProfile('profile-id', $agent);
 
         return $profile;

diff --git a/tests/Api/StateApiClientTest.php b/tests/Api/StateApiClientTest.php
@@ -16,6 +16,7 @@
 use Xabbuh\XApi\Model\Activity;
 use Xabbuh\XApi\Model\Agent;
 use Xabbuh\XApi\Model\InverseFunctionalIdentifier;
+use Xabbuh\XApi\Model\IRI;
 use Xabbuh\XApi\Model\State;
 use Xabbuh\XApi\Serializer\ActorSerializer;
 use Xabbuh\XApi\Serializer\DocumentDataSerializer;
@@ -127,8 +128,8 @@ public function testGetDocument()
 
     private function createState()
     {
-        $agent = new Agent(InverseFunctionalIdentifier::withMbox('mailto:alice@example.com'));
-        $activity = new Activity('activity-id');
+        $agent = new Agent(InverseFunctionalIdentifier::withMbox(IRI::fromString('mailto:alice@example.com')));
+        $activity = new Activity(IRI::fromString('activity-id'));
         $state = new State($activity, $agent, 'state-id');
 
         return $state;

diff --git a/tests/Api/StatementsApiClientTest.php b/tests/Api/StatementsApiClientTest.php
@@ -15,6 +15,8 @@
 use Xabbuh\XApi\DataFixtures\StatementFixtures;
 use Xabbuh\XApi\Model\Agent;
 use Xabbuh\XApi\Model\InverseFunctionalIdentifier;
+use Xabbuh\XApi\Model\IRI;
+use Xabbuh\XApi\Model\IRL;
 use Xabbuh\XApi\Model\Statement;
 use Xabbuh\XApi\Model\StatementId;
 use Xabbuh\XApi\Model\StatementReference;
@@ -161,7 +163,7 @@ public function testVoidStatement()
     {
         $voidedStatementId = '12345678-1234-5678-1234-567812345679';
         $voidingStatementId = '12345678-1234-5678-1234-567812345678';
-        $agent = new Agent(InverseFunctionalIdentifier::withMbox('mailto:john.doe@example.com'));
+        $agent = new Agent(InverseFunctionalIdentifier::withMbox(IRI::fromString('mailto:john.doe@example.com')));
         $statementReference = new StatementReference(StatementId::fromString($voidedStatementId));
         $voidingStatement = new Statement(null, $agent, Verb::createVoidVerb(), $statementReference);
         $voidedStatement = $this->createStatement($voidedStatementId);
@@ -288,7 +290,7 @@ public function testGetStatementsWithAgentInStatementsFilter()
     {
         // {"mbox":"mailto:alice@example.com","objectType":"Agent"}
         $filter = new StatementsFilter();
-        $agent = new Agent(InverseFunctionalIdentifier::withMbox('mailto:alice@example.com'));
+        $agent = new Agent(InverseFunctionalIdentifier::withMbox(IRI::fromString('mailto:alice@example.com')));
         $filter->byActor($agent);
         $statementResult = $this->createStatementResult();
         $agentJson = '{"mbox":"mailto:alice@example.com","objectType":"Agent"}';
@@ -312,7 +314,7 @@ public function testGetStatementsWithAgentInStatementsFilter()
     public function testGetStatementsWithVerbInStatementsFilter()
     {
         $filter = new StatementsFilter();
-        $verb = new Verb('http://adlnet.gov/expapi/verbs/attended');
+        $verb = new Verb(IRI::fromString('http://adlnet.gov/expapi/verbs/attended'));
         $filter->byVerb($verb);
         $statementResult = $this->createStatementResult();
         $this->validateRetrieveApiCall(
@@ -330,7 +332,7 @@ public function testGetStatementsWithVerbInStatementsFilter()
     public function testGetNextStatements()
     {
         $moreUrl = '/xapi/statements/more/b381d8eca64a61a42c7b9b4ecc2fabb6';
-        $previousStatementResult = new StatementResult(array(), $moreUrl);
+        $previousStatementResult = new StatementResult(array(), IRL::fromString($moreUrl));
         $this->validateRetrieveApiCall(
             'get',
             $moreUrl,