bug #7 Add support for statement version property (Jérôme Parmentier)

This PR was merged into the 2.1.x-dev branch.

Discussion
----------

Add support for statement version property

Commits
-------

82eeaab Add support for statement version property

Author: xabbuh

.travis.yml

@@ -6,11 +6,14 @@ cache:
   directories:
     - $HOME/.composer/cache/files
 
+env:
+  COMPOSER_OPTIONS="--prefer-stable"
+
 matrix:
   fast_finish: true
   include:
     - php: 5.6
-      env: deps="low"
+      env: COMPOSER_OPTIONS="--prefer-lowest --prefer-stable"
     - php: 7.0
       env: xdebug="yes"
     - php: 7.1
@@ -21,7 +24,7 @@ before_install:
   - composer require 'phpunit/phpunit:^4.8.35|^5.4.3|^6.0' --dev --no-update
 
 install:
-  - if [ "$deps" = "low" ]; then composer update --prefer-lowest --prefer-stable; else composer install; fi
+  - composer update $COMPOSER_OPTIONS
 
 script:
   - vendor/bin/phpspec run

CHANGELOG.md

@@ -4,6 +4,8 @@ CHANGELOG
 2.1.0
 -----
 
+* added missing support for statement versions
+
 * dropped support for PHP < 5.6
 
 * allow `2.x` releases of the `php-xapi/model` package too

composer.json

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

src/Normalizer/StatementNormalizer.php

@@ -11,6 +11,7 @@
 
 namespace Xabbuh\XApi\Serializer\Symfony\Normalizer;
 
+use Xabbuh\XApi\Common\Exception\UnsupportedStatementVersionException;
 use Xabbuh\XApi\Model\Statement;
 use Xabbuh\XApi\Model\StatementId;
 
@@ -64,6 +65,10 @@ public function normalize($object, $format = null, array $context = array())
             $data['attachments'] = $this->normalizeAttribute($attachments, $format, $context);
         }
 
+        if (null !== $version = $object->getVersion()) {
+            $data['version'] = $version;
+        }
+
         return $data;
     }
 
@@ -80,6 +85,16 @@ public function supportsNormalization($data, $format = null)
      */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
+        $version = null;
+
+        if (isset($data['version'])) {
+            $version = $data['version'];
+
+            if (!preg_match('/^1\.0(?:\.\d+)?$/', $version)) {
+                throw new UnsupportedStatementVersionException(sprintf('Statements at version "%s" are not supported.', $version));
+            }
+        }
+
         $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);
@@ -115,7 +130,7 @@ public function denormalize($data, $class, $format = null, array $context = arra
             $attachments = $this->denormalizeData($data['attachments'], 'Xabbuh\XApi\Model\Attachment[]', $format, $context);
         }
 
-        return new Statement($id, $actor, $verb, $object, $result, $authority, $created, $stored, $statementContext, $attachments);
+        return new Statement($id, $actor, $verb, $object, $result, $authority, $created, $stored, $statementContext, $attachments, $version);
     }
 
     /**