Merge pull request #4 from CMProductions/tests

Tests

.scrutinizer.yml

@@ -1,9 +1,23 @@
+filter:
+    paths: ["src/*"]
+    excluded_paths:
+      - "bin/"
+      - "spec/"
+
+checks:
+    php:
+        code_rating: true
+        duplication: true
+
 build:
     environment:
-        php: '5.4.41'
+        docker: true
     tests:
-        before:
-            - 'composer install'
         override:
-            - 'make tests'
-            - 'vendor/phpspec/phpspec/bin/phpspec run'
+            - 'make dev'
+            - 'make unit PHP_VERSION=php-7.1'
+            - 'make unit PHP_VERSION=php-5.6'
+            - 'make unit PHP_VERSION=php-5.5'
+            - 'make integration PHP_VERSION=php-7.1'
+            - 'make integration PHP_VERSION=php-5.6'
+            - 'make integration PHP_VERSION=php-5.5'

Makefile

@@ -6,10 +6,10 @@ APP_ROOT := /app/logging
 all: dev nodev
 
 dev:
-	@docker-compose -p ${COMPONENT} -f ops/docker/docker-compose.yml up
+	@docker-compose -p ${COMPONENT} -f ops/docker/docker-compose.yml up -d
 
 nodev:
-	@docker-compose -p ${COMPONENT} -f ops/docker/docker-compose.yml rm -fa > /dev/null
+	@docker-compose -p ${COMPONENT} -f ops/docker/docker-compose.yml rm -f > /dev/null
 ifeq ($(IMAGES),true)
 	@docker rmi ${COMPONENT}_${CONTAINER}
 endif
@@ -20,10 +20,10 @@ deps:
 	@composer install --no-interaction
 
 unit:
-	@${APP_ROOT}/ops/scripts/unit.sh
+	@docker exec -t ${COMPONENT}_${CONTAINER}_1 ${APP_ROOT}/ops/scripts/unit.sh ${PHP_VERSION}
 
 integration:
-	@${APP_ROOT}/ops/scripts/integration.sh
+	@docker exec -t ${COMPONENT}_${CONTAINER}_1 ${APP_ROOT}/ops/scripts/integration.sh ${PHP_VERSION}
 
 ps: status
 status:

composer.json

@@ -6,7 +6,7 @@
     "psr/log": "^1.0"
   },
   "require-dev": {
-    "monolog/monolog": "^1.21",
+    "monolog/monolog": "^1.23",
     "phpspec/phpspec": "^2.5",
     "behat/behat": "^3.1",
     "phpunit/phpunit": "4.8.*",