Skip to content

Commit

Permalink
Merge pull request #25 from darrynten/fix/codacy-changes
Browse files Browse the repository at this point in the history
Update Dependencies
  • Loading branch information
darrynten committed Feb 11, 2018
2 parents 7839a32 + 307419e commit 6c62258
Show file tree
Hide file tree
Showing 8 changed files with 1,843 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.DS_Store
composer.phar
composer.lock
/vendor/
/bin/
/tests/coverage/
Expand Down
16 changes: 8 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
language: php

php:
- 7.0
- 7.1

before_script:
- sudo add-apt-repository -y ppa:evl.ms/precise
- sudo apt-get update
- sudo apt-get -y --force-yes --reinstall install imagemagick
- sudo apt-get install libjpeg-dev libpng-dev libtiff-dev libgif-dev webp openjpeg-tools
- wget https://github.com/ImageMagick/ImageMagick/archive/7.0.7-21.tar.gz
- tar xzf 7.0.7-21.tar.gz
- cd ImageMagick-7.0.7-21
- ./configure --with-raw=yes
- sudo make
- sudo make install
- cd ..
- printf "\n" | pecl install imagick
- travis_retry composer self-update --preview
- travis_retry composer install --prefer-dist --no-interaction

script:
- bin/phpunit --coverage-clover=coverage.xml

after_success:
- bash <(curl -s https://codecov.io/bash)
9 changes: 2 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,15 @@
{
"name": "darrynten/pslayers",
"description": "PHP Imagick Layers",
"version": "1.0.1",
"type": "library",
"require": {
"php": "^7.0",
"guzzlehttp/guzzle": "^6.2.1",
"darrynten/any-cache": "^1.0",
"symfony/process": "^3.2",
"mxnr/imagic-scripts": "~1.0"
"darrynten/imagick-scripts": "~1.0.1"
},
"repositories": [
{
"url": "https://github.com/mxnr/imagic-scripts.git",
"type": "git"
}
],
"require-dev": {
"phpunit/phpunit": "~5.0",
"mockery/mockery": "dev-master"
Expand Down
Loading

0 comments on commit 6c62258

Please sign in to comment.