From 982dd44701bc2c92aaa44ce37cf211ff38b30688 Mon Sep 17 00:00:00 2001
From: cytopia <cytopia@everythingcli.org>
Date: Tue, 4 Feb 2020 18:13:22 +0100
Subject: [PATCH] Add phalcon binary to PHP 7.3 and 7.4

---
 Dockerfiles/work/Dockerfile-7.3       | 15 +++++++++++++++
 Dockerfiles/work/Dockerfile-7.4       | 15 +++++++++++++++
 build/ansible/group_vars/all/work.yml |  2 +-
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3
index d658466..342ac24 100644
--- a/Dockerfiles/work/Dockerfile-7.3
+++ b/Dockerfiles/work/Dockerfile-7.3
@@ -282,6 +282,20 @@ RUN set -eux \
 && rm -rf /usr/local/src/mysqldump-secure \
  \
 	\
+# -------------------- phalcon --------------------
+	&& git clone https://github.com/phalcon/phalcon-devtools /usr/local/src/phalcon-devtools \
+&& cd /usr/local/src/phalcon-devtools \
+&& git checkout $(git describe --abbrev=0 --tags) \
+&& php -d memory_limit=-1 /usr/local/bin/composer install \
+ \
+	&& chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/phalcon-devtools \
+&& su - ${MY_USER} -c 'cd /usr/local/src/phalcon-devtools && ./phalcon.sh' \
+&& ln -sf /usr/local/src/phalcon-devtools/phalcon /usr/local/bin/phalcon \
+&& chmod +x phalcon \
+&& cd / \
+&& rm -rf /usr/local/src/phalcon-devtools/.git \
+ \
+	\
 # -------------------- phpcs --------------------
 	&& curl -sS -L --fail https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar > /usr/local/bin/phpcs 2>/dev/null \
 && chmod +x /usr/local/bin/phpcs \
@@ -560,6 +574,7 @@ RUN set -eux \
 	&& linkcheck --version | grep -E '^linkcheck\sv[.0-9]+' \
 	&& su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[.0-9]+' \
 	&& mysqldump-secure --version | grep -E 'Version:\s*[.0-9]+' \
+	&& phalcon commands | grep -E '[.0-9]+' \
 	&& phpcs --version | grep -E 'version [.0-9]+' \
 	&& phpcbf --version | grep -E 'version [.0-9]+' \
 	&& php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' \
diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4
index e5b809d..eaf2959 100644
--- a/Dockerfiles/work/Dockerfile-7.4
+++ b/Dockerfiles/work/Dockerfile-7.4
@@ -282,6 +282,20 @@ RUN set -eux \
 && rm -rf /usr/local/src/mysqldump-secure \
  \
 	\
+# -------------------- phalcon --------------------
+	&& git clone https://github.com/phalcon/phalcon-devtools /usr/local/src/phalcon-devtools \
+&& cd /usr/local/src/phalcon-devtools \
+&& git checkout $(git describe --abbrev=0 --tags) \
+&& php -d memory_limit=-1 /usr/local/bin/composer install \
+ \
+	&& chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/phalcon-devtools \
+&& su - ${MY_USER} -c 'cd /usr/local/src/phalcon-devtools && ./phalcon.sh' \
+&& ln -sf /usr/local/src/phalcon-devtools/phalcon /usr/local/bin/phalcon \
+&& chmod +x phalcon \
+&& cd / \
+&& rm -rf /usr/local/src/phalcon-devtools/.git \
+ \
+	\
 # -------------------- phpcs --------------------
 	&& curl -sS -L --fail https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar > /usr/local/bin/phpcs 2>/dev/null \
 && chmod +x /usr/local/bin/phpcs \
@@ -555,6 +569,7 @@ RUN set -eux \
 	&& linkcheck --version | grep -E '^linkcheck\sv[.0-9]+' \
 	&& su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[.0-9]+' \
 	&& mysqldump-secure --version | grep -E 'Version:\s*[.0-9]+' \
+	&& phalcon commands | grep -E '[.0-9]+' \
 	&& phpcs --version | grep -E 'version [.0-9]+' \
 	&& phpcbf --version | grep -E 'version [.0-9]+' \
 	&& phpmd --version | grep -E '^PHPMD [.0-9]+' \
diff --git a/build/ansible/group_vars/all/work.yml b/build/ansible/group_vars/all/work.yml
index 92f06a3..b1d481e 100644
--- a/build/ansible/group_vars/all/work.yml
+++ b/build/ansible/group_vars/all/work.yml
@@ -599,7 +599,7 @@ software_available:
         && cd / \
         && rm -rf /usr/local/src/mysqldump-secure \
   phalcon:
-    disabled: [5.2, 7.3, 7.4, 8.0]
+    disabled: [5.2, 8.0]
     check: phalcon commands | grep -E '[.0-9]+'
     5.3:
       pre: |