Merge branch 'develop'

v1.1.0
adamturcsan · Oct 9, 2017 · 19c2324 · 19c2324
2 parents 67bd0fe + d45d708
commit 19c2324
Show file tree

Hide file tree

Showing 6 changed files with 808 additions and 44 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,6 @@
+/test export-ignore
+.gitattributes export-ignore
+.gitignore export-ignore
+.coveralls.yml export-ignore
+.travis.yml export-ignore
+phpunit.xml.dist export-ignore
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 /vendor/
 /tmp/
 /test/configuration.xml
-/phpunit-xdebug
+/phpunit-xdebug
+/humbuglog.txt
diff --git a/composer.json b/composer.json
@@ -33,6 +33,7 @@
     "require-dev": {
         "ext-pdo_sqlite": "*",
         "ext-xml": "*",
-        "phpunit/phpunit": "^4.7"
+        "phpunit/phpunit": "^4.7",
+        "humbug/humbug": "1.0.0-alpha2"
     }
 }