Do not run functional tests on HHVM

Author: dantleech

.travis.yml

@@ -41,8 +41,7 @@ before_script:
 
 script:
     - phpunit --coverage-text
-    - ./vendor/symfony-cmf/testing/bin/server &
-    - ./vendor/bin/behat
+    - ./Tests/Resources/bin/runtests.sh
 
 notifications:
   irc: "irc.freenode.org#symfony-cmf"

Resources/config/enhancer.sonata_admin.xml

@@ -18,5 +18,3 @@
 
     </services>
 </container>
-
-

Serializer/Jms/Handler/ResourceHandler.php

@@ -79,6 +79,7 @@ private function doSerializeResource(Resource $resource, $depth = 0)
         $data['repository_alias'] = $repositoryAlias;
         $data['repository_type'] = $this->registry->getRepositoryType($resource->getRepository());
         $data['payload_alias'] = $this->payloadAliasRegistry->getPayloadAlias($resource);
+        $data['payload_type'] = null;
 
         if ($resource instanceof CmfResource) {
             $data['payload_type'] = $resource->getPayloadType();

Tests/Resources/bin/runtests.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+echo "<?php exit(defined('HHVM_VERSION') ? 1 : 0);" > /tmp/ishhvm.php
+
+php /tmp/ishhvm.php
+
+if [[ $? == 1 ]]; then
+    echo "HHVM detected - skipping tests that require the built-in webserver"
+else
+    echo "PHP detected"
+    ./vendor/symfony-cmf/testing/bin/server &
+    ./vendor/bin/behat
+fi

composer.json

@@ -12,11 +12,10 @@
     "minimum-stability": "dev",
     "require": {
         "symfony-cmf/resource-bundle": "~1.0",
-        "willdurand/hateoas-bundle": "~1.0"
+        "jms/serializer-bundle": "~0.13"
     },
     "require-dev": {
         "symfony-cmf/testing": "~1.1",
-        "symfony/serializer": "~2.7",
         "phpspec/prophecy-phpunit": "~1.0.0",
         "behat/behat": "~3.0.0",
         "behat/web-api-extension" : "~1.0",