Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: PHPExif/php-exif
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.6.2
Choose a base ref
...
head repository: PHPExif/php-exif
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
composer.lock
phpunit.xml
tests/log
vendor
30 changes: 24 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,33 @@
language: php

php:
- 5.3
- 5.4
- 5.5
- 5.6
- 7.0
- 7.1
- 7.2
- nightly

env:
- DEPENDENCIES=no
- DEPENDENCIES=beta
- DEPENDENCIES=low

matrix:
allow_failures:
- php: 5.6
- php: nightly
- env: DEPENDENCIES=beta
- env: DEPENDENCIES=low

script:
- mkdir -p build/logs
- php vendor/bin/phpunit -c phpunit.xml.dist
- ./vendor/bin/phpunit --coverage-clover ./build/logs/clover.xml
- ./vendor/bin/phpcs --standard=PSR2 ./lib/
- composer validate-files
- composer check-code-style
- composer run-tests

before_script:
- composer install --prefer-source
- if [ "$DEPENDENCIES" = "low" ]; then composer --prefer-lowest --prefer-stable update; else composer update; fi;

after_script:
- php vendor/bin/coveralls -v
@@ -28,3 +38,11 @@ before_install:
- tar -zxvf Image-ExifTool-9.90.tar.gz
- cd Image-ExifTool-9.90 && perl Makefile.PL && make test && sudo make install
- cd .. && rm -rf Image-ExifTool-9.90
# Set composer minimum-stability configuration filter to beta versions
- if [ "$DEPENDENCIES" = "beta" ]; then perl -pi -e 's/^}$/,"minimum-stability":"beta"}/' composer.json; fi;
# Disable xdebug, there is no use of it being enabled
- mv ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini{,.disabled} || echo "xdebug not available"
# Prevent Travis throwing an out of memory error
- echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
# Test if we have a token for github in case the project hits the 60 rph limit
- if [ -n "$GH_TOKEN" ]; then composer config github-oauth.github.com ${GH_TOKEN}; fi;
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# [PHPExif v0.6.1](http://github.com/Miljar/php-exif) [![Build Status](https://travis-ci.org/Miljar/php-exif.png?branch=master)](https://travis-ci.org/Miljar/php-exif) [![Coverage Status](https://coveralls.io/repos/Miljar/php-exif/badge.svg?branch=master)](https://coveralls.io/r/Miljar/php-exif?branch=master) [![Code Climate](https://codeclimate.com/github/Miljar/php-exif/badges/gpa.svg)](https://codeclimate.com/github/Miljar/php-exif)
# [PHPExif v0.6.4](http://github.com/PHPExif/php-exif) [![Build Status](https://travis-ci.org/PHPExif/php-exif.png?branch=master)](https://travis-ci.org/PHPExif/php-exif) [![Coverage Status](https://coveralls.io/repos/PHPExif/php-exif/badge.svg?branch=master)](https://coveralls.io/r/PHPExif/php-exif?branch=master) [![Code Climate](https://codeclimate.com/github/PHPExif/php-exif/badges/gpa.svg)](https://codeclimate.com/github/PHPExif/php-exif)

PHPExif is a library which gives you easy access to the EXIF meta-data of an image.

@@ -12,7 +12,7 @@ PHPExif serves as a wrapper around some native or CLI tools which access this EX
## Installation (composer)

```json
"miljar/php-exif": "~0.6.0"
composer require miljar/php-exif
```


27 changes: 22 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
@@ -12,12 +12,13 @@
],
"keywords": ["EXIF", "IPTC", "jpeg", "tiff", "exiftool"],
"require": {
"php": ">=5.3.0"
"php": ">=5.4"
},
"require-dev": {
"phpunit/phpunit": "3.7.*",
"satooshi/php-coveralls": "~0.6",
"jakub-onderka/php-parallel-lint": "^1.0",
"phpmd/phpmd": "~2.2",
"phpunit/phpunit": ">=4.0 <6.0",
"satooshi/php-coveralls": "~0.6",
"sebastian/phpcpd": "1.4.*@stable",
"squizlabs/php_codesniffer": "1.4.*@stable"
},
@@ -29,5 +30,21 @@
"psr-0": {
"PHPExif": "lib/"
}
}
}
},
"scripts": {
"check-code-style": [
"vendor/bin/phpcs --standard=PSR2 ./lib/"
],
"run-tests": [
"vendor/bin/phpunit -c phpunit.xml.dist",
"vendor/bin/phpunit --coverage-clover ./build/logs/clover.xml"
],
"validate-files": [
"vendor/bin/parallel-lint --exclude vendor ."
]
},
"config": {
"sort-packages": true
},
"prefer-stable": true
}
Loading