Use composer v1 for PHP 5.3

cytopia · cytopia · commit ee7b55fc0fa1 · 2022-03-30T13:59:08.000+02:00
diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3
@@ -157,7 +157,8 @@ RUN set -eux \
 && curl -sS -L --fail https://getcomposer.org/composer-2.phar > /usr/local/bin/composer-2 \
 && chmod +x /usr/local/bin/composer-1 \
 && chmod +x /usr/local/bin/composer-2 \
-&& ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \
+ \
+	&& ln -sf /usr/local/bin/composer-1 /usr/local/bin/composer \
  \
 	\
 # -------------------- pip --------------------
diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4
@@ -157,7 +157,8 @@ RUN set -eux \
 && curl -sS -L --fail https://getcomposer.org/composer-2.phar > /usr/local/bin/composer-2 \
 && chmod +x /usr/local/bin/composer-1 \
 && chmod +x /usr/local/bin/composer-2 \
-&& ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \
+ \
+	&& ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \
  \
 	\
 # -------------------- pip --------------------
diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5
@@ -157,7 +157,8 @@ RUN set -eux \
 && curl -sS -L --fail https://getcomposer.org/composer-2.phar > /usr/local/bin/composer-2 \
 && chmod +x /usr/local/bin/composer-1 \
 && chmod +x /usr/local/bin/composer-2 \
-&& ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \
+ \
+	&& ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \
  \
 	\
 # -------------------- pip --------------------
diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6
@@ -159,7 +159,8 @@ RUN set -eux \
 && curl -sS -L --fail https://getcomposer.org/composer-2.phar > /usr/local/bin/composer-2 \
 && chmod +x /usr/local/bin/composer-1 \
 && chmod +x /usr/local/bin/composer-2 \
-&& ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \
+ \
+	&& ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \
  \
 	\
 # -------------------- pip --------------------
diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0
@@ -159,7 +159,8 @@ RUN set -eux \
 && curl -sS -L --fail https://getcomposer.org/composer-2.phar > /usr/local/bin/composer-2 \
 && chmod +x /usr/local/bin/composer-1 \
 && chmod +x /usr/local/bin/composer-2 \
-&& ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \
+ \
+	&& ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \
  \
 	\
 # -------------------- pip --------------------
diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1
@@ -158,7 +158,8 @@ RUN set -eux \
 && curl -sS -L --fail https://getcomposer.org/composer-2.phar > /usr/local/bin/composer-2 \
 && chmod +x /usr/local/bin/composer-1 \
 && chmod +x /usr/local/bin/composer-2 \
-&& ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \
+ \
+	&& ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \
  \
 	\
 # -------------------- pip --------------------
diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2
@@ -158,7 +158,8 @@ RUN set -eux \
 && curl -sS -L --fail https://getcomposer.org/composer-2.phar > /usr/local/bin/composer-2 \
 && chmod +x /usr/local/bin/composer-1 \
 && chmod +x /usr/local/bin/composer-2 \
-&& ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \
+ \
+	&& ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \
  \
 	\
 # -------------------- pip --------------------
diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3
@@ -158,7 +158,8 @@ RUN set -eux \
 && curl -sS -L --fail https://getcomposer.org/composer-2.phar > /usr/local/bin/composer-2 \
 && chmod +x /usr/local/bin/composer-1 \
 && chmod +x /usr/local/bin/composer-2 \
-&& ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \
+ \
+	&& ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \
  \
 	\
 # -------------------- pip --------------------
diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4
@@ -158,7 +158,8 @@ RUN set -eux \
 && curl -sS -L --fail https://getcomposer.org/composer-2.phar > /usr/local/bin/composer-2 \
 && chmod +x /usr/local/bin/composer-1 \
 && chmod +x /usr/local/bin/composer-2 \
-&& ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \
+ \
+	&& ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \
  \
 	\
 # -------------------- pip --------------------
