fixed downloading phing.phar in project named project-base

shopsys · Sep 27, 2024 · 6de839e · 6de839e
1 parent abb3c9c
commit 6de839e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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