Merge pull request #9 from sitedyno/phergie-version2-take2

Update to phergie/phergie-irc-plugin-react-url version 3
phergie · Mar 13, 2016 · aa4c29a · aa4c29a
2 parents bb24a8e + ae43e8a
commit aa4c29a
Show file tree

Hide file tree

Showing 5 changed files with 426 additions and 294 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,9 @@
 language: php
 
 php:
-  - 5.4
   - 5.5
   - 5.6
+  - 7
   - hhvm
 
 matrix:

diff --git a/composer.json b/composer.json
@@ -10,11 +10,8 @@
         "source": "https://github.com/phergie/phergie-irc-plugin-react-twitter"
     },
     "require": {
-        "phergie/phergie-irc-bot-react": "~1",
-        "guzzlehttp/guzzle": "~4",
+        "phergie/phergie-irc-plugin-react-url": "~3",
         "guzzlehttp/oauth-subscriber": "~0.1",
-        "phergie/phergie-irc-plugin-react-url": "~1",
-        "wyrihaximus/react-guzzle": "~0.1",
         "nesbot/Carbon": "~1"
     },
     "require-dev": {
-Original file line number
+Diff line change
@@ -1,9 +1,9 @@
     language: php
     php:
-      - 5.4
       - 5.5
       - 5.6
+      - 7
       - hhvm
     matrix:
@@ Expand Down @@