diff --git a/Dockerfiles/work/Dockerfile-8.0 b/Dockerfiles/work/Dockerfile-8.0
@@ -158,7 +158,8 @@ RUN set -eux \
 && curl -sS -L --fail https://getcomposer.org/composer-2.phar > /usr/local/bin/composer-2 \
 && chmod +x /usr/local/bin/composer-1 \
 && chmod +x /usr/local/bin/composer-2 \
-&& ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \
+ \
+	&& ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \
  \
 	\
 # -------------------- pip --------------------
diff --git a/Dockerfiles/work/Dockerfile-8.1 b/Dockerfiles/work/Dockerfile-8.1
@@ -158,7 +158,8 @@ RUN set -eux \
 && curl -sS -L --fail https://getcomposer.org/composer-2.phar > /usr/local/bin/composer-2 \
 && chmod +x /usr/local/bin/composer-1 \
 && chmod +x /usr/local/bin/composer-2 \
-&& ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \
+ \
+	&& ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \
  \
 	\
 # -------------------- pip --------------------
diff --git a/Dockerfiles/work/Dockerfile-8.2 b/Dockerfiles/work/Dockerfile-8.2
@@ -158,7 +158,8 @@ RUN set -eux \
 && curl -sS -L --fail https://getcomposer.org/composer-2.phar > /usr/local/bin/composer-2 \
 && chmod +x /usr/local/bin/composer-1 \
 && chmod +x /usr/local/bin/composer-2 \
-&& ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \
+ \
+	&& ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \
  \
 	\
 # -------------------- pip --------------------
diff --git a/build/ansible/group_vars/all/work.yml b/build/ansible/group_vars/all/work.yml
@@ -415,13 +415,17 @@ software_available:
   composer:
     disabled: [5.2]
     check: composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+'
+    5.3:
+      post: |
+        ln -sf /usr/local/bin/composer-1 /usr/local/bin/composer \
     all:
       command: |
         curl -sS -L --fail https://getcomposer.org/composer-1.phar > /usr/local/bin/composer-1 \
         && curl -sS -L --fail https://getcomposer.org/composer-2.phar > /usr/local/bin/composer-2 \
         && chmod +x /usr/local/bin/composer-1 \
         && chmod +x /usr/local/bin/composer-2 \
-        && ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \
+      post: |
+        ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \
   # pip is a dependency for others
   pip:
     5.2:

Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,8 @@ RUN set -eux \`
`157`	`157`	`&& curl -sS -L --fail https://getcomposer.org/composer-2.phar > /usr/local/bin/composer-2 \`
`158`	`158`	`&& chmod +x /usr/local/bin/composer-1 \`
`159`	`159`	`&& chmod +x /usr/local/bin/composer-2 \`
`160`		`-&& ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \`
	`160`	`+ \`
	`161`	`+ && ln -sf /usr/local/bin/composer-1 /usr/local/bin/composer \`
`161`	`162`	`\`
`162`	`163`	`\`
`163`	`164`	`# -------------------- pip --------------------`
Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,8 @@ RUN set -eux \`
`159`	`159`	`&& curl -sS -L --fail https://getcomposer.org/composer-2.phar > /usr/local/bin/composer-2 \`
`160`	`160`	`&& chmod +x /usr/local/bin/composer-1 \`
`161`	`161`	`&& chmod +x /usr/local/bin/composer-2 \`
`162`		`-&& ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \`
	`162`	`+ \`
	`163`	`+ && ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \`
`163`	`164`	`\`
`164`	`165`	`\`
`165`	`166`	`# -------------------- pip --------------------`
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,8 @@ RUN set -eux \`
`158`	`158`	`&& curl -sS -L --fail https://getcomposer.org/composer-2.phar > /usr/local/bin/composer-2 \`
`159`	`159`	`&& chmod +x /usr/local/bin/composer-1 \`
`160`	`160`	`&& chmod +x /usr/local/bin/composer-2 \`
`161`		`-&& ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \`
	`161`	`+ \`
	`162`	`+ && ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \`
`162`	`163`	`\`
`163`	`164`	`\`
`164`	`165`	`# -------------------- pip --------------------`