Merge pull request #24 from silinternational/develop

Release 0.6.1

Dockerfile

@@ -0,0 +1,22 @@
+FROM silintl/php7:7.2
+MAINTAINER Mark Tompsett <[email protected]>
+
+ENV REFRESHED_AT 2020-03-16
+
+# Fix timezone stuff from hanging.
+RUN apt-get update -y && echo "America/New_York" > /etc/timezone; \
+    apt-get install -y tzdata
+
+# Make sure apt has current list/updates
+# Install necessary PHP building blocks
+# Install Apache and PHP (and any needed extensions).
+# Install mock DB stuff
+RUN apt-get install -y zip unzip make curl wget \
+    php php-pdo php-xml php-mbstring sqlite php-sqlite3
+
+RUN mkdir -p /data
+WORKDIR /data
+COPY ./ /data
+
+RUN cd /data && ./composer-install.sh
+RUN mv /data/composer.phar /usr/bin/composer

Makefile

@@ -1,2 +1,18 @@
+it-now: clean install phpunit
+
+clean:
+	sudo rm -rf ./vendor
+	rm -f composer.lock
+
+install:
+	docker-compose run --rm cli bash -c "cd /data;composer install"
+
+update:
+	docker-compose run --rm cli bash -c "cd /data;composer update"
+
+phpunit:
+	docker-compose run --rm cli bash -c "cd /data/SilMock/tests;./phpunit"
+
+# For use in virtualbox.
 test:
 	cd /var/lib/GA_mock/SilMock/tests; /var/lib/GA_mock/SilMock/tests/phpunit

README.md

@@ -75,6 +75,17 @@ implements include...
 
 1. listUsersSettingsForwardingAddresses()
 
+Unit Testing
+------------
+If you are able to run docker natively, then:
+ - make it-now
+
+If not, then use vagrant up:
+ - vagrant up
+ - vagrant ssh
+ - cd /var/lib/GA_mock
+ - make test
+
 Data Persistence
 ----------------
 In order to keep data available for use by this mock, it makes use of a **Sqlite**

composer-install.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+EXPECTED_CHECKSUM="$(wget -q -O - https://composer.github.io/installer.sig)"
+php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+ACTUAL_CHECKSUM="$(php -r "echo hash_file('sha384', 'composer-setup.php');")"
+
+if [ "$EXPECTED_CHECKSUM" != "$ACTUAL_CHECKSUM" ]
+then
+    >&2 echo 'ERROR: Invalid installer checksum'
+    rm composer-setup.php
+    exit 1
+fi
+
+php composer-setup.php --quiet
+RESULT=$?
+rm composer-setup.php
+exit $RESULT

docker-compose.yml

@@ -0,0 +1,17 @@
+version: '2.2'
+services:
+    cli:
+        build: ./
+        volumes:
+            - ./:/data
+        working_dir: /data
+        command: ["true"]
+
+networks:
+    default:
+        driver: bridge
+        ipam:
+            driver: default
+            config:
+            - subnet: 10.20.35.0/24
+              gateway: 10.20.35.1