Merge branch '3.1' into 3.2

# Conflicts: # composer.json Signed-off-by: crynobone <crynobone@gmail.com>
orchestral · Dec 18, 2015 · 5d3787f · 5d3787f
2 parents 7a1445d + 630ea3f
commit 5d3787f
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 842 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -22,8 +22,8 @@ before_script:
   - if [[ $setup = 'coveralls' ]]; then travis_retry composer require "psr/log=1.0.0" "satooshi/php-coveralls=~0.6" "symfony/yaml=~2.0" --prefer-source --no-interaction --dev; fi
 
 script:
-  - if [[ $coverage = 'yes' ]]; then phpunit -c phpunit.xml --coverage-clover build/logs/clover.xml; fi
-  - if [[ $coverage = 'no' ]]; then phpunit -c phpunit.xml; fi
+  - if [[ $coverage = 'yes' ]]; then ./vendor/bin/phpunit -c phpunit.xml --coverage-clover build/logs/clover.xml; fi
+  - if [[ $coverage = 'no' ]]; then ./vendor/bin/phpunit -c phpunit.xml; fi
 
 after_script:
   - if [[ $setup = 'coveralls' ]]; then php vendor/bin/coveralls -v; fi

diff --git a/composer.json b/composer.json
@@ -17,12 +17,12 @@
     },
     "require": {
         "php": ">=5.5.0",
-        "illuminate/container": "~5.2.0",
-        "illuminate/support": "~5.2.0",
-        "paragonie/random_compat": "^1.1"
+        "laravie/parser": "~1.0",
+        "illuminate/container": "~5.2.0"
     },
     "require-dev": {
-        "mockery/mockery": "0.9.*"
+        "mockery/mockery": "0.9.*",
+        "phpunit/phpunit": "~4.0|~5.0"
     },
     "extra": {
         "branch-alias": {

diff --git a/src/Document.php b/src/Document.php
diff --git a/src/InvalidContentException.php b/src/InvalidContentException.php
diff --git a/src/Reader.php b/src/Reader.php