compatibility with version 2.0 models

Author: xabbuh

CHANGELOG.md

@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+0.4.0
+-----
+
+* allow `2.x` releases of the `php-xapi/model` package too
+
 0.3.0
 -----
 

composer.json

@@ -12,13 +12,14 @@
     ],
     "require": {
         "doctrine/common": "~2.4",
-        "php-xapi/model": "^1.0",
-        "php-xapi/repository-api": "^0.3",
+        "php-xapi/model": "^1.0 || ^2.0",
+        "php-xapi/repository-api": "^0.3 || ^0.4",
         "ramsey/uuid": "^2.9"
     },
     "require-dev": {
         "php-xapi/test-fixtures": "^1.0"
     },
+    "minimum-stability": "dev",
     "conflict": {
         "xabbuh/xapi-doctrine-storage": "*"
     },
@@ -34,7 +35,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "0.3.x-dev"
+            "dev-master": "0.4.x-dev"
         }
     }
 }

tests/Unit/Repository/StatementRepositoryTest.php

@@ -11,11 +11,12 @@
 
 namespace XApi\Repository\Doctrine\Tests\Unit\Repository;
 
-use Rhumsaa\Uuid\Uuid;
+use Rhumsaa\Uuid\Uuid as RhumsaUuid;
 use Xabbuh\XApi\DataFixtures\StatementFixtures;
 use Xabbuh\XApi\DataFixtures\VerbFixtures;
 use Xabbuh\XApi\Model\StatementId;
 use Xabbuh\XApi\Model\StatementsFilter;
+use Xabbuh\XApi\Model\Uuid as ModelUuid;
 use XApi\Repository\Doctrine\Mapping\Statement as MappedStatement;
 use XApi\Repository\Doctrine\Repository\StatementRepository;
 
@@ -42,7 +43,12 @@ protected function setUp()
 
     public function testFindStatementById()
     {
-        $statementId = StatementId::fromUuid(Uuid::uuid4());
+        if (class_exists('Xabbuh\XApi\Model\Uuid')) {
+            $statementId = StatementId::fromUuid(ModelUuid::uuid4());
+        } else {
+            $statementId = StatementId::fromUuid(RhumsaUuid::uuid4());
+        }
+
         $this
             ->mappedStatementRepository
             ->expects($this->once())