Skip to content

Commit

Permalink
Update test-suite, use alchemy/mediavorus
Browse files Browse the repository at this point in the history
  • Loading branch information
Benoît Burnichon committed Dec 15, 2015
1 parent 238c8fe commit 064d76f
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 1,955 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/nbproject
composer.phar
composer.lock
/vendor
/tests/phpunit_report
/docs/build
Expand Down
20 changes: 13 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
language: php

sudo: required

services: []

before_script:
Expand All @@ -13,11 +15,15 @@ before_script:
- sh -c "cd imagick-3.1.0RC2 && phpize && ./configure --with-imagick=/usr/local && make -j && sudo make install"
- echo "extension=imagick.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`
- composer self-update
- composer install --dev --prefer-source

php:
- 5.3.3
- 5.3
- 5.4
- 5.5
- composer update --prefer-source --no-interaction $LOW_DEPS

matrix:
include:
- php: 5.3.3
- php: 5.3.3
env: LOW_DEPS="--prefer-lowest"
- php: 5.3
- php: 5.4
- php: 5.5
- php: 5.6
- php: 7.0
29 changes: 15 additions & 14 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,23 @@
}
],
"require": {
"php" : ">=5.3.3",
"alchemy/ghostscript" : "~0.4.0",
"imagine/imagine" : "0.6.x@dev",
"mediavorus/mediavorus" : ">=0.4.2,<0.5",
"monolog/monolog" : "~1.0",
"neutron/temporary-filesystem" : "~2.1",
"pimple/pimple" : "~1.0",
"php-ffmpeg/php-ffmpeg" : ">=0.4.2,<0.6",
"php-unoconv/php-unoconv" : "~0.3.0",
"php-mp4box/php-mp4box" : "~0.3.0",
"swftools/swftools" : "~0.3.0",
"symfony/console" : "~2.0",
"symfony/filesystem" : "~2.0"
"php": ">=5.3.3",
"alchemy/ghostscript": "~0.4.0",
"alchemy/mediavorus": "^0.4.4",
"imagine/imagine": "0.6.x@dev",
"monolog/monolog": "~1.0",
"neutron/temporary-filesystem": "~2.1",
"php-ffmpeg/php-ffmpeg": ">=0.4.2,<0.6",
"php-mp4box/php-mp4box": "~0.3.0",
"php-unoconv/php-unoconv": "~0.3.0",
"pimple/pimple": "~1.0",
"swftools/swftools": "~0.3.0",
"symfony/console": "^2.1|^3.0",
"symfony/filesystem": "^2.1|^3.0",
"symfony/process": "^2.1|^3.0"
},
"require-dev": {
"phpunit/phpunit" : "~3.7",
"phpunit/phpunit" : "^4.1|^5.0",
"neutron/silex-imagine-provider" : "~0.1",
"phpexiftool/phpexiftool" : "~0.1",
"silex/silex" : "~1.0"
Expand Down
Loading

0 comments on commit 064d76f

Please sign in to comment.