fix PHP 7.2 support

Author: xabbuh

.travis.yml

@@ -17,6 +17,7 @@ matrix:
     - php: 7.0
       env: xdebug="yes"
     - php: 7.1
+    - php: 7.2
 
 before_install:
   - if [[ "$xdebug" != "yes" ]]; then phpenv config-rm xdebug.ini; fi

CHANGELOG.md

@@ -10,6 +10,8 @@ CHANGELOG
 
 * allow `2.x` releases of the `php-xapi/model` package too
 
+* allow `3.x` releases of the `php-xapi/model` package too
+
 2.0.0
 -----
 

composer.json

@@ -14,7 +14,7 @@
     "require": {
         "php": "^5.6 || ^7.0",
         "php-xapi/exception": "^0.2.0",
-        "php-xapi/model": "^1.2 || ^2.1",
+        "php-xapi/model": "^1.2 || ^2.1 || ^3.0",
         "php-xapi/serializer": "^2.1.1",
         "symfony/serializer": "~2.8|~3.0"
     },

src/Normalizer/ObjectNormalizer.php

@@ -13,9 +13,9 @@
 
 use Xabbuh\XApi\Model\Activity;
 use Xabbuh\XApi\Model\IRI;
-use Xabbuh\XApi\Model\Object;
-use Xabbuh\XApi\Model\Statement;
+use Xabbuh\XApi\Model\Object as LegacyStatementObject;
 use Xabbuh\XApi\Model\StatementId;
+use Xabbuh\XApi\Model\StatementObject;
 use Xabbuh\XApi\Model\StatementReference;
 use Xabbuh\XApi\Model\SubStatement;
 
@@ -78,7 +78,7 @@ public function normalize($object, $format = null, array $context = array())
      */
     public function supportsNormalization($data, $format = null)
     {
-        return $data instanceof Object;
+        return $data instanceof LegacyStatementObject || $data instanceof StatementObject;
     }
 
     /**
@@ -110,7 +110,7 @@ public function denormalize($data, $class, $format = null, array $context = arra
      */
     public function supportsDenormalization($data, $type, $format = null)
     {
-        return 'Xabbuh\XApi\Model\Activity' === $type || 'Xabbuh\XApi\Model\Object' === $type || 'Xabbuh\XApi\Model\StatementReference' === $type || 'Xabbuh\XApi\Model\SubStatement' === $type;
+        return in_array($type, array(Activity::class, LegacyStatementObject::class, StatementObject::class, StatementReference::class, SubStatement::class), true);
     }
 
     private function denormalizeActivity(array $data, $format = null, array $context = array())
@@ -128,7 +128,13 @@ private function denormalizeSubStatement(array  $data, $format = null, array $co
     {
         $actor = $this->denormalizeData($data['actor'], 'Xabbuh\XApi\Model\Actor', $format, $context);
         $verb = $this->denormalizeData($data['verb'], 'Xabbuh\XApi\Model\Verb', $format, $context);
-        $object = $this->denormalizeData($data['object'], 'Xabbuh\XApi\Model\Object', $format, $context);
+
+        if (class_exists(StatementObject::class)) {
+            $object = $this->denormalizeData($data['object'], StatementObject::class, $format, $context);
+        } else {
+            $object = $this->denormalizeData($data['object'], LegacyStatementObject::class, $format, $context);
+        }
+
         $result = null;
         $statementContext = null;
 

src/Normalizer/StatementNormalizer.php

@@ -12,8 +12,10 @@
 namespace Xabbuh\XApi\Serializer\Symfony\Normalizer;
 
 use Xabbuh\XApi\Common\Exception\UnsupportedStatementVersionException;
+use Xabbuh\XApi\Model\Object as LegacyStatementObject;
 use Xabbuh\XApi\Model\Statement;
 use Xabbuh\XApi\Model\StatementId;
+use Xabbuh\XApi\Model\StatementObject;
 
 /**
  * Normalizes and denormalizes xAPI statements.
@@ -98,7 +100,13 @@ public function denormalize($data, $class, $format = null, array $context = arra
         $id = isset($data['id']) ? StatementId::fromString($data['id']) : null;
         $actor = $this->denormalizeData($data['actor'], 'Xabbuh\XApi\Model\Actor', $format, $context);
         $verb = $this->denormalizeData($data['verb'], 'Xabbuh\XApi\Model\Verb', $format, $context);
-        $object = $this->denormalizeData($data['object'], 'Xabbuh\XApi\Model\Object', $format, $context);
+
+        if (class_exists(StatementObject::class)) {
+            $object = $this->denormalizeData($data['object'], StatementObject::class, $format, $context);
+        } else {
+            $object = $this->denormalizeData($data['object'], LegacyStatementObject::class, $format, $context);
+        }
+
         $result = null;
         $authority = null;
         $created = null;