From 56799dbd1e7bb614716da770d95ac40d9b33bad3 Mon Sep 17 00:00:00 2001
From: Valeriy <nicemrlexx@live.ru>
Date: Wed, 5 Oct 2022 17:06:53 +0300
Subject: [PATCH] phalcon currently disabled for 7.4 as it breaks (from
 mods.yml)

---
 Dockerfiles/work/Dockerfile-7.4       | 15 ---------------
 build/ansible/group_vars/all/work.yml |  2 +-
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4
index fdd3b05c..b18e6055 100644
--- a/Dockerfiles/work/Dockerfile-7.4
+++ b/Dockerfiles/work/Dockerfile-7.4
@@ -327,20 +327,6 @@ fi \
 && 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) \
-&& COMPOSER_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 \
 && chmod +x /usr/local/bin/phpcs \
@@ -777,7 +763,6 @@ fi \
 	&& laravel --version | grep -E '(Installer|version)\s*[0-9][.0-9]+' \
 	&& linkcheck --version | grep -E '^linkcheck\sv[0-9][.0-9]+' \
 	&& mysqldump-secure --version | grep -E 'Version:\s*[0-9][.0-9]+' \
-	&& phalcon commands | grep -E '[0-9][.0-9]+' \
 	&& phpcs --version | grep -E 'version [0-9][.0-9]+' \
 	&& phpcbf --version | grep -E 'version [0-9][.0-9]+' \
 	&& php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' \
diff --git a/build/ansible/group_vars/all/work.yml b/build/ansible/group_vars/all/work.yml
index 08315ea2..46d83904 100644
--- a/build/ansible/group_vars/all/work.yml
+++ b/build/ansible/group_vars/all/work.yml
@@ -1111,7 +1111,7 @@ software_available:
         && cd / \
         && rm -rf /usr/local/src/mysqldump-secure \
   phalcon:
-    disabled: [5.2, 8.0, 8.1, 8.2]
+    disabled: [5.2, 7.4, 8.0, 8.1, 8.2] # TODO: currently disabled for 7.4 as it breaks (from mods.yml)
     check: phalcon commands | grep -E '[0-9][.0-9]+'
     5.3:
       pre: |