From 6de839e984a3cd681957d952dd6045c763985f38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toma=CC=81s=CC=8C=20Ludvik?= Date: Fri, 27 Sep 2024 13:22:35 +0200 Subject: [PATCH] fixed downloading phing.phar in project named project-base --- app/app/downloadPhing.php | 2 +- app/check-composer-json.sh | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/app/downloadPhing.php b/app/app/downloadPhing.php index 49b8e5eeb4..fee35f23b7 100644 --- a/app/app/downloadPhing.php +++ b/app/app/downloadPhing.php @@ -14,7 +14,7 @@ use Symfony\Component\Console\Output\ConsoleOutput; return static function () { - if (str_contains(__DIR__, 'project-base')) { + if (file_exists(__DIR__ . '/../../../parameters_monorepo.yaml')) { $vendorDir = __DIR__ . '/../../../vendor'; } else { $vendorDir = __DIR__ . '/../vendor'; diff --git a/app/check-composer-json.sh b/app/check-composer-json.sh index 1af75152cf..e4b239ae42 100755 --- a/app/check-composer-json.sh +++ b/app/check-composer-json.sh @@ -1,5 +1,10 @@ #!/bin/bash +if [ -f "../../parameters_monorepo.yaml" ]; then + echo 'Installing composer in monorepo project-base is not supported.' + exit 1 +fi + if [ -h "composer.json" ]; then echo 'Please run composer install in the app/ subfolder.' exit 1