Merge branch 'update-whole' of https://github.com/the-eater/stomp

.gitignore

@@ -1 +1,2 @@
 vendor
+Dockerfile

.travis.yml

@@ -1,38 +1,36 @@
 language: php
 
+dist: trusty
 php:
-  - 5.4
-  - 5.5
   - 5.6
-  - 7
-  - hhvm
-  - hhvm-nightly
-
-matrix:
-  allow_failures:
-    - php: 7
-    - php: hhvm
-    - php: hhvm-nightly
-  fast_finish: true
+  - 7.0
+  - 7.1
 
 env:
   - STOMP_PROVIDER=rabbitmq
   - STOMP_PROVIDER=apollo
+  - STOMP_PROVIDER=activemq SKIP_AUTH_CHECKS=1
 
 before_script:
-  - sh -c " if [ '$STOMP_PROVIDER' = 'apollo' ]; then
-              wget http://mirror.catn.com/pub/apache/activemq/activemq-apollo/1.7/apache-apollo-1.7-unix-distro.tar.gz;
-              tar xzf apache-apollo-1.7-unix-distro.tar.gz;
-              ./apache-apollo-1.7/bin/apollo create apollo;
-              ./apollo/bin/apollo-broker-service start;
-              sleep 6;
-            fi"
-  - sh -c " if [ '$STOMP_PROVIDER' = 'rabbitmq' ]; then
-              sudo rabbitmq-plugins enable rabbitmq_stomp;
-              sudo service rabbitmq-server start;
-            fi"
-  - composer install --dev --prefer-source
+  - if [ "$STOMP_PROVIDER" = 'apollo' ]; then
+      wget http://www-us.apache.org/dist/activemq/activemq-apollo/1.7.1/apache-apollo-1.7.1-unix-distro.tar.gz;
+      tar xzf apache-apollo-1.7.1-unix-distro.tar.gz;
+      ./apache-apollo-1.7.1/bin/apollo create apollo;
+      ./apollo/bin/apollo-broker-service start;
+      sleep 6;
+    fi
+  - if [ "$STOMP_PROVIDER" = 'rabbitmq' ]; then
+      sudo rabbitmq-plugins enable rabbitmq_stomp;
+      sudo service rabbitmq-server start;
+    fi
+  - if [ "$STOMP_PROVIDER" = 'activemq' ]; then
+      sudo apt install activemq tree;
+      sudo cp tests/utils/activemq.xml /etc/activemq/instances-available/main/;
+      sudo ln -s /etc/activemq/instances-available/main /etc/activemq/instances-enabled/main;
+      sudo service activemq start;
+    fi
+  - composer install --prefer-source
 
 script:
-  - phpunit --coverage-text
-  - phpunit -c phpunit-functional.xml.dist
+  - vendor/bin/phpunit --coverage-text
+  - vendor/bin/phpunit -c phpunit-functional.xml.dist

composer.json

@@ -10,9 +10,9 @@
         "react/promise": "~2.0"
     },
     "autoload": {
-        "psr-0": { "React\\Stomp": "src" }
+        "psr-4": { "React\\Stomp\\": "src" }
     },
     "require-dev": {
-        "phpunit/phpunit": "4.3.*"
+        "phpunit/phpunit": "^5"
     }
 }