Merge branch 'master' into clean-up

pel · Feb 2, 2017 · 7372aaf · 7372aaf
2 parents ab13e6a + 7dadd2a
commit 7372aaf
Show file tree

Hide file tree

Showing 6 changed files with 2,006 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,5 @@
 locale/*
 doc/*
 vendor
-composer.lock
 ChangeLog
 build-base*
diff --git a/.travis.yml b/.travis.yml
@@ -23,7 +23,7 @@ before_script:
 
 script:
   - ./vendor/bin/phpcs --runtime-set ignore_warnings_on_exit 1 --standard=psr2 src
-  - phpunit --coverage-clover build/logs/clover.xml ./test
+  - ./vendor/bin/phpunit --coverage-clover build/logs/clover.xml ./test
 
 after_script:
   - travis_retry php vendor/bin/coveralls -v
diff --git a/README.markdown b/README.markdown
@@ -44,7 +44,7 @@ share your ideas about how the API should look like.
 * Supports reading and writing all Exif tags.
 * Supports internationalization.
 * Extensible object-oriented design.
-* Unit-tested with SimpleTest (http://sf.net/projects/simpletest).
+* PhpUnit tested
 * Documented with PhpDocumentor (http://phpdoc.org/).
 
 

diff --git a/composer.json b/composer.json
@@ -27,8 +27,8 @@
     "require-dev" : {
         "ext-gd": "*",
         "phpunit/phpunit": "5.7.*",
-        "squizlabs/php_codesniffer": "3.0.0RC2",
-        "satooshi/php-coveralls": "dev-master"
+        "squizlabs/php_codesniffer": "3.0.0RC3",
+        "satooshi/php-coveralls": "1.0.*"
     },
     "autoload": {
         "psr-4": {"lsolesen\\pel\\": "src/"}