Skip to content
This repository has been archived by the owner on Mar 12, 2020. It is now read-only.

Commit

Permalink
Merge pull request #10 from phergie/phergie-version2
Browse files Browse the repository at this point in the history
Phergie version2 updates
  • Loading branch information
svpernova09 committed Dec 31, 2015
2 parents a19593f + 7916579 commit 86626c6
Show file tree
Hide file tree
Showing 5 changed files with 289 additions and 192 deletions.
5 changes: 0 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ cache:

## PHP versions we test against
php:
- 5.4
- 5.5
- 5.6
- 7
Expand All @@ -18,8 +17,6 @@ php:
## Build matrix for lowest and highest possible targets
matrix:
include:
- php: 5.4
env: dependencies=lowest
- php: 5.5
env: dependencies=lowest
- php: 5.6
Expand All @@ -28,8 +25,6 @@ matrix:
env: dependencies=lowest
- php: hhvm
env: dependencies=lowest
- php: 5.4
env: dependencies=highest
- php: 5.5
env: dependencies=highest
- php: 5.6
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright* (c) 2014 Cees-Jan Kiewiet
Copyright* (c) 2015 Cees-Jan Kiewiet

Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
Expand Down
23 changes: 19 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,30 @@
"support": {
"irc": "irc://irc.freenode.net/phergie"
},
"repositories": [
{
"type": "vcs",
"url": "[email protected]:svpernova09/Phake.git"
}
],
"require": {
"php": "^5.4|^7.0",
"phergie/phergie-irc-bot-react": "~1.0",
"php": "^5.5|^7.0",
"phergie/phergie-irc-bot-react": "~2",
"nojimage/twitter-text-php": "1.1.1",
"phergie/phergie-irc-plugin-http": "^3.0.0-alpha1",
"phergie/phergie-irc-plugin-http": "^4",
"react/promise": "~1.0|~2.0"
},
"require-dev": {
"phergie/phergie-irc-bot-react-development": "^1.0.2|^1.1"
"phake/phake": "dev-VerifierResultConstraint-issue",
"phpunit/phpunit": "^4.6.0",
"codeclimate/php-test-reporter": "~0.1",
"satooshi/php-coveralls": "0.6.1",
"symfony/config": "~2.0",
"symfony/console": "~2.0",
"symfony/filesystem": "~2.0",
"symfony/stopwatch": "~2.0",
"vectorface/dunit": "^2.0",
"squizlabs/php_codesniffer": "^1.5.3"
},
"autoload": {
"psr-4": {
Expand Down
Loading

0 comments on commit 86626c6

Please sign in to comment.