From d27ebcf0c61d65b2f0a329c10f2d9e4062822fae Mon Sep 17 00:00:00 2001 From: Dawid Parafinski Date: Fri, 28 Aug 2026 11:36:50 +0200 Subject: [PATCH 1/5] Used the PHP Behat configuration as behat.php when the edition ships one --- bin/6.0.x-dev/prepare_project_edition.sh | 6 +++++- bin/stable/prepare_project_edition.sh | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/bin/6.0.x-dev/prepare_project_edition.sh b/bin/6.0.x-dev/prepare_project_edition.sh index 9fbf260..7e973a1 100755 --- a/bin/6.0.x-dev/prepare_project_edition.sh +++ b/bin/6.0.x-dev/prepare_project_edition.sh @@ -160,7 +160,11 @@ echo "> Display composer.json for debugging" cat composer.json # Create a default Behat configuration file -cp "behat_ibexa_${PROJECT_EDITION}.yaml" behat.yaml +if [ -f "behat_ibexa_${PROJECT_EDITION}.php" ]; then + cp "behat_ibexa_${PROJECT_EDITION}.php" behat.php +else + cp "behat_ibexa_${PROJECT_EDITION}.yaml" behat.yaml +fi # Depenencies are installed and container can be removed docker container stop install_dependencies diff --git a/bin/stable/prepare_project_edition.sh b/bin/stable/prepare_project_edition.sh index 65d6374..6f17b6d 100755 --- a/bin/stable/prepare_project_edition.sh +++ b/bin/stable/prepare_project_edition.sh @@ -101,7 +101,11 @@ fi sudo sed -i "s/\['test' => true\]/\['test' => true, 'behat' => true\]/g" config/bundles.php # Create a default Behat configuration file -cp "behat_ibexa_${PROJECT_EDITION}.yaml" behat.yaml +if [ -f "behat_ibexa_${PROJECT_EDITION}.php" ]; then + cp "behat_ibexa_${PROJECT_EDITION}.php" behat.php +else + cp "behat_ibexa_${PROJECT_EDITION}.yaml" behat.yaml +fi # Depenencies are installed and container can be removed docker container stop install_dependencies From e91a2d20f59203ebf9823d63faa66040243adf72 Mon Sep 17 00:00:00 2001 From: Dawid Parafinski Date: Fri, 28 Aug 2026 11:37:27 +0200 Subject: [PATCH 2/5] Fixed missing semicolon before then in the valkey branch of the 6.0 prepare script --- bin/6.0.x-dev/prepare_project_edition.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/6.0.x-dev/prepare_project_edition.sh b/bin/6.0.x-dev/prepare_project_edition.sh index 7e973a1..b37f9ae 100755 --- a/bin/6.0.x-dev/prepare_project_edition.sh +++ b/bin/6.0.x-dev/prepare_project_edition.sh @@ -206,7 +206,7 @@ fi if [[ "$COMPOSE_FILE" == *"redis"*.yml ]]; then echo '> Display SPI (Redis) version for debugging' docker exec ibexa-redis-1 sh -c "redis-cli --version" -elif [[ "$COMPOSE_FILE" == *"valkey"*.yml ]] then +elif [[ "$COMPOSE_FILE" == *"valkey"*.yml ]]; then echo '> Display SPI (Valkey) version for debugging' docker exec valkey sh -c "valkey-cli --version" fi From 9551da507b161dcae419cdadf1f16db90085bb90 Mon Sep 17 00:00:00 2001 From: Dawid Parafinski Date: Fri, 28 Aug 2026 11:51:26 +0200 Subject: [PATCH 3/5] [TEMP] Listed Behat configuration files after copying --- bin/6.0.x-dev/prepare_project_edition.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bin/6.0.x-dev/prepare_project_edition.sh b/bin/6.0.x-dev/prepare_project_edition.sh index b37f9ae..7150cc5 100755 --- a/bin/6.0.x-dev/prepare_project_edition.sh +++ b/bin/6.0.x-dev/prepare_project_edition.sh @@ -165,6 +165,9 @@ if [ -f "behat_ibexa_${PROJECT_EDITION}.php" ]; then else cp "behat_ibexa_${PROJECT_EDITION}.yaml" behat.yaml fi +echo '> Behat configuration files in the project root (debug)' +ls -la behat* config/behat* 2>/dev/null || true +head -n 12 behat.php 2>/dev/null || true # Depenencies are installed and container can be removed docker container stop install_dependencies From ebd19752a8f1f0ecd280a446c40e9a3e919790ff Mon Sep 17 00:00:00 2001 From: Dawid Parafinski Date: Fri, 28 Aug 2026 11:58:26 +0200 Subject: [PATCH 4/5] Removed recipe-provided Behat configuration files before creating behat.php --- bin/6.0.x-dev/prepare_project_edition.sh | 6 +++--- bin/stable/prepare_project_edition.sh | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/bin/6.0.x-dev/prepare_project_edition.sh b/bin/6.0.x-dev/prepare_project_edition.sh index 7150cc5..3ce9403 100755 --- a/bin/6.0.x-dev/prepare_project_edition.sh +++ b/bin/6.0.x-dev/prepare_project_edition.sh @@ -160,14 +160,14 @@ echo "> Display composer.json for debugging" cat composer.json # Create a default Behat configuration file +# Remove Behat configuration files added by recipes (e.g. behat.yml.dist from friends-of-behat/symfony-extension), +# they take precedence over behat.php in Behat's configuration discovery +rm -f behat.yaml behat.yml behat.yaml.dist behat.yml.dist behat.dist.yaml behat.dist.yml behat.php behat.dist.php if [ -f "behat_ibexa_${PROJECT_EDITION}.php" ]; then cp "behat_ibexa_${PROJECT_EDITION}.php" behat.php else cp "behat_ibexa_${PROJECT_EDITION}.yaml" behat.yaml fi -echo '> Behat configuration files in the project root (debug)' -ls -la behat* config/behat* 2>/dev/null || true -head -n 12 behat.php 2>/dev/null || true # Depenencies are installed and container can be removed docker container stop install_dependencies diff --git a/bin/stable/prepare_project_edition.sh b/bin/stable/prepare_project_edition.sh index 6f17b6d..ee86df9 100755 --- a/bin/stable/prepare_project_edition.sh +++ b/bin/stable/prepare_project_edition.sh @@ -101,6 +101,9 @@ fi sudo sed -i "s/\['test' => true\]/\['test' => true, 'behat' => true\]/g" config/bundles.php # Create a default Behat configuration file +# Remove Behat configuration files added by recipes (e.g. behat.yml.dist from friends-of-behat/symfony-extension), +# they take precedence over behat.php in Behat's configuration discovery +rm -f behat.yaml behat.yml behat.yaml.dist behat.yml.dist behat.dist.yaml behat.dist.yml behat.php behat.dist.php if [ -f "behat_ibexa_${PROJECT_EDITION}.php" ]; then cp "behat_ibexa_${PROJECT_EDITION}.php" behat.php else From 9d12dd6ef33e4c4819be4509c5d8906e3edf8695 Mon Sep 17 00:00:00 2001 From: Dawid Parafinski Date: Fri, 28 Aug 2026 11:58:44 +0200 Subject: [PATCH 5/5] Fixed missing semicolon before then in the valkey branch of the stable prepare script --- bin/stable/prepare_project_edition.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/stable/prepare_project_edition.sh b/bin/stable/prepare_project_edition.sh index ee86df9..ff48133 100755 --- a/bin/stable/prepare_project_edition.sh +++ b/bin/stable/prepare_project_edition.sh @@ -149,7 +149,7 @@ fi if [[ "$COMPOSE_FILE" == *"redis"*.yml ]]; then echo '> Display SPI (Redis) version for debugging' docker exec ibexa-redis-1 sh -c "redis-cli --version" -elif [[ "$COMPOSE_FILE" == *"valkey"*.yml ]] then +elif [[ "$COMPOSE_FILE" == *"valkey"*.yml ]]; then echo '> Display SPI (Valkey) version for debugging' docker exec valkey sh -c "valkey-cli --version" fi