From ec6be35112066d24054325de2e96f89f319634d9 Mon Sep 17 00:00:00 2001
From: Paolo Cuffiani <paolo.cuffiani@gmail.com>
Date: Thu, 25 Oct 2018 22:21:02 +0200
Subject: [PATCH] #45 feat: add dev images for PHP 7.3

---
 .travis.yml               | 6 +++---
 dev/7.3/Dockerfile        | 6 ++++++
 dev/7.3/apache/Dockerfile | 6 ++++++
 dev/7.3/fpm/Dockerfile    | 6 ++++++
 dev/Makefile              | 4 ++--
 dev/README.md             | 5 ++++-
 6 files changed, 27 insertions(+), 6 deletions(-)
 create mode 100644 dev/7.3/Dockerfile
 create mode 100644 dev/7.3/apache/Dockerfile
 create mode 100644 dev/7.3/fpm/Dockerfile

diff --git a/.travis.yml b/.travis.yml
index 81a1d28..ef5b805 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,9 +25,9 @@ env:
   - VERSION=7.2
   - VERSION=7.2-apache
   - VERSION=7.2-fpm
-  - VERSION=7.3 NO_DEV=1
-  - VERSION=7.3-apache NO_DEV=1
-  - VERSION=7.3-fpm NO_DEV=1
+  - VERSION=7.3
+  - VERSION=7.3-apache
+  - VERSION=7.3-fpm
 
 install:
 - travis_wait 30 make build VERSION=${VERSION}
diff --git a/dev/7.3/Dockerfile b/dev/7.3/Dockerfile
new file mode 100644
index 0000000..f5ed42b
--- /dev/null
+++ b/dev/7.3/Dockerfile
@@ -0,0 +1,6 @@
+FROM chialab/php:7.3
+LABEL maintainer="dev@chialab.io"
+
+# Install XDebug.
+RUN pecl install xdebug-2.7.0beta1 \
+    && echo "zend_extension=\"$(php-config --extension-dir)/xdebug.so\"" > $PHP_INI_DIR/conf.d/xdebug.ini
diff --git a/dev/7.3/apache/Dockerfile b/dev/7.3/apache/Dockerfile
new file mode 100644
index 0000000..c941d16
--- /dev/null
+++ b/dev/7.3/apache/Dockerfile
@@ -0,0 +1,6 @@
+FROM chialab/php:7.3-apache
+LABEL maintainer="dev@chialab.io"
+
+# Install XDebug.
+RUN pecl install xdebug-2.7.0beta1 \
+    && echo "zend_extension=\"$(php-config --extension-dir)/xdebug.so\"" > $PHP_INI_DIR/conf.d/xdebug.ini
diff --git a/dev/7.3/fpm/Dockerfile b/dev/7.3/fpm/Dockerfile
new file mode 100644
index 0000000..7480a3c
--- /dev/null
+++ b/dev/7.3/fpm/Dockerfile
@@ -0,0 +1,6 @@
+FROM chialab/php:7.3-fpm
+LABEL maintainer="dev@chialab.io"
+
+# Install XDebug.
+RUN pecl install xdebug-2.7.0beta1 \
+    && echo "zend_extension=\"$(php-config --extension-dir)/xdebug.so\"" > $PHP_INI_DIR/conf.d/xdebug.ini
diff --git a/dev/Makefile b/dev/Makefile
index 344882d..7fbcfa9 100644
--- a/dev/Makefile
+++ b/dev/Makefile
@@ -27,11 +27,11 @@ EXTENSIONS := \
 	soap \
 	Xdebug \
 	zip
-ifeq (,$(findstring $(PHP_VERSION), 7.2 latest))
+ifeq (,$(findstring $(PHP_VERSION), 7.2 7.3 latest))
 	# Add more extensions to PHP < 7.2.
 	EXTENSIONS += mcrypt
 endif
-ifeq (,$(findstring $(PHP_VERSION), 7.0 7.1 7.2 latest))
+ifeq (,$(findstring $(PHP_VERSION), 7.0 7.1 7.2 7.3 latest))
 	# Add more extensions to 5.x series images.
 	EXTENSIONS += mysql
 endif
diff --git a/dev/README.md b/dev/README.md
index 6b5ea1a..58ea7f2 100644
--- a/dev/README.md
+++ b/dev/README.md
@@ -29,6 +29,9 @@ For more production-like environments, you might want to choose an [image *witho
 - [`7.2` (_dev/7.2/Dockerfile_)](https://github.com/Chialab/docker-php/blob/master/dev/7.2/Dockerfile)
 - [`7.2-apache` (_dev/7.2/apache/Dockerfile_)](https://github.com/Chialab/docker-php/blob/master/dev/7.2/apache/Dockerfile)
 - [`7.2-fpm` (_dev/7.2/fpm/Dockerfile_)](https://github.com/Chialab/docker-php/blob/master/dev/7.2/fpm/Dockerfile)
+- [`7.3` (_dev/7.3/Dockerfile_)](https://github.com/Chialab/docker-php/blob/master/dev/7.3/Dockerfile)
+- [`7.3-apache` (_dev/7.3/apache/Dockerfile_)](https://github.com/Chialab/docker-php/blob/master/dev/7.3/apache/Dockerfile)
+- [`7.3-fpm` (_dev/7.3/fpm/Dockerfile_)](https://github.com/Chialab/docker-php/blob/master/dev/7.3/fpm/Dockerfile)
 
 As you might have guessed, all tags are built on top of the corresponding tag of the official image. Not all tags are supported in order to easen manteinance.
 
@@ -45,7 +48,7 @@ in addition to those you can already find in the [official PHP image](https://hu
 - `gd`
 - `ldap`
 - `mbstring`
-- `mcrypt`
+- `mcrypt` (_only PHP ≤ 7.1_)
 - `memcached`
 - `mysql` (_only PHP 5.x_)
 - `mysqli`