Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
GenieTim committed Apr 30, 2018
2 parents a6409cc + e11d84e commit f9cf0d9
Show file tree
Hide file tree
Showing 30 changed files with 441 additions and 1,519 deletions.
12 changes: 7 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
language: php

matrix:
include:
- php: 7.0
dist: precise

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

before_script:
- curl -s https://getcomposer.org/installer | php
Expand Down
17 changes: 17 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
FROM php:7.1.11

RUN php -r "readfile('https://getcomposer.org/installer');" > composer-setup.php && \
php composer-setup.php && \
php -r "unlink('composer-setup.php');" && \
mv composer.phar /usr/local/bin/composer

RUN apt-get update && \
apt-get install -yqq git && \
git config --global user.email "[email protected]" && \
git config --global user.name "GitElephant tests" && \
rm -rf /var/lib/apt/lists/*

RUN apt-get update && \
apt-get install -yqq zlib1g-dev && \
docker-php-ext-install zip && \
rm -rf /var/lib/apt/lists/*
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ The api is completely transparent to the end user. You don't have to worry about
Requirements
------------

- php >= 5.3.0
- php >= 7.0.0
- *nix system with git installed

I work on linux, but the lib should work well with every unix system, as far as a git binary is available.
Expand Down
15 changes: 5 additions & 10 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,20 @@
}
],
"require": {
"php": ">=5.3.3",
"symfony/process": "~2.0|~3.0",
"symfony/filesystem": "~2.0|~3.0",
"symfony/finder": "~2.0|~3.0",
"php": ">=7.0.0",
"symfony/process": "~2.0|~3.0|~4.0",
"symfony/filesystem": "~2.0|~3.0|~4.0",
"symfony/finder": "~2.0|~3.0|~4.0",
"phpcollection/phpcollection": "~0.4"
},
"require-dev": {
"phpunit/phpunit": "~4.8",
"phpunit/phpunit": "~6.0",
"mockery/mockery": "~0.9"
},
"minimum-stability": "stable",
"autoload": {
"psr-0": {
"GitElephant": "src/"
}
},
"config": {
"platform": {
"php": "5.3.3"
}
}
}
Loading

0 comments on commit f9cf0d9

Please sign in to comment.