Skip to content

Commit

Permalink
Merge pull request #18 from WyriHaximus/feature-hydrator
Browse files Browse the repository at this point in the history
Feature hydrator
  • Loading branch information
WyriHaximus committed May 17, 2016
2 parents 3abaafe + 3c395ab commit dcd0c72
Show file tree
Hide file tree
Showing 60 changed files with 2,146 additions and 748 deletions.
5 changes: 5 additions & 0 deletions .styleci.yml
@@ -0,0 +1,5 @@
preset: psr2

risky: false

linting: true
7 changes: 3 additions & 4 deletions .travis.yml
Expand Up @@ -8,17 +8,17 @@ cache:

## PHP versions we test against
php:
- 7
- 7.0
- hhvm

## Build matrix for lowest and highest possible targets
matrix:
include:
- php: 7
- php: 7.0
env: dependencies=lowest
- php: hhvm
env: dependencies=lowest
- php: 7
- php: 7.0
env: dependencies=highest
- php: hhvm
env: dependencies=highest
Expand All @@ -28,7 +28,6 @@ matrix:
## Update composer and configure authentication token
before_install:
- composer self-update
- if [ -n "$GH_TOKEN" ]; then composer config github-oauth.github.com ${GH_TOKEN}; fi;

## Install or update dependencies
install:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Expand Up @@ -9,7 +9,7 @@ cs: init
./vendor/bin/phpcs --standard=PSR2 src/

unit: init
./vendor/bin/phpunit
./vendor/bin/phpunit --coverage-text --coverage-html covHtml

dunit: init
./vendor/bin/dunit
Expand Down
10 changes: 7 additions & 3 deletions composer.json
Expand Up @@ -16,12 +16,16 @@
"aws/aws-sdk-php": "^3.0",
"guzzlehttp/guzzle": "^5.0||^6.0",
"react/promise": "^2.2",
"wyrihaximus/react-guzzle-psr7": "^1.0"
"wyrihaximus/react-guzzle-psr7": "^1.0",
"ocramius/generated-hydrator": "^2.0",
"clue/block-react": "^1.1",
"reactivex/rxphp": "^1.2"
},
"require-dev": {
"phpunit/phpunit": "^5.2.3",
"squizlabs/php_codesniffer": "^1.5.6",
"vectorface/dunit": "~2.0"
"squizlabs/php_codesniffer": "^2.6",
"vectorface/dunit": "~2.0",
"phake/phake": "^2.3"
},
"autoload": {
"psr-4": {
Expand Down

0 comments on commit dcd0c72

Please sign in to comment.