Merge branch 'master' into replace_data

* master: (77 commits)
  use explicit boolean comparison
  Added tests to ensure SerializeNull policy
  Revert "Default `$serializeNull` to false"
  Start with the 1.3.x branch
  Added tests for 'hasData'
  $context is not used
  Fix Doctrine PHPCR ODM 2.0 compatibility
  Start with the 1.2.x branch
  added hhvm-nightly
  Make tests working on HHVM
  Use camel case for skipWhenEmpty annotation
  Lookup for local namespaces when creating elements
  Use always xpath to find nodes, when the namespace is empty, simplexml fails
  Allow to decide when skip empty arrays when serializing to xml
  Added skip_when_empty xml collection option
  Do not skip empty not inline array root node
  Allow to use custom serializer with primitive type
  Composer is not able to resolve a dependency
  Fix xml-attribute-map for the xml driver
  makes sure that explicit lists are serialized as lists
  ...

.gitignore

@@ -1,3 +1,4 @@
 vendor/
 phpunit.xml
+composer.lock
 

.scrutinizer.yml

@@ -0,0 +1,3 @@
+tools:
+  external_code_coverage:
+    timeout: 600

.travis.yml

@@ -1,22 +1,40 @@
 language: php
 
-matrix:
-  allow_failures:
-    - php: hhvm
+sudo: false
+
+git:
+    depth: 1
 
-php:
-  - 5.3
-  - 5.4
-  - 5.5
-  - hhvm
+cache:
+  directories:
+    - $HOME/.composer/cache
+
+matrix:
+    include:
+        - php: hhvm
+          sudo: required
+          dist: trusty
+          group: edge
+        - php: hhvm-nightly
+          sudo: required
+          dist: trusty
+          group: edge
+        - php: 5.5
+        - php: 5.6
+        - php: 7.0
+        - php: 5.5
+          env: COMPOSER_FLAGS='--prefer-lowest --prefer-stable'
+    fast_finish: true
 
 before_script:
+    - if [[ $TRAVIS_PHP_VERSION  = '5.6' ]]; then PHPUNIT_FLAGS="--coverage-clover clover"; else PHPUNIT_FLAGS=""; fi
+    - if [[ $TRAVIS_PHP_VERSION != '5.6' &&  ! $TRAVIS_PHP_VERSION = hhvm* ]]; then phpenv config-rm xdebug.ini; fi
     - composer self-update
-    - composer install --dev
+    - composer update $COMPOSER_FLAGS
 
-script: vendor/bin/phpunit --coverage-clover clover
+script: vendor/bin/phpunit $PHPUNIT_FLAGS
 
 after_success:
-    - wget https://scrutinizer-ci.com/ocular.phar
-    - php ocular.phar code-coverage:upload --format=php-clover clover
+    - if [[ $TRAVIS_PHP_VERSION = '5.6' ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi
+    - if [[ $TRAVIS_PHP_VERSION = '5.6' ]]; then php ocular.phar code-coverage:upload --format=php-clover clover; fi
 

README.md

@@ -1,4 +1,4 @@
-Serializer [![Scrutinizer Quality Score](https://scrutinizer-ci.com/g/schmittjoh/serializer/badges/quality-score.png?s=189df68e00c75d3fe155bc0da0b53b53709a9895)](https://scrutinizer-ci.com/g/schmittjoh/serializer/)
+Serializer [![Scrutinizer Quality Score](https://scrutinizer-ci.com/g/schmittjoh/serializer/badges/quality-score.png?s=189df68e00c75d3fe155bc0da0b53b53709a9895)](https://scrutinizer-ci.com/g/schmittjoh/serializer/) [![Build Status](https://travis-ci.org/schmittjoh/serializer.svg?branch=master)](https://travis-ci.org/schmittjoh/serializer)
 ==========
 
 Learn more about it in its [documentation](http://jmsyst.com/libs/serializer).

composer.json

@@ -12,29 +12,32 @@
         }
     ],
     "require": {
-        "php": ">=5.3.2",
+        "php": ">=5.5.0",
         "jms/metadata": "~1.1",
         "jms/parser-lib": "1.*",
+        "phpoption/phpoption": "^1.1",
         "phpcollection/phpcollection": "~0.1",
-        "doctrine/annotations": "1.*",
-        "doctrine/instantiator": "~1.0.3"
+        "doctrine/annotations": "^1.0",
+        "doctrine/instantiator": "^1.0.3"
+    },
+    "conflict": {
+        "twig/twig": "<1.12"
     },
     "suggest": {
         "symfony/yaml": "Required if you'd like to serialize data to YAML format."
     },
-    "minimum-stability": "dev",
     "require-dev": {
-        "twig/twig": ">=1.8,<2.0-dev",
+        "twig/twig": "~1.12|~2.0",
         "doctrine/orm": "~2.1",
-        "doctrine/phpcr-odm": "~1.0.1",
-        "jackalope/jackalope-doctrine-dbal": "1.0.*",
+        "jackalope/jackalope-doctrine-dbal": "^1.1.5",
+        "doctrine/phpcr-odm": "^1.3|^2.0",
         "propel/propel1": "~1.7",
-        "symfony/yaml": "2.*",
-        "symfony/translation": "~2.0",
-        "symfony/validator": "~2.0",
+        "symfony/yaml": "^2.1",
+        "symfony/translation": "^2.1",
+        "symfony/validator": "^2.2",
         "symfony/form": "~2.1",
-        "symfony/filesystem": "2.*",
-        "phpunit/phpunit": "~4.0"
+        "symfony/filesystem": "^2.1",
+        "phpunit/phpunit": "^4.8|^5.0"
     },
     "autoload": {
         "psr-0": {
@@ -43,7 +46,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "0.17-dev"
+            "dev-master": "1.3-dev"
         }
     }
 }