From ad0e97933297a73a22b45d7d358d141109e13eaf Mon Sep 17 00:00:00 2001
From: Dan Kempster <dev@dankempster.co.uk>
Date: Tue, 24 Jan 2017 21:00:38 +0000
Subject: [PATCH 1/2] Remove .idea project config

---
 .gitignore               | 91 +---------------------------------------
 .idea/docker-php-dev.iml | 16 -------
 .idea/modules.xml        |  8 ----
 .idea/vcs.xml            |  6 ---
 4 files changed, 1 insertion(+), 120 deletions(-)
 delete mode 100644 .idea/docker-php-dev.iml
 delete mode 100644 .idea/modules.xml
 delete mode 100644 .idea/vcs.xml

diff --git a/.gitignore b/.gitignore
index 69491e8..2acce55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,91 +1,2 @@
 # Created by .ignore support plugin (hsz.mobi)
-### Windows template
-# Windows image file caches
-Thumbs.db
-ehthumbs.db
-
-# Folder config file
-Desktop.ini
-
-# Recycle Bin used on file shares
-$RECYCLE.BIN/
-
-# Windows Installer files
-*.cab
-*.msi
-*.msm
-*.msp
-
-# Windows shortcuts
-*.lnk
-### macOS template
-*.DS_Store
-.AppleDouble
-.LSOverride
-
-# Icon must end with two \r
-Icon
-
-
-# Thumbnails
-._*
-
-# Files that might appear in the root of a volume
-.DocumentRevisions-V100
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-.VolumeIcon.icns
-.com.apple.timemachine.donotpresent
-
-# Directories potentially created on remote AFP share
-.AppleDB
-.AppleDesktop
-Network Trash Folder
-Temporary Items
-.apdisk
-### JetBrains template
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
-# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
-
-# User-specific stuff:
-.idea/workspace.xml
-.idea/tasks.xml
-
-# Sensitive or high-churn files:
-.idea/dataSources/
-.idea/dataSources.ids
-.idea/dataSources.xml
-.idea/dataSources.local.xml
-.idea/sqlDataSources.xml
-.idea/dynamic.xml
-.idea/uiDesigner.xml
-
-# Gradle:
-.idea/gradle.xml
-.idea/libraries
-
-# Mongo Explorer plugin:
-.idea/mongoSettings.xml
-
-## File-based project format:
-*.iws
-
-## Plugin-specific files:
-
-# IntelliJ
-/out/
-
-# mpeltonen/sbt-idea plugin
-.idea_modules/
-
-# JIRA plugin
-atlassian-ide-plugin.xml
-
-# Crashlytics plugin (for Android Studio and IntelliJ)
-com_crashlytics_export_strings.xml
-crashlytics.properties
-crashlytics-build.properties
-fabric.properties
-
+.idea/
diff --git a/.idea/docker-php-dev.iml b/.idea/docker-php-dev.iml
deleted file mode 100644
index 71ba373..0000000
--- a/.idea/docker-php-dev.iml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4">
-  <component name="NewModuleRootManager">
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module-library">
-      <library name="PHP Runtime" type="php">
-        <CLASSES>
-          <root url="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/standard" />
-        </CLASSES>
-        <SOURCES>
-          <root url="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/standard" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index e5e9232..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/docker-php-dev.iml" filepath="$PROJECT_DIR$/.idea/docker-php-dev.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 94a25f7..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file

From cddd0dcfbc79334d9f8ebedb234fef8f264c4ee6 Mon Sep 17 00:00:00 2001
From: Dan Kempster <me@dankempster.co.uk>
Date: Sun, 22 Jan 2017 21:35:28 +0000
Subject: [PATCH 2/2] Test build on Travis CI

---
 .travis.yml | 18 ++++++++++++++++++
 test.sh     | 19 +++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 .travis.yml
 create mode 100644 test.sh

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..1fe91e5
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,18 @@
+language: php
+php:
+  - 7.0
+
+services:
+  - docker
+
+install:
+  - docker build -t php .
+
+script:
+  - bash ./test.sh php
+
+branches:
+  only:
+    - alpine
+    - /^(latest|fpm)(-alpine)?$/
+    - /^[0-9.]+(-(latest|fpm))?(-alpine)?$/
diff --git a/test.sh b/test.sh
new file mode 100644
index 0000000..8ee9f08
--- /dev/null
+++ b/test.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+if [ $# = 0 ]; then
+    echo "USAGE: test.sh image-name";
+    echo ""
+    echo " - image-name: Name of docker image to run tests against"
+    exit 1
+fi
+
+set -x
+
+# PHP is avaialble
+docker run --rm "$1" php -v
+# Xdebug is installed
+docker run --rm "$1" php -i | grep "xdebug support"
+# Xdebug is enabled
+docker run --rm "$1" php -i | grep "xdebug support => enabled"
+# error_reporting = E_ALL
+docker run --rm "$1" php -i | grep "error_reporting => 32767"