Fixed configuration and dependencies

GrahamCampbell · GrahamCampbell · commit dd60dfa58490 · 2015-12-30T12:46:00.000Z
diff --git a/.coveralls.yml b/.coveralls.yml
@@ -1,3 +1,2 @@
 service_name: travis-ci
-src_dir: ./
 coverage_clover: build/logs/clover.xml
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
-vendor/
-build/
+build
+composer.lock
+vendor
diff --git a/composer.json b/composer.json
@@ -2,8 +2,8 @@
     "name": "namshi/jose",
     "description": "JSON Object Signing and Encryption library for PHP.",
     "require-dev": {
-        "phpunit/phpunit": "~4.5",
-        "satooshi/php-coveralls": "dev-master"
+        "phpunit/phpunit": "^4.5|^5.0",
+        "satooshi/php-coveralls": "^1.0"
     },
     "license": "MIT",
     "keywords": ["jws", "jwt", "json", "json web token", "json web signature", "token"],
diff --git a/composer.lock b/composer.lock

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,2 @@`
`1`	`1`	`service_name: travis-ci`
`2`		`-src_dir: ./`
`3`	`2`	`coverage_clover: build/logs/clover.xml`
-Original file line number
+Diff line change
 -vendor/
 -build/
 +build
 +composer.lock
 +vendor