Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/psr-4'
Browse files Browse the repository at this point in the history
* origin/psr-4:
  [tests] Add bootstrap back to not pollute prod-ish setups
  Update child repos to PSR-4 for git subs-plit
  PSR-4
  • Loading branch information
igorw committed Feb 2, 2014
2 parents a4de87e + 0d9aefa commit 16b05e9
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,19 @@
"keywords": ["stream", "pipe"],
"license": "MIT",
"require": {
"php": ">=5.3.3",
"php": ">=5.4.0",
"evenement/evenement": "~2.0"
},
"suggest": {
"react/event-loop": "0.3.*",
"react/promise": "~1.0"
"react/event-loop": "0.4.*",
"react/promise": "~2.0"
},
"autoload": {
"psr-0": { "React\\Stream": "" }
"psr-4": { "React\\Stream\\": "" }
},
"target-dir": "React/Stream",
"extra": {
"branch-alias": {
"dev-master": "0.3-dev"
"dev-master": "0.4-dev"
}
}
}

0 comments on commit 16b05e9

Please sign in to comment.