Merge pull request #3 from phergie/phergie-version2

svpernova09 · svpernova09 · commit ea27995fd030 · 2015-12-21T21:20:20.000-06:00
Phergie version2 updates
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,9 @@
 language: php
 
 php:
-  - 5.4
   - 5.5
   - 5.6
+  - 7.0
   - hhvm
 
 before_script:
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2014, Phergie Team
+Copyright (c) 2015, Phergie Team
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ The recommended method of installation is [through composer](http://getcomposer.
 ```JSON
 {
     "require": {
-        "phergie/phergie-irc-plugin-react-usermode": "dev-master"
+        "phergie/phergie-irc-plugin-react-usermode": "~2"
     }
 }
 ```
diff --git a/composer.json b/composer.json
@@ -11,7 +11,7 @@
     },
     "minimum-stability": "dev",
     "require": {
-        "phergie/phergie-irc-bot-react": "~1"
+        "phergie/phergie-irc-bot-react": "~2"
     },
     "require-dev": {
         "phpunit/phpunit": "4.1.*",
diff --git a/composer.lock b/composer.lock

-Original file line number
+Diff line change
@@ @@ -1,9 +1,9 @@ @@
 language: php
 php:
 -  - 5.4
   - 5.5
   - 5.6
 +  - 7.0
   - hhvm
 before_script:
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Copyright (c) 2014, Phergie Team`
	`1`	`+Copyright (c) 2015, Phergie Team`
`2`	`2`	`All rights reserved.`
`3`	`3`
`4`	`4`	`Redistribution and use in source and binary forms, with or without modification,`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ The recommended method of installation is [through composer](http://getcomposer.`
`11`	`11`	```JSON
`12`	`12`	`{`
`13`	`13`	`"require": {`
`14`		`- "phergie/phergie-irc-plugin-react-usermode": "dev-master"`
	`14`	`+ "phergie/phergie-irc-plugin-react-usermode": "~2"`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`	```