From 78af92f6292814c1f61e93182fe85c8c39343445 Mon Sep 17 00:00:00 2001
From: Leonid Makarov <leonid.makarov@ffwagency.com>
Date: Wed, 21 Apr 2021 15:02:21 -0700
Subject: [PATCH] Dropped mg2-codegen (#222)

---
 7.3/Dockerfile  | 5 -----
 7.4/Dockerfile  | 5 -----
 8.0/Dockerfile  | 5 +----
 tests/test.bats | 8 --------
 4 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/7.3/Dockerfile b/7.3/Dockerfile
index 48d42a84..67de0117 100644
--- a/7.3/Dockerfile
+++ b/7.3/Dockerfile
@@ -321,7 +321,6 @@ SHELL ["/bin/bash", "-c"]
 # PHP tools (installed as user)
 # Note: DRUSH_BACKDROP_VERSION should be pinned at 1.2.0 as 1.3.0 introduces changes that break regular drush 8.
 ENV \
-	MG_CODEGEN_VERSION=1.11.2 \
 	DRUSH_BACKDROP_VERSION=1.2.0
 # Don't use -x here, as the output may be excessive
 RUN set -e; \
@@ -345,10 +344,6 @@ $HOME/.composer/vendor/phpcompatibility/phpcompatibility-paragonie/PHPCompatibil
 	# Install cgr to use it in-place of `composer global require` for misc globally installed cli tools.
 	# See https://pantheon.io/blog/fixing-composer-global-command
 	composer global require consolidation/cgr >/dev/null; \
-	# Magento2 Code Generator
-	# Cannot be properly installed and used as a phar binary
-	# See https://github.com/staempfli/magento2-code-generator/issues/11
-	cgr staempfli/magento2-code-generator:${MG_CODEGEN_VERSION} >/dev/null; \
 	# Cleanup
 	composer clear-cache; \
 	\
diff --git a/7.4/Dockerfile b/7.4/Dockerfile
index f60d41a3..d2c0aff7 100644
--- a/7.4/Dockerfile
+++ b/7.4/Dockerfile
@@ -321,7 +321,6 @@ SHELL ["/bin/bash", "-c"]
 # PHP tools (installed as user)
 # Note: DRUSH_BACKDROP_VERSION should be pinned at 1.2.0 as 1.3.0 introduces changes that break regular drush 8.
 ENV \
-	MG_CODEGEN_VERSION=1.11.2 \
 	DRUSH_BACKDROP_VERSION=1.2.0
 # Don't use -x here, as the output may be excessive
 RUN set -e; \
@@ -345,10 +344,6 @@ $HOME/.composer/vendor/phpcompatibility/phpcompatibility-paragonie/PHPCompatibil
 	# Install cgr to use it in-place of `composer global require` for misc globally installed cli tools.
 	# See https://pantheon.io/blog/fixing-composer-global-command
 	composer global require consolidation/cgr >/dev/null; \
-	# Magento2 Code Generator
-	# Cannot be properly installed and used as a phar binary
-	# See https://github.com/staempfli/magento2-code-generator/issues/11
-	cgr staempfli/magento2-code-generator:${MG_CODEGEN_VERSION} >/dev/null; \
 	# Cleanup
 	composer clear-cache; \
 	\
diff --git a/8.0/Dockerfile b/8.0/Dockerfile
index 817dce42..f18fc89b 100644
--- a/8.0/Dockerfile
+++ b/8.0/Dockerfile
@@ -261,7 +261,6 @@ ENV COMPOSER_DEFAULT_VERSION=2 \
 	TERMINUS_VERSION=2.4.1 \
 	JQ_VERSION=1.6 \
 	YQ_VERSION=3.4.1 \
-	MG_CODEGEN_VERSION=1.11.2
 RUN set -xe; \
 	# Composer 1.x
 	curl -fsSL "https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar" -o /usr/local/bin/composer1; \
@@ -290,12 +289,10 @@ RUN set -xe; \
 	fi; \
 	# yq
 	curl -fsSL "https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_${TARGETARCH}" -o /usr/local/bin/yq; \
-	# mg2-codegen
-	curl -fsSL "https://github.com/staempfli/magento2-code-generator/releases/download/${MG_CODEGEN_VERSION}/mg2-codegen.phar" -o /usr/local/bin/mg2-codegen; \
 	# Set Default Composer Version
 	ln -s /usr/local/bin/composer${COMPOSER_DEFAULT_VERSION} /usr/local/bin/composer; \
 	# Make all downloaded binaries executable in one shot
-	(cd /usr/local/bin && chmod +x composer1 composer2 drush8 drush drupal wp blackfire platform acli terminus yq mg2-codegen);
+	(cd /usr/local/bin && chmod +x composer1 composer2 drush8 drush drupal wp blackfire platform acli terminus yq);
 
 # Install Python3 from Debian repos
 # This adds about 30MB to uncompressed image size.
diff --git a/tests/test.bats b/tests/test.bats
index 41f7ab6e..e26488f8 100755
--- a/tests/test.bats
+++ b/tests/test.bats
@@ -226,14 +226,6 @@ _healthcheck_wait ()
 	[[ ${status} == 0 ]]
 	unset output
 
-	# Check Magento 2 Code Generator version
-	# TODO: this needs to be replaced with the actual version check
-	# See https://github.com/staempfli/magento2-code-generator/issues/15
-	#run docker exec -u docker "$NAME" bash -lc 'mg2-codegen --version | grep "^mg2-codegen ${MG_CODEGEN_VERSION}$"'
-	run docker exec -u docker "$NAME" bash -lc 'set -x; mg2-codegen --version | grep "^mg2-codegen @git-version@$"'
-	[[ ${status} == 0 ]]
-	unset output
-
 	# Check Terminus version
 	run docker exec -u docker "$NAME" bash -lc 'set -x; terminus --version | grep "^Terminus ${TERMINUS_VERSION}$"'
 	[[ ${status} == 0 ]]