Merge pull request #15 from sirn-se/http-support

Adding support for http(s) connections.

Author: sirn-se

.travis.yml

@@ -1,12 +1,13 @@
 language: php
 
 php:
+  - 5.6
   - 5.5
   - 5.4
   - 5.3
 
 script:
-  - make test
+  - make update test
 
 after_script:
   - php vendor/bin/coveralls -v

Makefile

@@ -1,7 +1,7 @@
 install: composer.phar
 	./composer.phar install
 
-update:
+update: composer.phar
 	./composer.phar update
 
 test: vendor/bin/phpunit build

README.md

@@ -133,6 +133,10 @@ in your projects composer.json.
 Changelog
 ---------
 
+0.2.5
+
+  * Adding support for http(s) connections (wss as default)
+
 0.2.1
 
  * Using tivoka 3.4.*, avoiding stability-level dev for dependencies.

composer.json

@@ -6,16 +6,21 @@
     {
       "name": "Fredrik Liljegren",
       "email": "[email protected]"
+    },
+    {
+      "name": "Sören Jensen",
+      "email": "[email protected]"
     }
   ],
   "autoload": {
     "psr-4": {"Textalk\\WebshopClient\\": "lib"}
   },
   "require": {
+    "php": ">=5.3",
     "tivoka/tivoka": "3.4.*"
   },
   "require-dev": {
     "phpunit/phpunit": "4.1.*",
-    "satooshi/php-coveralls": "dev-master"
+    "satooshi/php-coveralls": "1.0.*"
   }
 }