Skip to content

Commit

Permalink
Merge pull request #43 from ramsey/libsodium-support
Browse files Browse the repository at this point in the history
Libsodium support
  • Loading branch information
ircmaxell committed Sep 7, 2016
2 parents d9b5c09 + 18b535f commit 4d4232b
Show file tree
Hide file tree
Showing 6 changed files with 181 additions and 536 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
vendor
vendor
composer.lock
34 changes: 26 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,31 @@
language: php

php:
- 5.6
- 5.5
- 5.4
- 5.3
- hhvm
sudo: required

matrix:
include:
- php: 7.0
env: LIBSODIUM=1
- php: 5.6
env: LIBSODIUM=1
- php: 5.5
env: LIBSODIUM=1
- php: 5.4
env: LIBSODIUM=1
- php: 5.3
env: LIBSODIUM=1
- php: hhvm
env: LIBSODIUM=0 # libsodium extension is not supported by HHVM

before_install:
- if [[ "$LIBSODIUM" == "1" ]]; then sudo add-apt-repository -y ppa:chris-lea/libsodium; fi
- if [[ "$LIBSODIUM" == "1" ]]; then sudo apt-get -q update; fi
- if [[ "$LIBSODIUM" == "1" ]]; then sudo apt-get -y install libsodium-dev; fi
- if [[ "$LIBSODIUM" == "1" ]]; then pecl install libsodium; fi

before_script:
- composer install --prefer-source
- travis_retry composer self-update
- travis_retry composer install --prefer-source

script: vendor/bin/phpunit --configuration phpunit.xml.dist test
script:
- ./vendor/bin/phpunit --verbose
7 changes: 3 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"keywords": ["random", "random-numbers", "random-strings", "cryptography"],
"homepage": "https://github.com/ircmaxell/RandomLib",
"license": "MIT",
"minimum-stability": "dev",
"authors": [
{
"name": "Anthony Ferrara",
Expand All @@ -14,11 +13,11 @@
}
],
"require-dev": {
"mikey179/vfsStream": "1.1.*",
"phpunit/phpunit": "3.7.*"
"mikey179/vfsStream": "^1.6",
"phpunit/phpunit": "^4.8|^5.0"
},
"require": {
"ircmaxell/security-lib": "1.1.*@dev",
"ircmaxell/security-lib": "^1.1",
"php": ">=5.3.2"
},
"autoload": {
Expand Down
Loading

0 comments on commit 4d4232b

Please sign in to comment.