From db1a7cdbbc2258fb9ab4c0e7299935516ff1f07a Mon Sep 17 00:00:00 2001
From: Takafumi Enomoto <enomoto.dev@gmail.com>
Date: Mon, 22 Jul 2019 23:28:39 +0900
Subject: [PATCH 1/3] Add memcached extension support for PHP 7.3 (#2195)

---
 php-fpm/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index ab6ba6b0..cab7a838 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -353,7 +353,7 @@ RUN if [ ${INSTALL_MEMCACHED} = true ]; then \
     if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
       curl -L -o /tmp/memcached.tar.gz "https://github.com/php-memcached-dev/php-memcached/archive/2.2.0.tar.gz"; \
     else \
-      curl -L -o /tmp/memcached.tar.gz "https://github.com/php-memcached-dev/php-memcached/archive/php7.tar.gz"; \
+      curl -L -o /tmp/memcached.tar.gz "https://github.com/php-memcached-dev/php-memcached/archive/master.tar.gz"; \
     fi \
     && mkdir -p memcached \
     && tar -C memcached -zxvf /tmp/memcached.tar.gz --strip 1 \

From 69aa0b2b6a64a44659c815742039a9e24612b1a7 Mon Sep 17 00:00:00 2001
From: Yuqi Hao <45658979+haoyq02@users.noreply.github.com>
Date: Mon, 22 Jul 2019 22:29:37 +0800
Subject: [PATCH 2/3] fix:laravel-horizon (#2181)

---
 docker-compose.yml         | 1 +
 laravel-horizon/Dockerfile | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index 86dfda7a..69b5dc69 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -245,6 +245,7 @@ services:
           - INSTALL_PGSQL=${PHP_FPM_INSTALL_PGSQL}
           - INSTALL_BCMATH=${PHP_FPM_INSTALL_BCMATH}
           - INSTALL_MEMCACHED=${PHP_FPM_INSTALL_MEMCACHED}
+          - INSTALL_AMQP=${PHP_FPM_INSTALL_AMQP}
       volumes:
         - ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}
         - ./laravel-horizon/supervisord.d:/etc/supervisord.d
diff --git a/laravel-horizon/Dockerfile b/laravel-horizon/Dockerfile
index f21dfdde..e89468e8 100644
--- a/laravel-horizon/Dockerfile
+++ b/laravel-horizon/Dockerfile
@@ -32,6 +32,12 @@ RUN if [ ${INSTALL_BCMATH} = true ]; then \
   docker-php-ext-install bcmath \
   ;fi
 
+#Install Sockets package:
+ARG INSTALL_AMQP=false
+RUN if [ ${INSTALL_AMQP} = true ]; then \
+  docker-php-ext-install sockets \
+  ;fi
+
 # Install PostgreSQL drivers:
 ARG INSTALL_PGSQL=false
 RUN if [ ${INSTALL_PGSQL} = true ]; then \

From 3a4c9158d26ef8a13bf5040762095a815bbc8481 Mon Sep 17 00:00:00 2001
From: Marco Manieri <marco@italiatekno.it>
Date: Mon, 22 Jul 2019 16:31:46 +0200
Subject: [PATCH 3/3] Cannot load Xdebug - it was already loaded (#2123)

zend_extension=xdebug.so is already in /etc/php/7.2/cli/conf.d/20-xdebug.ini

rediefing the alias causes the was already loaded notice.

also /var/www/vendor/bin/phpunit instead of ./vendor/bin/phpunit breaks the alias when vendor directory is not directly under the root app directory
---
 workspace/Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index 3a07eee2..bdc0349f 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -314,8 +314,7 @@ ARG INSTALL_XDEBUG=false
 RUN if [ ${INSTALL_XDEBUG} = true ]; then \
     # Load the xdebug extension only with phpunit commands
     apt-get install -y php${LARADOCK_PHP_VERSION}-xdebug && \
-    sed -i 's/^;//g' /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/20-xdebug.ini && \
-    echo "alias phpunit='php -dzend_extension=xdebug.so /var/www/vendor/bin/phpunit'" >> ~/.bashrc \
+    sed -i 's/^;//g' /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/20-xdebug.ini \
 ;fi
 
 # ADD for REMOTE debugging