From 9f4b7d1dedf7aafa7e2107b4c135a3e909912fbb Mon Sep 17 00:00:00 2001 From: Benjamin Friedman Date: Wed, 12 Jul 2017 11:06:15 -0700 Subject: [PATCH 1/3] Pinned jms/serializer to 1.7.1 --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 12ede17e..0ffae141 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,8 @@ "require-dev": { "phpunit/phpunit": "~4.0", "squizlabs/php_codesniffer": "^3.0.1", - "phpdocumentor/phpdocumentor": "~2.9" + "phpdocumentor/phpdocumentor": "~2.9", + "jms/serializer": "1.7.1" }, "autoload": { "psr-4": { From f93ddbae63c73c3dde13d0f0a70ff25a6b21859b Mon Sep 17 00:00:00 2001 From: Benjamin Friedman Date: Wed, 12 Jul 2017 11:25:30 -0700 Subject: [PATCH 2/3] Checking to update jms/serializer to 1.8.0 ONLY on php 5.4 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index f1681dd5..6caf52ee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,7 @@ php: before_install: - nvm install 6.11 install: + - if [[ ${TRAVIS_PHP_VERSION:0:3} == "5.4" ]]; then composer require jms/serializer; fi - composer install - npm install before_script: From c7e0961c418cbedbba4401b1fc38baa3644bd563 Mon Sep 17 00:00:00 2001 From: Benjamin Friedman Date: Wed, 12 Jul 2017 11:36:32 -0700 Subject: [PATCH 3/3] Added comment, and added graphviz for class diagrams in api docs --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 6caf52ee..c0225320 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,9 @@ php: # - nightly before_install: - nvm install 6.11 + - sudo apt-get install graphviz install: + # fix for jms/serializer 1.7.1 not being able to run on 5.4 - if [[ ${TRAVIS_PHP_VERSION:0:3} == "5.4" ]]; then composer require jms/serializer; fi - composer install - npm install