From 59217a3e533dc6ce8c1cdf9e4892e9279215d89d Mon Sep 17 00:00:00 2001 From: tomaszszopinski Date: Mon, 23 Jun 2025 13:35:33 +0200 Subject: [PATCH 01/53] first poc draft --- bin/5.0.x-dev/prepare_project_edition.sh | 84 +++++++++++++++++++++++- 1 file changed, 83 insertions(+), 1 deletion(-) diff --git a/bin/5.0.x-dev/prepare_project_edition.sh b/bin/5.0.x-dev/prepare_project_edition.sh index f5f9d92..c833435 100755 --- a/bin/5.0.x-dev/prepare_project_edition.sh +++ b/bin/5.0.x-dev/prepare_project_edition.sh @@ -2,7 +2,7 @@ set -e PROJECT_EDITION=$1 -PROJECT_VERSION=$2 +PROJECT_VERSION=5.0.x-dev PROJECT_BUILD_DIR=${HOME}/build/project export COMPOSE_FILE=$3 export PHP_IMAGE=${4-ghcr.io/ibexa/docker/php:8.3-node18} @@ -180,4 +180,86 @@ fi echo '> Generate GraphQL schema' docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:graphql:generate-schema" +######################################################################################################################## + +# Delete old GraphQL schema +docker compose rm -r config/graphql + +# Remove Stimulus bootstrap +docker compose rm assets/bootstrap.js +docker compose sed -i '/bootstrap/d' assets/app.js +docker compose sed -i '/start the Stimulus application/d' assets/app.js + +# Move from annotation to attribute +#docker compose sed -i 's/type: annotation/type: attribute/g' config/routes/annotations.yaml +docker compose rm config/routes/annotations.yaml +docker compose rm config/routes.yaml + +# TMP: Accept dev version (5.0.x-dev) +docker compose composer config minimum-stability dev; + +# Update required PHP version +docker compose composer require --no-update 'php:>=8.3'; +# Update required Symfony version +docker compose composer config extra.symfony.require '7.2.*' + +# Upgrade Ibexa and Symfony packages (main app) +docker compose composer require --no-update \ + ibexa/commerce:5.0.x-dev \ + symfony/console:^7.2 \ + symfony/dotenv:^7.2 \ + symfony/framework-bundle:^7.2 \ + symfony/runtime:^7.2 \ + symfony/yaml:^7.2 \ +; + +# TMP: admin-ui-assets and headless-assets need to be on a tag +docker compose composer require --no-update \ + ibexa/admin-ui-assets:v5.0.0-alpha5 \ + ibexa/headless-assets:v5.0.0-alpha4 \ +; + +# Upgrade Ibexa and Symfony packages (dev tools) +docker compose composer require --dev --no-update \ + ibexa/rector:5.0.x-dev \ + symfony/debug-bundle:^7.2 \ + symfony/stopwatch:^7.2 \ + symfony/web-profiler-bundle:^7.2 \ +; + +# Remove Php82HideDeprecationsErrorHandler +docker compose composer config --unset extra.runtime.error_handler + +# Update packages / Install new dependencies +docker compose composer update --with-all-dependencies --no-scripts --verbose + +# TMP: Move to development recipes +docker compose composer config extra.symfony.endpoint "https://api.github.com/repos/ibexa/recipes-dev/contents/index.json?ref=flex/main" +# Reset recipes +docker compose rm symfony.lock +# Run recipes +docker compose composer recipes:install ibexa/commerce --force --yes -v + +# Swap tsconfig.json usage and creation +docker compose perl -0pe 's/"ibexa:encore:compile": "symfony-cmd",\n "yarn ibexa-generate-tsconfig": "script"/"yarn ibexa-generate-tsconfig": "script",\n "ibexa:encore:compile": "symfony-cmd"/gms' -i composer.json + +# Manually clear cache to ensure scripts won't use a piece of it +docker compose rm -rf var/cache + +# A.k.a "auto-scripts" (mainly JS and assets stuffs) +docker compose composer run-script post-update-cmd + +# Database update +docker compose mysql < vendor/ibexa/installer/upgrade/db/mysql/ibexa-4.6.latest-to-5.0.0.sql +# LTS Update related schemas to inject only if the add-on was never installed +# keep an eye! +#ddev php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/collaboration/src/bundle/Resources/config/schema.yaml | ddev mysql +#ddev php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/share/src/bundle/Resources/config/schema.yaml | ddev mysql +#ddev php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/connector-ai/src/bundle/Resources/config/schema.yaml | ddev mysql + +# Generate new GraphQL schema if used (while admin-ui doesn't use it anymore) +docker compose composer require ibexa/graphql --no-interaction +docker compose php bin/console ibexa:graphql:generate-schema + + echo '> Done, ready to run tests' From 0b579e984689f3da92db552f418c43f63acdcbb2 Mon Sep 17 00:00:00 2001 From: tomaszszopinski Date: Mon, 23 Jun 2025 14:06:51 +0200 Subject: [PATCH 02/53] review changes --- bin/5.0.x-dev/prepare_project_edition.sh | 54 ++++++++++++------------ 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/bin/5.0.x-dev/prepare_project_edition.sh b/bin/5.0.x-dev/prepare_project_edition.sh index c833435..cd1fa16 100755 --- a/bin/5.0.x-dev/prepare_project_edition.sh +++ b/bin/5.0.x-dev/prepare_project_edition.sh @@ -183,74 +183,76 @@ docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/consol ######################################################################################################################## # Delete old GraphQL schema -docker compose rm -r config/graphql +docker compose --env-file=.env exec -T --user www-data app sh -c "rm -r config/graphql" # Remove Stimulus bootstrap -docker compose rm assets/bootstrap.js -docker compose sed -i '/bootstrap/d' assets/app.js -docker compose sed -i '/start the Stimulus application/d' assets/app.js +docker compose --env-file=.env exec -T --user www-data app sh -c "rm assets/bootstrap.js" +docker compose --env-file=.env exec -T --user www-data app sh -c "sed -i '/bootstrap/d' assets/app.js" +docker compose --env-file=.env exec -T --user www-data app sh -c "sed -i '/start the Stimulus application/d' assets/app.js" # Move from annotation to attribute #docker compose sed -i 's/type: annotation/type: attribute/g' config/routes/annotations.yaml -docker compose rm config/routes/annotations.yaml -docker compose rm config/routes.yaml +docker compose --env-file=.env exec -T --user www-data app sh -c "rm config/routes/annotations.yaml" +docker compose --env-file=.env exec -T --user www-data app sh -c "rm config/routes.yaml" # TMP: Accept dev version (5.0.x-dev) -docker compose composer config minimum-stability dev; +docker compose --env-file=.env exec -T --user www-data app sh -c "composer config minimum-stability dev" # Update required PHP version -docker compose composer require --no-update 'php:>=8.3'; +docker compose --env-file=.env exec -T --user www-data app sh -c "composer require --no-update 'php:>=8.3'" # Update required Symfony version -docker compose composer config extra.symfony.require '7.2.*' +docker compose --env-file=.env exec -T --user www-data app sh -c "composer config extra.symfony.require '7.2.*'" + # Upgrade Ibexa and Symfony packages (main app) -docker compose composer require --no-update \ +docker compose --env-file=.env exec -T --user www-data app sh -c "composer require --no-update \ ibexa/commerce:5.0.x-dev \ symfony/console:^7.2 \ symfony/dotenv:^7.2 \ symfony/framework-bundle:^7.2 \ symfony/runtime:^7.2 \ symfony/yaml:^7.2 \ -; +;" + # TMP: admin-ui-assets and headless-assets need to be on a tag -docker compose composer require --no-update \ +docker compose --env-file=.env exec -T --user www-data app sh -c "composer require --no-update \ ibexa/admin-ui-assets:v5.0.0-alpha5 \ ibexa/headless-assets:v5.0.0-alpha4 \ -; +;" # Upgrade Ibexa and Symfony packages (dev tools) -docker compose composer require --dev --no-update \ +docker compose --env-file=.env exec -T --user www-data app sh -c "composer require --dev --no-update \ ibexa/rector:5.0.x-dev \ symfony/debug-bundle:^7.2 \ symfony/stopwatch:^7.2 \ symfony/web-profiler-bundle:^7.2 \ -; +;" # Remove Php82HideDeprecationsErrorHandler -docker compose composer config --unset extra.runtime.error_handler +docker compose --env-file=.env exec -T --user www-data app sh -c "composer config --unset extra.runtime.error_handler" # Update packages / Install new dependencies -docker compose composer update --with-all-dependencies --no-scripts --verbose +docker compose --env-file=.env exec -T --user www-data app sh -c "composer update --with-all-dependencies --no-scripts --verbose" # TMP: Move to development recipes -docker compose composer config extra.symfony.endpoint "https://api.github.com/repos/ibexa/recipes-dev/contents/index.json?ref=flex/main" +docker compose --env-file=.env exec -T --user www-data app sh -c "composer config extra.symfony.endpoint "https://api.github.com/repos/ibexa/recipes-dev/contents/index.json?ref=flex/main"" # Reset recipes -docker compose rm symfony.lock +docker compose --env-file=.env exec -T --user www-data app sh -c "rm symfony.lock" # Run recipes -docker compose composer recipes:install ibexa/commerce --force --yes -v +docker compose --env-file=.env exec -T --user www-data app sh -c "composer recipes:install ibexa/commerce --force --yes -v" # Swap tsconfig.json usage and creation -docker compose perl -0pe 's/"ibexa:encore:compile": "symfony-cmd",\n "yarn ibexa-generate-tsconfig": "script"/"yarn ibexa-generate-tsconfig": "script",\n "ibexa:encore:compile": "symfony-cmd"/gms' -i composer.json +docker compose --env-file=.env exec -T --user www-data app sh -c "perl -0pe 's/"ibexa:encore:compile": "symfony-cmd",\n "yarn ibexa-generate-tsconfig": "script"/"yarn ibexa-generate-tsconfig": "script",\n "ibexa:encore:compile": "symfony-cmd"/gms' -i composer.json" # Manually clear cache to ensure scripts won't use a piece of it -docker compose rm -rf var/cache +docker compose --env-file=.env exec -T --user www-data app sh -c "rm -rf var/cache" # A.k.a "auto-scripts" (mainly JS and assets stuffs) -docker compose composer run-script post-update-cmd +docker compose --env-file=.env exec -T --user www-data app sh -c "composer run-script post-update-cmd" # Database update -docker compose mysql < vendor/ibexa/installer/upgrade/db/mysql/ibexa-4.6.latest-to-5.0.0.sql +docker compose --env-file=.env exec -T --user www-data app sh -c "mysql < vendor/ibexa/installer/upgrade/db/mysql/ibexa-4.6.latest-to-5.0.0.sql" # LTS Update related schemas to inject only if the add-on was never installed # keep an eye! #ddev php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/collaboration/src/bundle/Resources/config/schema.yaml | ddev mysql @@ -258,8 +260,8 @@ docker compose mysql < vendor/ibexa/installer/upgrade/db/mysql/ibexa-4.6.latest- #ddev php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/connector-ai/src/bundle/Resources/config/schema.yaml | ddev mysql # Generate new GraphQL schema if used (while admin-ui doesn't use it anymore) -docker compose composer require ibexa/graphql --no-interaction -docker compose php bin/console ibexa:graphql:generate-schema +docker compose --env-file=.env exec -T --user www-data app sh -c "composer require ibexa/graphql --no-interaction" +docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:graphql:generate-schema" echo '> Done, ready to run tests' From f4d61d93db7e6f8212c3a52e490d6177cf7e924e Mon Sep 17 00:00:00 2001 From: tomaszszopinski Date: Mon, 23 Jun 2025 14:42:32 +0200 Subject: [PATCH 03/53] Additional CR --- bin/5.0.x-dev/prepare_project_edition.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/bin/5.0.x-dev/prepare_project_edition.sh b/bin/5.0.x-dev/prepare_project_edition.sh index cd1fa16..c30a2aa 100755 --- a/bin/5.0.x-dev/prepare_project_edition.sh +++ b/bin/5.0.x-dev/prepare_project_edition.sh @@ -2,7 +2,7 @@ set -e PROJECT_EDITION=$1 -PROJECT_VERSION=5.0.x-dev +PROJECT_VERSION=4.6.x-dev PROJECT_BUILD_DIR=${HOME}/build/project export COMPOSE_FILE=$3 export PHP_IMAGE=${4-ghcr.io/ibexa/docker/php:8.3-node18} @@ -207,6 +207,8 @@ docker compose --env-file=.env exec -T --user www-data app sh -c "composer confi # Upgrade Ibexa and Symfony packages (main app) docker compose --env-file=.env exec -T --user www-data app sh -c "composer require --no-update \ ibexa/commerce:5.0.x-dev \ + ibexa/behat:5.0.x-dev \ + ibexa/docker:5.0.x-dev \ symfony/console:^7.2 \ symfony/dotenv:^7.2 \ symfony/framework-bundle:^7.2 \ @@ -217,8 +219,8 @@ docker compose --env-file=.env exec -T --user www-data app sh -c "composer requi # TMP: admin-ui-assets and headless-assets need to be on a tag docker compose --env-file=.env exec -T --user www-data app sh -c "composer require --no-update \ - ibexa/admin-ui-assets:v5.0.0-alpha5 \ - ibexa/headless-assets:v5.0.0-alpha4 \ + ibexa/admin-ui-assets:v5.0.0-beta2 \ + ibexa/headless-assets:v5.0.0-beta1 \ ;" # Upgrade Ibexa and Symfony packages (dev tools) From 5a2c72ce27ad86dcb5d46e3aeacb51c964d32825 Mon Sep 17 00:00:00 2001 From: tomaszszopinski Date: Mon, 23 Jun 2025 15:12:28 +0200 Subject: [PATCH 04/53] Commented composer version checks --- bin/5.0.x-dev/prepare_project_edition.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/bin/5.0.x-dev/prepare_project_edition.sh b/bin/5.0.x-dev/prepare_project_edition.sh index c30a2aa..412790b 100755 --- a/bin/5.0.x-dev/prepare_project_edition.sh +++ b/bin/5.0.x-dev/prepare_project_edition.sh @@ -91,15 +91,15 @@ if [[ "$PROJECT_EDITION" != "oss" ]]; then mv composer.json.new composer.json fi -echo "> Make composer use tested dependency" -JSON_STRING=$( jq -n \ - --arg packageVersion "$DEPENDENCY_PACKAGE_VERSION" \ - --arg packageName "$DEPENDENCY_PACKAGE_NAME" \ - --arg packageDir "./$DEPENDENCY_PACKAGE_NAME" \ - '{"type": "path", "url": $packageDir, "options": { "symlink": false , "versions": { ($packageName): $packageVersion}}}' ) - -composer config repositories.localDependency "$JSON_STRING" -composer require "$DEPENDENCY_PACKAGE_NAME:$DEPENDENCY_PACKAGE_VERSION" --no-update +# echo "> Make composer use tested dependency" +# JSON_STRING=$( jq -n \ +# --arg packageVersion "$DEPENDENCY_PACKAGE_VERSION" \ +# --arg packageName "$DEPENDENCY_PACKAGE_NAME" \ +# --arg packageDir "./$DEPENDENCY_PACKAGE_NAME" \ +# '{"type": "path", "url": $packageDir, "options": { "symlink": false , "versions": { ($packageName): $packageVersion}}}' ) + +# composer config repositories.localDependency "$JSON_STRING" +# composer require "$DEPENDENCY_PACKAGE_NAME:$DEPENDENCY_PACKAGE_VERSION" --no-update # Install correct product variant docker exec install_dependencies composer require ibexa/${PROJECT_EDITION}:${PROJECT_VERSION} -W --no-scripts --ansi From 12bc10dcfe097ae48a3535f5aa340f321268c93f Mon Sep 17 00:00:00 2001 From: tomaszszopinski Date: Mon, 23 Jun 2025 16:04:27 +0200 Subject: [PATCH 05/53] syntax fix --- bin/5.0.x-dev/prepare_project_edition.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/5.0.x-dev/prepare_project_edition.sh b/bin/5.0.x-dev/prepare_project_edition.sh index 412790b..7a744e7 100755 --- a/bin/5.0.x-dev/prepare_project_edition.sh +++ b/bin/5.0.x-dev/prepare_project_edition.sh @@ -245,8 +245,9 @@ docker compose --env-file=.env exec -T --user www-data app sh -c "rm symfony.loc docker compose --env-file=.env exec -T --user www-data app sh -c "composer recipes:install ibexa/commerce --force --yes -v" # Swap tsconfig.json usage and creation -docker compose --env-file=.env exec -T --user www-data app sh -c "perl -0pe 's/"ibexa:encore:compile": "symfony-cmd",\n "yarn ibexa-generate-tsconfig": "script"/"yarn ibexa-generate-tsconfig": "script",\n "ibexa:encore:compile": "symfony-cmd"/gms' -i composer.json" - +docker compose --env-file=.env exec -T --user www-data app sh -c "perl -0pe 's/"ibexa:encore:compile": "symfony-cmd",\n\s+"yarn ibexa-generate-tsconfig": "script"/"yarn ibexa-generate-tsconfig": "script",\n "ibexa:encore:compile": "symfony-cmd"/gms' -i composer.json" + + # Manually clear cache to ensure scripts won't use a piece of it docker compose --env-file=.env exec -T --user www-data app sh -c "rm -rf var/cache" From b85b8eeae4eaa7cdfaaa5f5967022df98e91c47d Mon Sep 17 00:00:00 2001 From: tomaszszopinski <59650405+tomaszszopinski@users.noreply.github.com> Date: Tue, 24 Jun 2025 08:10:10 +0200 Subject: [PATCH 06/53] Update bin/5.0.x-dev/prepare_project_edition.sh Co-authored-by: Adrien Dupuis <61695653+adriendupuis@users.noreply.github.com> --- bin/5.0.x-dev/prepare_project_edition.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/5.0.x-dev/prepare_project_edition.sh b/bin/5.0.x-dev/prepare_project_edition.sh index 7a744e7..e533902 100755 --- a/bin/5.0.x-dev/prepare_project_edition.sh +++ b/bin/5.0.x-dev/prepare_project_edition.sh @@ -238,7 +238,7 @@ docker compose --env-file=.env exec -T --user www-data app sh -c "composer confi docker compose --env-file=.env exec -T --user www-data app sh -c "composer update --with-all-dependencies --no-scripts --verbose" # TMP: Move to development recipes -docker compose --env-file=.env exec -T --user www-data app sh -c "composer config extra.symfony.endpoint "https://api.github.com/repos/ibexa/recipes-dev/contents/index.json?ref=flex/main"" +docker compose --env-file=.env exec -T --user www-data app sh -c "composer config extra.symfony.endpoint \"https://api.github.com/repos/ibexa/recipes-dev/contents/index.json?ref=flex/main\"" # Reset recipes docker compose --env-file=.env exec -T --user www-data app sh -c "rm symfony.lock" # Run recipes From 3f64aa8d2a59bb577f2fc079efbe545bb7338c49 Mon Sep 17 00:00:00 2001 From: tomaszszopinski <59650405+tomaszszopinski@users.noreply.github.com> Date: Tue, 24 Jun 2025 08:10:22 +0200 Subject: [PATCH 07/53] Update bin/5.0.x-dev/prepare_project_edition.sh Co-authored-by: Adrien Dupuis <61695653+adriendupuis@users.noreply.github.com> --- bin/5.0.x-dev/prepare_project_edition.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/5.0.x-dev/prepare_project_edition.sh b/bin/5.0.x-dev/prepare_project_edition.sh index e533902..349cfd0 100755 --- a/bin/5.0.x-dev/prepare_project_edition.sh +++ b/bin/5.0.x-dev/prepare_project_edition.sh @@ -245,7 +245,7 @@ docker compose --env-file=.env exec -T --user www-data app sh -c "rm symfony.loc docker compose --env-file=.env exec -T --user www-data app sh -c "composer recipes:install ibexa/commerce --force --yes -v" # Swap tsconfig.json usage and creation -docker compose --env-file=.env exec -T --user www-data app sh -c "perl -0pe 's/"ibexa:encore:compile": "symfony-cmd",\n\s+"yarn ibexa-generate-tsconfig": "script"/"yarn ibexa-generate-tsconfig": "script",\n "ibexa:encore:compile": "symfony-cmd"/gms' -i composer.json" +docker compose --env-file=.env exec -T --user www-data app sh -c "perl -0pe 's/\"ibexa:encore:compile\": \"symfony-cmd\",\n\s+\"yarn ibexa-generate-tsconfig\": \"script\"/\"yarn ibexa-generate-tsconfig\": \"script\",\n \"ibexa:encore:compile\": \"symfony-cmd\"/gms' -i composer.json" # Manually clear cache to ensure scripts won't use a piece of it From fd52d000c0c9fb0a16f659ebfa8dd81ce12a6a08 Mon Sep 17 00:00:00 2001 From: tomaszszopinski Date: Tue, 24 Jun 2025 09:41:39 +0200 Subject: [PATCH 08/53] Initialized db container --- bin/5.0.x-dev/prepare_project_edition.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/5.0.x-dev/prepare_project_edition.sh b/bin/5.0.x-dev/prepare_project_edition.sh index 349cfd0..8997eb3 100755 --- a/bin/5.0.x-dev/prepare_project_edition.sh +++ b/bin/5.0.x-dev/prepare_project_edition.sh @@ -255,6 +255,7 @@ docker compose --env-file=.env exec -T --user www-data app sh -c "rm -rf var/cac docker compose --env-file=.env exec -T --user www-data app sh -c "composer run-script post-update-cmd" # Database update +docker exec ibexa-db-1 sh -c "mysql -V" docker compose --env-file=.env exec -T --user www-data app sh -c "mysql < vendor/ibexa/installer/upgrade/db/mysql/ibexa-4.6.latest-to-5.0.0.sql" # LTS Update related schemas to inject only if the add-on was never installed # keep an eye! From 305dae8aa51989cfc68f3d894244c4e826c6fa8d Mon Sep 17 00:00:00 2001 From: tomaszszopinski Date: Tue, 24 Jun 2025 09:59:16 +0200 Subject: [PATCH 09/53] added db credentials --- bin/5.0.x-dev/prepare_project_edition.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/5.0.x-dev/prepare_project_edition.sh b/bin/5.0.x-dev/prepare_project_edition.sh index 8997eb3..ab062f3 100755 --- a/bin/5.0.x-dev/prepare_project_edition.sh +++ b/bin/5.0.x-dev/prepare_project_edition.sh @@ -255,7 +255,7 @@ docker compose --env-file=.env exec -T --user www-data app sh -c "rm -rf var/cac docker compose --env-file=.env exec -T --user www-data app sh -c "composer run-script post-update-cmd" # Database update -docker exec ibexa-db-1 sh -c "mysql -V" +docker exec ibexa-db-1 sh -c "mysql -u ${DATABASE_USER} -p ${DATABASE_PASSWORD} " docker compose --env-file=.env exec -T --user www-data app sh -c "mysql < vendor/ibexa/installer/upgrade/db/mysql/ibexa-4.6.latest-to-5.0.0.sql" # LTS Update related schemas to inject only if the add-on was never installed # keep an eye! From b57bd1d752f935a825b0d88416f9431458601471 Mon Sep 17 00:00:00 2001 From: tomaszszopinski Date: Tue, 24 Jun 2025 10:26:54 +0200 Subject: [PATCH 10/53] removed space --- bin/5.0.x-dev/prepare_project_edition.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/5.0.x-dev/prepare_project_edition.sh b/bin/5.0.x-dev/prepare_project_edition.sh index ab062f3..78926e2 100755 --- a/bin/5.0.x-dev/prepare_project_edition.sh +++ b/bin/5.0.x-dev/prepare_project_edition.sh @@ -255,7 +255,7 @@ docker compose --env-file=.env exec -T --user www-data app sh -c "rm -rf var/cac docker compose --env-file=.env exec -T --user www-data app sh -c "composer run-script post-update-cmd" # Database update -docker exec ibexa-db-1 sh -c "mysql -u ${DATABASE_USER} -p ${DATABASE_PASSWORD} " +docker exec ibexa-db-1 sh -c "mysql -u ${DATABASE_USER} -p${DATABASE_PASSWORD}" docker compose --env-file=.env exec -T --user www-data app sh -c "mysql < vendor/ibexa/installer/upgrade/db/mysql/ibexa-4.6.latest-to-5.0.0.sql" # LTS Update related schemas to inject only if the add-on was never installed # keep an eye! From 735ad898c616717cd07428096463d56ce7db3d24 Mon Sep 17 00:00:00 2001 From: tomaszszopinski Date: Tue, 24 Jun 2025 10:39:52 +0200 Subject: [PATCH 11/53] restored space --- bin/5.0.x-dev/prepare_project_edition.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/5.0.x-dev/prepare_project_edition.sh b/bin/5.0.x-dev/prepare_project_edition.sh index 78926e2..c64a4cf 100755 --- a/bin/5.0.x-dev/prepare_project_edition.sh +++ b/bin/5.0.x-dev/prepare_project_edition.sh @@ -255,7 +255,7 @@ docker compose --env-file=.env exec -T --user www-data app sh -c "rm -rf var/cac docker compose --env-file=.env exec -T --user www-data app sh -c "composer run-script post-update-cmd" # Database update -docker exec ibexa-db-1 sh -c "mysql -u ${DATABASE_USER} -p${DATABASE_PASSWORD}" +docker exec ibexa-db-1 sh -c "mysql -u ${DATABASE_USER} -p ${DATABASE_PASSWORD}" docker compose --env-file=.env exec -T --user www-data app sh -c "mysql < vendor/ibexa/installer/upgrade/db/mysql/ibexa-4.6.latest-to-5.0.0.sql" # LTS Update related schemas to inject only if the add-on was never installed # keep an eye! From 46fa93694f989f93a634ef4f8a2f94b6f98897b5 Mon Sep 17 00:00:00 2001 From: tomaszszopinski Date: Tue, 24 Jun 2025 10:54:27 +0200 Subject: [PATCH 12/53] Hardcoded credentials added --- bin/5.0.x-dev/prepare_project_edition.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/5.0.x-dev/prepare_project_edition.sh b/bin/5.0.x-dev/prepare_project_edition.sh index c64a4cf..4cff77f 100755 --- a/bin/5.0.x-dev/prepare_project_edition.sh +++ b/bin/5.0.x-dev/prepare_project_edition.sh @@ -255,7 +255,7 @@ docker compose --env-file=.env exec -T --user www-data app sh -c "rm -rf var/cac docker compose --env-file=.env exec -T --user www-data app sh -c "composer run-script post-update-cmd" # Database update -docker exec ibexa-db-1 sh -c "mysql -u ${DATABASE_USER} -p ${DATABASE_PASSWORD}" +docker exec ibexa-db-1 sh -c "mysql -u ezp -p SetYourOwnPassword" docker compose --env-file=.env exec -T --user www-data app sh -c "mysql < vendor/ibexa/installer/upgrade/db/mysql/ibexa-4.6.latest-to-5.0.0.sql" # LTS Update related schemas to inject only if the add-on was never installed # keep an eye! From a1fa501bdd1cde7c4b5c7b2c746a6fd76e6da420 Mon Sep 17 00:00:00 2001 From: tomaszszopinski Date: Tue, 24 Jun 2025 11:08:57 +0200 Subject: [PATCH 13/53] db password syntax fixed --- bin/5.0.x-dev/prepare_project_edition.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/5.0.x-dev/prepare_project_edition.sh b/bin/5.0.x-dev/prepare_project_edition.sh index 4cff77f..0072801 100755 --- a/bin/5.0.x-dev/prepare_project_edition.sh +++ b/bin/5.0.x-dev/prepare_project_edition.sh @@ -255,7 +255,7 @@ docker compose --env-file=.env exec -T --user www-data app sh -c "rm -rf var/cac docker compose --env-file=.env exec -T --user www-data app sh -c "composer run-script post-update-cmd" # Database update -docker exec ibexa-db-1 sh -c "mysql -u ezp -p SetYourOwnPassword" +docker exec ibexa-db-1 sh -c "mysql -u ezp -pSetYourOwnPassword" docker compose --env-file=.env exec -T --user www-data app sh -c "mysql < vendor/ibexa/installer/upgrade/db/mysql/ibexa-4.6.latest-to-5.0.0.sql" # LTS Update related schemas to inject only if the add-on was never installed # keep an eye! From d26d737627ad2efe4da1ca43f50cdd0642f7b99f Mon Sep 17 00:00:00 2001 From: tomaszszopinski Date: Tue, 24 Jun 2025 11:55:44 +0200 Subject: [PATCH 14/53] doctrine:database:import approach --- bin/5.0.x-dev/prepare_project_edition.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/bin/5.0.x-dev/prepare_project_edition.sh b/bin/5.0.x-dev/prepare_project_edition.sh index 0072801..764dd8b 100755 --- a/bin/5.0.x-dev/prepare_project_edition.sh +++ b/bin/5.0.x-dev/prepare_project_edition.sh @@ -255,8 +255,11 @@ docker compose --env-file=.env exec -T --user www-data app sh -c "rm -rf var/cac docker compose --env-file=.env exec -T --user www-data app sh -c "composer run-script post-update-cmd" # Database update -docker exec ibexa-db-1 sh -c "mysql -u ezp -pSetYourOwnPassword" -docker compose --env-file=.env exec -T --user www-data app sh -c "mysql < vendor/ibexa/installer/upgrade/db/mysql/ibexa-4.6.latest-to-5.0.0.sql" +# docker exec ibexa-db-1 sh -c "mysql -u ezp -pSetYourOwnPassword" +# docker compose --env-file=.env exec -T --user www-data app sh -c "mysql < vendor/ibexa/installer/upgrade/db/mysql/ibexa-4.6.latest-to-5.0.0.sql" + +docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console doctrine:database:import vendor/ibexa/installer/upgrade/db/mysql/ibexa-4.6.latest-to-5.0.0.sql" + # LTS Update related schemas to inject only if the add-on was never installed # keep an eye! #ddev php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/collaboration/src/bundle/Resources/config/schema.yaml | ddev mysql From 2724381101bc12cf11cee59a145fb7478f994a09 Mon Sep 17 00:00:00 2001 From: tomaszszopinski Date: Wed, 25 Jun 2025 11:18:52 +0200 Subject: [PATCH 15/53] added doctrine bundle --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 114c036..d28b5a9 100644 --- a/composer.json +++ b/composer.json @@ -38,6 +38,7 @@ "require-dev": { "ibexa/code-style": "^1.0", "phpstan/phpstan": "^1.8", + "doctrine/doctrine-fixtures-bundle": "^4.0", "phpunit/phpunit": "^9.5", "mikey179/vfsstream": "^1.6" }, From 38b5e985030315a2722378e1ec82eebb4b17d5cb Mon Sep 17 00:00:00 2001 From: tomaszszopinski Date: Wed, 25 Jun 2025 11:21:43 +0200 Subject: [PATCH 16/53] lowered doctrine bundle reqs --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index d28b5a9..0241a3a 100644 --- a/composer.json +++ b/composer.json @@ -38,7 +38,7 @@ "require-dev": { "ibexa/code-style": "^1.0", "phpstan/phpstan": "^1.8", - "doctrine/doctrine-fixtures-bundle": "^4.0", + "doctrine/doctrine-fixtures-bundle": "^3.0", "phpunit/phpunit": "^9.5", "mikey179/vfsstream": "^1.6" }, From 76f15558155b3effc56ca036d126ed1a976bbfba Mon Sep 17 00:00:00 2001 From: tomaszszopinski Date: Wed, 25 Jun 2025 14:19:58 +0200 Subject: [PATCH 17/53] doctrine:query attempt --- bin/5.0.x-dev/prepare_project_edition.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/5.0.x-dev/prepare_project_edition.sh b/bin/5.0.x-dev/prepare_project_edition.sh index 764dd8b..4b08a4b 100755 --- a/bin/5.0.x-dev/prepare_project_edition.sh +++ b/bin/5.0.x-dev/prepare_project_edition.sh @@ -258,7 +258,7 @@ docker compose --env-file=.env exec -T --user www-data app sh -c "composer run-s # docker exec ibexa-db-1 sh -c "mysql -u ezp -pSetYourOwnPassword" # docker compose --env-file=.env exec -T --user www-data app sh -c "mysql < vendor/ibexa/installer/upgrade/db/mysql/ibexa-4.6.latest-to-5.0.0.sql" -docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console doctrine:database:import vendor/ibexa/installer/upgrade/db/mysql/ibexa-4.6.latest-to-5.0.0.sql" +docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console doctrine:query:sql \"\$(cat vendor/ibexa/installer/upgrade/db/mysql/ibexa-4.6.latest-to-5.0.0.sql | grep -v '\-- ')\"" # LTS Update related schemas to inject only if the add-on was never installed # keep an eye! From 8d62b3c79b0e238d52125d54052733f3a7f5a047 Mon Sep 17 00:00:00 2001 From: tomaszszopinski Date: Wed, 25 Jun 2025 14:40:19 +0200 Subject: [PATCH 18/53] removed doctrine bundle requirement --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index 0241a3a..114c036 100644 --- a/composer.json +++ b/composer.json @@ -38,7 +38,6 @@ "require-dev": { "ibexa/code-style": "^1.0", "phpstan/phpstan": "^1.8", - "doctrine/doctrine-fixtures-bundle": "^3.0", "phpunit/phpunit": "^9.5", "mikey179/vfsstream": "^1.6" }, From 03b191fc59bc42025e4cf46085c7254639ea1279 Mon Sep 17 00:00:00 2001 From: tomaszszopinski Date: Thu, 26 Jun 2025 08:02:53 +0200 Subject: [PATCH 19/53] added behat recipes reinstall --- bin/5.0.x-dev/prepare_project_edition.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bin/5.0.x-dev/prepare_project_edition.sh b/bin/5.0.x-dev/prepare_project_edition.sh index 4b08a4b..ebed501 100755 --- a/bin/5.0.x-dev/prepare_project_edition.sh +++ b/bin/5.0.x-dev/prepare_project_edition.sh @@ -270,5 +270,8 @@ docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/consol docker compose --env-file=.env exec -T --user www-data app sh -c "composer require ibexa/graphql --no-interaction" docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:graphql:generate-schema" +docker compose --env-file=.env exec -T --user www-data app sh -c "composer recipes:install ibexa/behat --force --reset" + + echo '> Done, ready to run tests' From be59ca0c0899d679f6d10f449c67e567f892203a Mon Sep 17 00:00:00 2001 From: tomaszszopinski Date: Thu, 26 Jun 2025 08:46:39 +0200 Subject: [PATCH 20/53] recreating behat.yaml after recipes --- bin/5.0.x-dev/prepare_project_edition.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/5.0.x-dev/prepare_project_edition.sh b/bin/5.0.x-dev/prepare_project_edition.sh index ebed501..c5e80b2 100755 --- a/bin/5.0.x-dev/prepare_project_edition.sh +++ b/bin/5.0.x-dev/prepare_project_edition.sh @@ -140,7 +140,7 @@ echo "> Display composer.json for debugging" cat composer.json # Create a default Behat configuration file -cp "behat_ibexa_${PROJECT_EDITION}.yaml" behat.yaml +# cp "behat_ibexa_${PROJECT_EDITION}.yaml" behat.yaml # Depenencies are installed and container can be removed docker container stop install_dependencies @@ -271,7 +271,7 @@ docker compose --env-file=.env exec -T --user www-data app sh -c "composer requi docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:graphql:generate-schema" docker compose --env-file=.env exec -T --user www-data app sh -c "composer recipes:install ibexa/behat --force --reset" - +cp "behat_ibexa_${PROJECT_EDITION}.yaml" behat.yaml echo '> Done, ready to run tests' From ae3cd42841e388a04f08fd4c652c64cf73b4e602 Mon Sep 17 00:00:00 2001 From: tomaszszopinski Date: Thu, 26 Jun 2025 09:33:23 +0200 Subject: [PATCH 21/53] added permissions to behat.yaml --- bin/5.0.x-dev/prepare_project_edition.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/5.0.x-dev/prepare_project_edition.sh b/bin/5.0.x-dev/prepare_project_edition.sh index c5e80b2..eb75a11 100755 --- a/bin/5.0.x-dev/prepare_project_edition.sh +++ b/bin/5.0.x-dev/prepare_project_edition.sh @@ -271,6 +271,7 @@ docker compose --env-file=.env exec -T --user www-data app sh -c "composer requi docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:graphql:generate-schema" docker compose --env-file=.env exec -T --user www-data app sh -c "composer recipes:install ibexa/behat --force --reset" +chmod +r "behat_ibexa_${PROJECT_EDITION}.yaml" cp "behat_ibexa_${PROJECT_EDITION}.yaml" behat.yaml From 9638e1d2851f9f72e55c044da0cc3f4aa5f38f5b Mon Sep 17 00:00:00 2001 From: tomaszszopinski Date: Thu, 26 Jun 2025 09:58:34 +0200 Subject: [PATCH 22/53] another approach to permissions --- bin/5.0.x-dev/prepare_project_edition.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/5.0.x-dev/prepare_project_edition.sh b/bin/5.0.x-dev/prepare_project_edition.sh index eb75a11..90ad35b 100755 --- a/bin/5.0.x-dev/prepare_project_edition.sh +++ b/bin/5.0.x-dev/prepare_project_edition.sh @@ -271,8 +271,8 @@ docker compose --env-file=.env exec -T --user www-data app sh -c "composer requi docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:graphql:generate-schema" docker compose --env-file=.env exec -T --user www-data app sh -c "composer recipes:install ibexa/behat --force --reset" -chmod +r "behat_ibexa_${PROJECT_EDITION}.yaml" -cp "behat_ibexa_${PROJECT_EDITION}.yaml" behat.yaml + +docker compose --env-file=.env exec -T --user www-data app sh -c "cp "behat_ibexa_commerce.yaml" behat.yaml" echo '> Done, ready to run tests' From 536a32ad3b6ed85ed815968c473b98460ec13be4 Mon Sep 17 00:00:00 2001 From: tomaszszopinski Date: Thu, 26 Jun 2025 10:03:05 +0200 Subject: [PATCH 23/53] fixed syntax --- bin/5.0.x-dev/prepare_project_edition.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/5.0.x-dev/prepare_project_edition.sh b/bin/5.0.x-dev/prepare_project_edition.sh index 90ad35b..2f9e45d 100755 --- a/bin/5.0.x-dev/prepare_project_edition.sh +++ b/bin/5.0.x-dev/prepare_project_edition.sh @@ -272,7 +272,7 @@ docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/consol docker compose --env-file=.env exec -T --user www-data app sh -c "composer recipes:install ibexa/behat --force --reset" -docker compose --env-file=.env exec -T --user www-data app sh -c "cp "behat_ibexa_commerce.yaml" behat.yaml" +docker compose --env-file=.env exec -T --user www-data app sh -c "cp behat_ibexa_commerce.yaml behat.yaml" echo '> Done, ready to run tests' From 742c12aaf03b48825080503531dab83cc88b3038 Mon Sep 17 00:00:00 2001 From: tomaszszopinski Date: Thu, 26 Jun 2025 11:14:18 +0200 Subject: [PATCH 24/53] more yaml removal --- bin/5.0.x-dev/prepare_project_edition.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/5.0.x-dev/prepare_project_edition.sh b/bin/5.0.x-dev/prepare_project_edition.sh index 2f9e45d..670a650 100755 --- a/bin/5.0.x-dev/prepare_project_edition.sh +++ b/bin/5.0.x-dev/prepare_project_edition.sh @@ -270,6 +270,7 @@ docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/consol docker compose --env-file=.env exec -T --user www-data app sh -c "composer require ibexa/graphql --no-interaction" docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:graphql:generate-schema" +docker compose --env-file=.env exec -T --user www-data app sh -c "rm behat_ibexa_commerce.yaml" docker compose --env-file=.env exec -T --user www-data app sh -c "composer recipes:install ibexa/behat --force --reset" docker compose --env-file=.env exec -T --user www-data app sh -c "cp behat_ibexa_commerce.yaml behat.yaml" From 1634acc47727415e82883471a4125dd549393c58 Mon Sep 17 00:00:00 2001 From: tomaszszopinski Date: Thu, 26 Jun 2025 11:27:05 +0200 Subject: [PATCH 25/53] current state commit before recipes --- bin/5.0.x-dev/prepare_project_edition.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/5.0.x-dev/prepare_project_edition.sh b/bin/5.0.x-dev/prepare_project_edition.sh index 670a650..9765b7b 100755 --- a/bin/5.0.x-dev/prepare_project_edition.sh +++ b/bin/5.0.x-dev/prepare_project_edition.sh @@ -271,6 +271,7 @@ docker compose --env-file=.env exec -T --user www-data app sh -c "composer requi docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:graphql:generate-schema" docker compose --env-file=.env exec -T --user www-data app sh -c "rm behat_ibexa_commerce.yaml" +docker compose --env-file=.env exec -T --user www-data app sh -c "git add . && git commit -m 'current state'" docker compose --env-file=.env exec -T --user www-data app sh -c "composer recipes:install ibexa/behat --force --reset" docker compose --env-file=.env exec -T --user www-data app sh -c "cp behat_ibexa_commerce.yaml behat.yaml" From 6fda762447391b89802a68a684251b7559152933 Mon Sep 17 00:00:00 2001 From: tomaszszopinski Date: Fri, 27 Jun 2025 10:09:35 +0200 Subject: [PATCH 26/53] commented current state commit --- bin/5.0.x-dev/prepare_project_edition.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/5.0.x-dev/prepare_project_edition.sh b/bin/5.0.x-dev/prepare_project_edition.sh index 9765b7b..1042324 100755 --- a/bin/5.0.x-dev/prepare_project_edition.sh +++ b/bin/5.0.x-dev/prepare_project_edition.sh @@ -271,7 +271,7 @@ docker compose --env-file=.env exec -T --user www-data app sh -c "composer requi docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:graphql:generate-schema" docker compose --env-file=.env exec -T --user www-data app sh -c "rm behat_ibexa_commerce.yaml" -docker compose --env-file=.env exec -T --user www-data app sh -c "git add . && git commit -m 'current state'" +# docker compose --env-file=.env exec -T --user www-data app sh -c "git add . && git commit -m 'current state'" docker compose --env-file=.env exec -T --user www-data app sh -c "composer recipes:install ibexa/behat --force --reset" docker compose --env-file=.env exec -T --user www-data app sh -c "cp behat_ibexa_commerce.yaml behat.yaml" From 84bcc87d920280819bd166a6e6e429e581656ac5 Mon Sep 17 00:00:00 2001 From: tomaszszopinski Date: Fri, 27 Jun 2025 10:38:46 +0200 Subject: [PATCH 27/53] added touch behat.yaml --- bin/5.0.x-dev/prepare_project_edition.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/5.0.x-dev/prepare_project_edition.sh b/bin/5.0.x-dev/prepare_project_edition.sh index 1042324..3d4bcf5 100755 --- a/bin/5.0.x-dev/prepare_project_edition.sh +++ b/bin/5.0.x-dev/prepare_project_edition.sh @@ -140,6 +140,7 @@ echo "> Display composer.json for debugging" cat composer.json # Create a default Behat configuration file +touch behat.yaml # cp "behat_ibexa_${PROJECT_EDITION}.yaml" behat.yaml # Depenencies are installed and container can be removed From b3e38090059ab7e003756a287f05e5afa058d77c Mon Sep 17 00:00:00 2001 From: tomaszszopinski Date: Fri, 27 Jun 2025 10:56:30 +0200 Subject: [PATCH 28/53] modified yaml deletion --- bin/5.0.x-dev/prepare_project_edition.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/5.0.x-dev/prepare_project_edition.sh b/bin/5.0.x-dev/prepare_project_edition.sh index 3d4bcf5..7faec6a 100755 --- a/bin/5.0.x-dev/prepare_project_edition.sh +++ b/bin/5.0.x-dev/prepare_project_edition.sh @@ -271,7 +271,7 @@ docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/consol docker compose --env-file=.env exec -T --user www-data app sh -c "composer require ibexa/graphql --no-interaction" docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:graphql:generate-schema" -docker compose --env-file=.env exec -T --user www-data app sh -c "rm behat_ibexa_commerce.yaml" +docker compose --env-file=.env exec -T --user www-data app sh -c "rm -rf behat_ibexa_commerce.yaml" # docker compose --env-file=.env exec -T --user www-data app sh -c "git add . && git commit -m 'current state'" docker compose --env-file=.env exec -T --user www-data app sh -c "composer recipes:install ibexa/behat --force --reset" From 10e77f7ac57fed572df2892df39822dd8900fa4c Mon Sep 17 00:00:00 2001 From: tomaszszopinski Date: Fri, 27 Jun 2025 11:13:07 +0200 Subject: [PATCH 29/53] added behat oss config removal --- bin/5.0.x-dev/prepare_project_edition.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/5.0.x-dev/prepare_project_edition.sh b/bin/5.0.x-dev/prepare_project_edition.sh index 7faec6a..914d5f7 100755 --- a/bin/5.0.x-dev/prepare_project_edition.sh +++ b/bin/5.0.x-dev/prepare_project_edition.sh @@ -273,7 +273,7 @@ docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/consol docker compose --env-file=.env exec -T --user www-data app sh -c "rm -rf behat_ibexa_commerce.yaml" # docker compose --env-file=.env exec -T --user www-data app sh -c "git add . && git commit -m 'current state'" -docker compose --env-file=.env exec -T --user www-data app sh -c "composer recipes:install ibexa/behat --force --reset" +docker compose --env-file=.env exec -T --user www-data app sh -c "composer recipes:install ibexa/behat --force --reset -vv" docker compose --env-file=.env exec -T --user www-data app sh -c "cp behat_ibexa_commerce.yaml behat.yaml" From 8727182aba1228c5522a1352207520012c5119f3 Mon Sep 17 00:00:00 2001 From: tomaszszopinski Date: Fri, 27 Jun 2025 11:27:24 +0200 Subject: [PATCH 30/53] added composer require for behat 5.0 --- bin/5.0.x-dev/prepare_project_edition.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bin/5.0.x-dev/prepare_project_edition.sh b/bin/5.0.x-dev/prepare_project_edition.sh index 914d5f7..cb6c678 100755 --- a/bin/5.0.x-dev/prepare_project_edition.sh +++ b/bin/5.0.x-dev/prepare_project_edition.sh @@ -272,7 +272,11 @@ docker compose --env-file=.env exec -T --user www-data app sh -c "composer requi docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:graphql:generate-schema" docker compose --env-file=.env exec -T --user www-data app sh -c "rm -rf behat_ibexa_commerce.yaml" +docker compose --env-file=.env exec -T --user www-data app sh -c "rm -rf behat_ibexa_oss.yaml" # docker compose --env-file=.env exec -T --user www-data app sh -c "git add . && git commit -m 'current state'" + + +docker compose --env-file=.env exec -T --user www-data app sh -c "composer require --dev ibexa/behat:~5.0.x-dev --no-scripts --no-plugins" docker compose --env-file=.env exec -T --user www-data app sh -c "composer recipes:install ibexa/behat --force --reset -vv" docker compose --env-file=.env exec -T --user www-data app sh -c "cp behat_ibexa_commerce.yaml behat.yaml" From 012fbeee42fe1dc30c830a05841a8217d57e1f31 Mon Sep 17 00:00:00 2001 From: tomaszszopinski Date: Fri, 27 Jun 2025 12:13:10 +0200 Subject: [PATCH 31/53] added missing sql schemas --- bin/5.0.x-dev/prepare_project_edition.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bin/5.0.x-dev/prepare_project_edition.sh b/bin/5.0.x-dev/prepare_project_edition.sh index cb6c678..0210374 100755 --- a/bin/5.0.x-dev/prepare_project_edition.sh +++ b/bin/5.0.x-dev/prepare_project_edition.sh @@ -264,6 +264,9 @@ docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/consol # LTS Update related schemas to inject only if the add-on was never installed # keep an eye! #ddev php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/collaboration/src/bundle/Resources/config/schema.yaml | ddev mysql +docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console doctrine:query:sql \"\$(cat vendor/ibexa/collaboration/src/bundle/Resources/config/schema.yaml | grep -v '\-- ')\"" +docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console doctrine:query:sql \"\$(cat vendor/ibexa/share/src/bundle/Resources/config/schema.yaml | grep -v '\-- ')\"" +docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console doctrine:query:sql \"\$(cat vendor/ibexa/connector-ai/src/bundle/Resources/config/schema.yaml | grep -v '\-- ')\"" #ddev php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/share/src/bundle/Resources/config/schema.yaml | ddev mysql #ddev php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/connector-ai/src/bundle/Resources/config/schema.yaml | ddev mysql From bf481d48b5e68e59e1f055656bcb5ecbe4cfa8e2 Mon Sep 17 00:00:00 2001 From: tomaszszopinski Date: Fri, 27 Jun 2025 12:30:21 +0200 Subject: [PATCH 32/53] changed to doctrine.schema.dump-sql --- bin/5.0.x-dev/prepare_project_edition.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/5.0.x-dev/prepare_project_edition.sh b/bin/5.0.x-dev/prepare_project_edition.sh index 0210374..6b66671 100755 --- a/bin/5.0.x-dev/prepare_project_edition.sh +++ b/bin/5.0.x-dev/prepare_project_edition.sh @@ -264,9 +264,9 @@ docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/consol # LTS Update related schemas to inject only if the add-on was never installed # keep an eye! #ddev php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/collaboration/src/bundle/Resources/config/schema.yaml | ddev mysql -docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console doctrine:query:sql \"\$(cat vendor/ibexa/collaboration/src/bundle/Resources/config/schema.yaml | grep -v '\-- ')\"" -docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console doctrine:query:sql \"\$(cat vendor/ibexa/share/src/bundle/Resources/config/schema.yaml | grep -v '\-- ')\"" -docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console doctrine:query:sql \"\$(cat vendor/ibexa/connector-ai/src/bundle/Resources/config/schema.yaml | grep -v '\-- ')\"" +docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:doctrine:schema:dump-sql \"\$(cat vendor/ibexa/collaboration/src/bundle/Resources/config/schema.yaml | grep -v '\-- ')\"" +docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:doctrine:schema:dump-sql \"\$(cat vendor/ibexa/share/src/bundle/Resources/config/schema.yaml | grep -v '\-- ')\"" +docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:doctrine:schema:dump-sql \"\$(cat vendor/ibexa/connector-ai/src/bundle/Resources/config/schema.yaml | grep -v '\-- ')\"" #ddev php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/share/src/bundle/Resources/config/schema.yaml | ddev mysql #ddev php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/connector-ai/src/bundle/Resources/config/schema.yaml | ddev mysql From 4136e6f3b8e43e9c33c158b506771f5f6f2fb07c Mon Sep 17 00:00:00 2001 From: tomaszszopinski Date: Fri, 27 Jun 2025 12:49:51 +0200 Subject: [PATCH 33/53] another syntax change to schemas dumping --- bin/5.0.x-dev/prepare_project_edition.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/5.0.x-dev/prepare_project_edition.sh b/bin/5.0.x-dev/prepare_project_edition.sh index 6b66671..76703e8 100755 --- a/bin/5.0.x-dev/prepare_project_edition.sh +++ b/bin/5.0.x-dev/prepare_project_edition.sh @@ -264,9 +264,9 @@ docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/consol # LTS Update related schemas to inject only if the add-on was never installed # keep an eye! #ddev php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/collaboration/src/bundle/Resources/config/schema.yaml | ddev mysql -docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:doctrine:schema:dump-sql \"\$(cat vendor/ibexa/collaboration/src/bundle/Resources/config/schema.yaml | grep -v '\-- ')\"" -docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:doctrine:schema:dump-sql \"\$(cat vendor/ibexa/share/src/bundle/Resources/config/schema.yaml | grep -v '\-- ')\"" -docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:doctrine:schema:dump-sql \"\$(cat vendor/ibexa/connector-ai/src/bundle/Resources/config/schema.yaml | grep -v '\-- ')\"" +docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/collaboration/src/bundle/Resources/config/schema.yaml" +docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/share/src/bundle/Resources/config/schema.yaml" +docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/connector-ai/src/bundle/Resources/config/schema.yaml" #ddev php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/share/src/bundle/Resources/config/schema.yaml | ddev mysql #ddev php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/connector-ai/src/bundle/Resources/config/schema.yaml | ddev mysql From 96273deb74f91131d0ec74fdfd2ec52af7842827 Mon Sep 17 00:00:00 2001 From: tomaszszopinski Date: Fri, 27 Jun 2025 14:41:41 +0200 Subject: [PATCH 34/53] improved schema syntax --- bin/5.0.x-dev/prepare_project_edition.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/bin/5.0.x-dev/prepare_project_edition.sh b/bin/5.0.x-dev/prepare_project_edition.sh index 76703e8..03c9454 100755 --- a/bin/5.0.x-dev/prepare_project_edition.sh +++ b/bin/5.0.x-dev/prepare_project_edition.sh @@ -264,9 +264,11 @@ docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/consol # LTS Update related schemas to inject only if the add-on was never installed # keep an eye! #ddev php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/collaboration/src/bundle/Resources/config/schema.yaml | ddev mysql -docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/collaboration/src/bundle/Resources/config/schema.yaml" -docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/share/src/bundle/Resources/config/schema.yaml" -docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/connector-ai/src/bundle/Resources/config/schema.yaml" +docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console doctrine:query:sql \"\$(php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/collaboration/src/bundle/Resources/config/schema.yaml)\"" +docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console doctrine:query:sql \"\$(php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/share/src/bundle/Resources/config/schema.yaml)\"" +docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console doctrine:query:sql \"\$(php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/connector-ai/src/bundle/Resources/config/schema.yaml)\"" +# docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/share/src/bundle/Resources/config/schema.yaml" +# docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/connector-ai/src/bundle/Resources/config/schema.yaml" #ddev php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/share/src/bundle/Resources/config/schema.yaml | ddev mysql #ddev php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/connector-ai/src/bundle/Resources/config/schema.yaml | ddev mysql From 42e65b1f10e9296d2b6af44c9120f853a1b2438f Mon Sep 17 00:00:00 2001 From: tomaszszopinski Date: Fri, 27 Jun 2025 15:12:10 +0200 Subject: [PATCH 35/53] added reindex --- bin/5.0.x-dev/prepare_project_edition.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bin/5.0.x-dev/prepare_project_edition.sh b/bin/5.0.x-dev/prepare_project_edition.sh index 03c9454..4bde5d2 100755 --- a/bin/5.0.x-dev/prepare_project_edition.sh +++ b/bin/5.0.x-dev/prepare_project_edition.sh @@ -276,6 +276,9 @@ docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/consol docker compose --env-file=.env exec -T --user www-data app sh -c "composer require ibexa/graphql --no-interaction" docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:graphql:generate-schema" +# reindex +docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:reindex" + docker compose --env-file=.env exec -T --user www-data app sh -c "rm -rf behat_ibexa_commerce.yaml" docker compose --env-file=.env exec -T --user www-data app sh -c "rm -rf behat_ibexa_oss.yaml" # docker compose --env-file=.env exec -T --user www-data app sh -c "git add . && git commit -m 'current state'" From 1acaee1ae0df95c7ff65f1be002a405d1ff4e6d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Mon, 30 Jun 2025 10:17:50 +0200 Subject: [PATCH 36/53] Added TMP Dependency --- bin/5.0.x-dev/prepare_project_edition.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bin/5.0.x-dev/prepare_project_edition.sh b/bin/5.0.x-dev/prepare_project_edition.sh index 4bde5d2..8f106fa 100755 --- a/bin/5.0.x-dev/prepare_project_edition.sh +++ b/bin/5.0.x-dev/prepare_project_edition.sh @@ -217,7 +217,6 @@ docker compose --env-file=.env exec -T --user www-data app sh -c "composer requi symfony/yaml:^7.2 \ ;" - # TMP: admin-ui-assets and headless-assets need to be on a tag docker compose --env-file=.env exec -T --user www-data app sh -c "composer require --no-update \ ibexa/admin-ui-assets:v5.0.0-beta2 \ @@ -238,6 +237,10 @@ docker compose --env-file=.env exec -T --user www-data app sh -c "composer confi # Update packages / Install new dependencies docker compose --env-file=.env exec -T --user www-data app sh -c "composer update --with-all-dependencies --no-scripts --verbose" +# TMP DEPENDENCIES +docker compose --env-file=.env exec -T --user www-data app sh -c "composer require ibexa/core:dev-fix-legacy-aliases as 5.0.x-dev" + + # TMP: Move to development recipes docker compose --env-file=.env exec -T --user www-data app sh -c "composer config extra.symfony.endpoint \"https://api.github.com/repos/ibexa/recipes-dev/contents/index.json?ref=flex/main\"" # Reset recipes From c77cc1674e1687aa9f0af88442e4c0d620426907 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Mon, 30 Jun 2025 10:26:06 +0200 Subject: [PATCH 37/53] Fixed escaping --- bin/5.0.x-dev/prepare_project_edition.sh | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/bin/5.0.x-dev/prepare_project_edition.sh b/bin/5.0.x-dev/prepare_project_edition.sh index 8f106fa..e2e217e 100755 --- a/bin/5.0.x-dev/prepare_project_edition.sh +++ b/bin/5.0.x-dev/prepare_project_edition.sh @@ -238,7 +238,7 @@ docker compose --env-file=.env exec -T --user www-data app sh -c "composer confi docker compose --env-file=.env exec -T --user www-data app sh -c "composer update --with-all-dependencies --no-scripts --verbose" # TMP DEPENDENCIES -docker compose --env-file=.env exec -T --user www-data app sh -c "composer require ibexa/core:dev-fix-legacy-aliases as 5.0.x-dev" +docker compose --env-file=.env exec -T --user www-data app sh -c "composer require 'ibexa/core:dev-fix-legacy-aliases as 5.0.x-dev'" # TMP: Move to development recipes @@ -262,14 +262,26 @@ docker compose --env-file=.env exec -T --user www-data app sh -c "composer run-s # docker exec ibexa-db-1 sh -c "mysql -u ezp -pSetYourOwnPassword" # docker compose --env-file=.env exec -T --user www-data app sh -c "mysql < vendor/ibexa/installer/upgrade/db/mysql/ibexa-4.6.latest-to-5.0.0.sql" -docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console doctrine:query:sql \"\$(cat vendor/ibexa/installer/upgrade/db/mysql/ibexa-4.6.latest-to-5.0.0.sql | grep -v '\-- ')\"" +if [[ "$COMPOSE_FILE" == *"db-postgresql.yml"* ]]; then + docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console doctrine:query:sql \"\$(cat vendor/ibexa/installer/upgrade/db/postgresql/ibexa-4.6.latest-to-5.0.0.sql | grep -v '\-- ')\"" +else + docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console doctrine:query:sql \"\$(cat vendor/ibexa/installer/upgrade/db/mysql/ibexa-4.6.latest-to-5.0.0.sql | grep -v '\-- ')\"" +fi # LTS Update related schemas to inject only if the add-on was never installed # keep an eye! #ddev php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/collaboration/src/bundle/Resources/config/schema.yaml | ddev mysql -docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console doctrine:query:sql \"\$(php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/collaboration/src/bundle/Resources/config/schema.yaml)\"" -docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console doctrine:query:sql \"\$(php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/share/src/bundle/Resources/config/schema.yaml)\"" -docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console doctrine:query:sql \"\$(php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/connector-ai/src/bundle/Resources/config/schema.yaml)\"" + +if [[ "$COMPOSE_FILE" == *"db-postgresql.yml"* ]]; then + docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console doctrine:query:sql \"\$(php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/collaboration/src/bundle/Resources/config/schema.yaml)\"" + docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console doctrine:query:sql \"\$(php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/share/src/bundle/Resources/config/schema.yaml)\"" + docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console doctrine:query:sql \"\$(php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/connector-ai/src/bundle/Resources/config/schema.yaml)\"" +else + docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console doctrine:query:sql \"\$(php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/collaboration/src/bundle/Resources/config/schema.yaml)\"" + docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console doctrine:query:sql \"\$(php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/share/src/bundle/Resources/config/schema.yaml)\"" + docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console doctrine:query:sql \"\$(php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/connector-ai/src/bundle/Resources/config/schema.yaml)\"" +fi + # docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/share/src/bundle/Resources/config/schema.yaml" # docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/connector-ai/src/bundle/Resources/config/schema.yaml" #ddev php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/share/src/bundle/Resources/config/schema.yaml | ddev mysql From a86e2ddbfe17670ab7e502c1dece1c0fbf256d51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Mon, 30 Jun 2025 11:16:04 +0200 Subject: [PATCH 38/53] Remove cache dir --- bin/5.0.x-dev/prepare_project_edition.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bin/5.0.x-dev/prepare_project_edition.sh b/bin/5.0.x-dev/prepare_project_edition.sh index e2e217e..0fe39a1 100755 --- a/bin/5.0.x-dev/prepare_project_edition.sh +++ b/bin/5.0.x-dev/prepare_project_edition.sh @@ -204,6 +204,9 @@ docker compose --env-file=.env exec -T --user www-data app sh -c "composer requi # Update required Symfony version docker compose --env-file=.env exec -T --user www-data app sh -c "composer config extra.symfony.require '7.2.*'" +echo "> Remove cache dir" +docker compose --env-file=.env exec -T --user www-data app sh -c "rm -rf var/cache/*" +docker compose --env-file=.env exec -T --user www-data app sh -c "rm -rf var/cache/behat/*" # Upgrade Ibexa and Symfony packages (main app) docker compose --env-file=.env exec -T --user www-data app sh -c "composer require --no-update \ From a0c7404bab2705a6c524f61e9d128c9eb4d7465a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Mon, 30 Jun 2025 11:41:36 +0200 Subject: [PATCH 39/53] Do not rebuild the cache --- bin/5.0.x-dev/prepare_project_edition.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/5.0.x-dev/prepare_project_edition.sh b/bin/5.0.x-dev/prepare_project_edition.sh index 0fe39a1..c023340 100755 --- a/bin/5.0.x-dev/prepare_project_edition.sh +++ b/bin/5.0.x-dev/prepare_project_edition.sh @@ -241,7 +241,7 @@ docker compose --env-file=.env exec -T --user www-data app sh -c "composer confi docker compose --env-file=.env exec -T --user www-data app sh -c "composer update --with-all-dependencies --no-scripts --verbose" # TMP DEPENDENCIES -docker compose --env-file=.env exec -T --user www-data app sh -c "composer require 'ibexa/core:dev-fix-legacy-aliases as 5.0.x-dev'" +docker compose --env-file=.env exec -T --user www-data app sh -c "composer require 'ibexa/core:dev-fix-legacy-aliases as 5.0.x-dev' --no-scripts" # TMP: Move to development recipes From d4b7ceb18a16ef9be417203d1ece29c4dde8c017 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Mon, 30 Jun 2025 12:00:53 +0200 Subject: [PATCH 40/53] Added missing date and time --- bin/5.0.x-dev/prepare_project_edition.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/5.0.x-dev/prepare_project_edition.sh b/bin/5.0.x-dev/prepare_project_edition.sh index c023340..b73760a 100755 --- a/bin/5.0.x-dev/prepare_project_edition.sh +++ b/bin/5.0.x-dev/prepare_project_edition.sh @@ -279,10 +279,12 @@ if [[ "$COMPOSE_FILE" == *"db-postgresql.yml"* ]]; then docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console doctrine:query:sql \"\$(php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/collaboration/src/bundle/Resources/config/schema.yaml)\"" docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console doctrine:query:sql \"\$(php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/share/src/bundle/Resources/config/schema.yaml)\"" docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console doctrine:query:sql \"\$(php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/connector-ai/src/bundle/Resources/config/schema.yaml)\"" + docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console doctrine:query:sql \"\$(php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/product-catalog-date-time-attribute/src/bundle/Resources/config/schema.yaml)\"" else docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console doctrine:query:sql \"\$(php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/collaboration/src/bundle/Resources/config/schema.yaml)\"" docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console doctrine:query:sql \"\$(php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/share/src/bundle/Resources/config/schema.yaml)\"" docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console doctrine:query:sql \"\$(php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/connector-ai/src/bundle/Resources/config/schema.yaml)\"" + docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console doctrine:query:sql \"\$(php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/product-catalog-date-time-attribute/src/bundle/Resources/config/schema.yaml)\"" fi # docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/share/src/bundle/Resources/config/schema.yaml" From 4a8573a8b710579cb7f94e73930457d1b274f6b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Mon, 30 Jun 2025 12:05:50 +0200 Subject: [PATCH 41/53] Test PostgreSQL script --- bin/5.0.x-dev/prepare_project_edition.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/5.0.x-dev/prepare_project_edition.sh b/bin/5.0.x-dev/prepare_project_edition.sh index b73760a..e129bf1 100755 --- a/bin/5.0.x-dev/prepare_project_edition.sh +++ b/bin/5.0.x-dev/prepare_project_edition.sh @@ -242,6 +242,7 @@ docker compose --env-file=.env exec -T --user www-data app sh -c "composer updat # TMP DEPENDENCIES docker compose --env-file=.env exec -T --user www-data app sh -c "composer require 'ibexa/core:dev-fix-legacy-aliases as 5.0.x-dev' --no-scripts" +docker compose --env-file=.env exec -T --user www-data app sh -c "composer require 'ibexa/installer:dev-fix-update-script as 5.0.x-dev' --no-scripts" # TMP: Move to development recipes From 68ab4377ea6ef007cf2d06a37a8d89f0f2428acc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Mon, 30 Jun 2025 12:20:16 +0200 Subject: [PATCH 42/53] Added discounts --- bin/5.0.x-dev/prepare_project_edition.sh | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/bin/5.0.x-dev/prepare_project_edition.sh b/bin/5.0.x-dev/prepare_project_edition.sh index e129bf1..2f7d45f 100755 --- a/bin/5.0.x-dev/prepare_project_edition.sh +++ b/bin/5.0.x-dev/prepare_project_edition.sh @@ -276,17 +276,12 @@ fi # keep an eye! #ddev php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/collaboration/src/bundle/Resources/config/schema.yaml | ddev mysql -if [[ "$COMPOSE_FILE" == *"db-postgresql.yml"* ]]; then - docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console doctrine:query:sql \"\$(php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/collaboration/src/bundle/Resources/config/schema.yaml)\"" - docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console doctrine:query:sql \"\$(php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/share/src/bundle/Resources/config/schema.yaml)\"" - docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console doctrine:query:sql \"\$(php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/connector-ai/src/bundle/Resources/config/schema.yaml)\"" - docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console doctrine:query:sql \"\$(php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/product-catalog-date-time-attribute/src/bundle/Resources/config/schema.yaml)\"" -else - docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console doctrine:query:sql \"\$(php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/collaboration/src/bundle/Resources/config/schema.yaml)\"" - docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console doctrine:query:sql \"\$(php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/share/src/bundle/Resources/config/schema.yaml)\"" - docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console doctrine:query:sql \"\$(php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/connector-ai/src/bundle/Resources/config/schema.yaml)\"" - docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console doctrine:query:sql \"\$(php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/product-catalog-date-time-attribute/src/bundle/Resources/config/schema.yaml)\"" -fi +docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console doctrine:query:sql \"\$(php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/collaboration/src/bundle/Resources/config/schema.yaml)\"" +docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console doctrine:query:sql \"\$(php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/share/src/bundle/Resources/config/schema.yaml)\"" +docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console doctrine:query:sql \"\$(php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/connector-ai/src/bundle/Resources/config/schema.yaml)\"" +docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console doctrine:query:sql \"\$(php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/product-catalog-date-time-attribute/src/bundle/Resources/config/schema.yaml)\"" +docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console doctrine:query:sql \"\$(php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/discounts/src/bundle/Resources/config/schema.yaml)\"" +docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console doctrine:query:sql \"\$(php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/discounts-codes/src/bundle/Resources/config/schema.yaml)\"" # docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/share/src/bundle/Resources/config/schema.yaml" # docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/connector-ai/src/bundle/Resources/config/schema.yaml" From cd865180d23a63402dbee7b5e8992224e333bf13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Mon, 30 Jun 2025 12:35:05 +0200 Subject: [PATCH 43/53] Added comment --- bin/5.0.x-dev/prepare_project_edition.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/5.0.x-dev/prepare_project_edition.sh b/bin/5.0.x-dev/prepare_project_edition.sh index 2f7d45f..7659727 100755 --- a/bin/5.0.x-dev/prepare_project_edition.sh +++ b/bin/5.0.x-dev/prepare_project_edition.sh @@ -266,6 +266,7 @@ docker compose --env-file=.env exec -T --user www-data app sh -c "composer run-s # docker exec ibexa-db-1 sh -c "mysql -u ezp -pSetYourOwnPassword" # docker compose --env-file=.env exec -T --user www-data app sh -c "mysql < vendor/ibexa/installer/upgrade/db/mysql/ibexa-4.6.latest-to-5.0.0.sql" +echo '> Update database schema' if [[ "$COMPOSE_FILE" == *"db-postgresql.yml"* ]]; then docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console doctrine:query:sql \"\$(cat vendor/ibexa/installer/upgrade/db/postgresql/ibexa-4.6.latest-to-5.0.0.sql | grep -v '\-- ')\"" else From 860c9c881a6733273df57f3e7b4f24b1c0abcda4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Mon, 30 Jun 2025 12:54:27 +0200 Subject: [PATCH 44/53] Clear redis cache --- bin/5.0.x-dev/prepare_project_edition.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/5.0.x-dev/prepare_project_edition.sh b/bin/5.0.x-dev/prepare_project_edition.sh index 7659727..77feec4 100755 --- a/bin/5.0.x-dev/prepare_project_edition.sh +++ b/bin/5.0.x-dev/prepare_project_edition.sh @@ -290,6 +290,7 @@ docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/consol #ddev php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/connector-ai/src/bundle/Resources/config/schema.yaml | ddev mysql # Generate new GraphQL schema if used (while admin-ui doesn't use it anymore) +docker compose exec -T --user www-data app sh -c 'php bin/console cache:pool:clear ${CACHE_POOL:-cache.tagaware.filesystem}' docker compose --env-file=.env exec -T --user www-data app sh -c "composer require ibexa/graphql --no-interaction" docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:graphql:generate-schema" From 07759ef487fa1b9079e6361f2f720047a3251dfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Mon, 30 Jun 2025 14:07:12 +0200 Subject: [PATCH 45/53] Removed one TMP dependency --- bin/5.0.x-dev/prepare_project_edition.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/bin/5.0.x-dev/prepare_project_edition.sh b/bin/5.0.x-dev/prepare_project_edition.sh index 77feec4..80cb620 100755 --- a/bin/5.0.x-dev/prepare_project_edition.sh +++ b/bin/5.0.x-dev/prepare_project_edition.sh @@ -242,8 +242,6 @@ docker compose --env-file=.env exec -T --user www-data app sh -c "composer updat # TMP DEPENDENCIES docker compose --env-file=.env exec -T --user www-data app sh -c "composer require 'ibexa/core:dev-fix-legacy-aliases as 5.0.x-dev' --no-scripts" -docker compose --env-file=.env exec -T --user www-data app sh -c "composer require 'ibexa/installer:dev-fix-update-script as 5.0.x-dev' --no-scripts" - # TMP: Move to development recipes docker compose --env-file=.env exec -T --user www-data app sh -c "composer config extra.symfony.endpoint \"https://api.github.com/repos/ibexa/recipes-dev/contents/index.json?ref=flex/main\"" From a62e3b3b6a8a50d8fc88e377d215d6ae029a43ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Thu, 3 Jul 2025 10:14:43 +0200 Subject: [PATCH 46/53] Removed TMP changes --- bin/5.0.x-dev/prepare_project_edition.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/5.0.x-dev/prepare_project_edition.sh b/bin/5.0.x-dev/prepare_project_edition.sh index 80cb620..4e8482b 100755 --- a/bin/5.0.x-dev/prepare_project_edition.sh +++ b/bin/5.0.x-dev/prepare_project_edition.sh @@ -241,7 +241,7 @@ docker compose --env-file=.env exec -T --user www-data app sh -c "composer confi docker compose --env-file=.env exec -T --user www-data app sh -c "composer update --with-all-dependencies --no-scripts --verbose" # TMP DEPENDENCIES -docker compose --env-file=.env exec -T --user www-data app sh -c "composer require 'ibexa/core:dev-fix-legacy-aliases as 5.0.x-dev' --no-scripts" +# docker compose --env-file=.env exec -T --user www-data app sh -c "composer require 'ibexa/core:dev-fix-legacy-aliases as 5.0.x-dev' --no-scripts" # TMP: Move to development recipes docker compose --env-file=.env exec -T --user www-data app sh -c "composer config extra.symfony.endpoint \"https://api.github.com/repos/ibexa/recipes-dev/contents/index.json?ref=flex/main\"" @@ -288,7 +288,7 @@ docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/consol #ddev php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/connector-ai/src/bundle/Resources/config/schema.yaml | ddev mysql # Generate new GraphQL schema if used (while admin-ui doesn't use it anymore) -docker compose exec -T --user www-data app sh -c 'php bin/console cache:pool:clear ${CACHE_POOL:-cache.tagaware.filesystem}' +# docker compose exec -T --user www-data app sh -c 'php bin/console cache:pool:clear ${CACHE_POOL:-cache.tagaware.filesystem}' docker compose --env-file=.env exec -T --user www-data app sh -c "composer require ibexa/graphql --no-interaction" docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:graphql:generate-schema" From e35aa28ee172fdca15614d8a8384af890db69fa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Mon, 7 Jul 2025 15:38:04 +0200 Subject: [PATCH 47/53] Removed require ibexa/graphql --- bin/5.0.x-dev/prepare_project_edition.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/5.0.x-dev/prepare_project_edition.sh b/bin/5.0.x-dev/prepare_project_edition.sh index 4e8482b..d8a782b 100755 --- a/bin/5.0.x-dev/prepare_project_edition.sh +++ b/bin/5.0.x-dev/prepare_project_edition.sh @@ -289,7 +289,7 @@ docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/consol # Generate new GraphQL schema if used (while admin-ui doesn't use it anymore) # docker compose exec -T --user www-data app sh -c 'php bin/console cache:pool:clear ${CACHE_POOL:-cache.tagaware.filesystem}' -docker compose --env-file=.env exec -T --user www-data app sh -c "composer require ibexa/graphql --no-interaction" +#docker compose --env-file=.env exec -T --user www-data app sh -c "composer require ibexa/graphql --no-interaction" docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:graphql:generate-schema" # reindex From 5910823ed06be81690c592385fea183e4bc2ce82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Tue, 8 Jul 2025 16:07:10 +0200 Subject: [PATCH 48/53] Added cache:pool:clear before generate-schema --- bin/5.0.x-dev/prepare_project_edition.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bin/5.0.x-dev/prepare_project_edition.sh b/bin/5.0.x-dev/prepare_project_edition.sh index d8a782b..2ced4e0 100755 --- a/bin/5.0.x-dev/prepare_project_edition.sh +++ b/bin/5.0.x-dev/prepare_project_edition.sh @@ -290,6 +290,9 @@ docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/consol # Generate new GraphQL schema if used (while admin-ui doesn't use it anymore) # docker compose exec -T --user www-data app sh -c 'php bin/console cache:pool:clear ${CACHE_POOL:-cache.tagaware.filesystem}' #docker compose --env-file=.env exec -T --user www-data app sh -c "composer require ibexa/graphql --no-interaction" +if [[ "$COMPOSE_FILE" == *"redis.yml"* ]]; then + docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console cache:pool:clear --all" +fi docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:graphql:generate-schema" # reindex From 68f3c2c24b5bec4e937db46e4ab323aa32f47a5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Wed, 9 Jul 2025 14:32:39 +0200 Subject: [PATCH 49/53] Apply suggestion from @adriendupuis Co-authored-by: Adrien Dupuis <61695653+adriendupuis@users.noreply.github.com> --- bin/5.0.x-dev/prepare_project_edition.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/bin/5.0.x-dev/prepare_project_edition.sh b/bin/5.0.x-dev/prepare_project_edition.sh index 2ced4e0..8640559 100755 --- a/bin/5.0.x-dev/prepare_project_edition.sh +++ b/bin/5.0.x-dev/prepare_project_edition.sh @@ -287,12 +287,16 @@ docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/consol #ddev php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/share/src/bundle/Resources/config/schema.yaml | ddev mysql #ddev php bin/console ibexa:doctrine:schema:dump-sql vendor/ibexa/connector-ai/src/bundle/Resources/config/schema.yaml | ddev mysql -# Generate new GraphQL schema if used (while admin-ui doesn't use it anymore) -# docker compose exec -T --user www-data app sh -c 'php bin/console cache:pool:clear ${CACHE_POOL:-cache.tagaware.filesystem}' -#docker compose --env-file=.env exec -T --user www-data app sh -c "composer require ibexa/graphql --no-interaction" +# Clear persistence cache pool (when using Redis or Memcached) if [[ "$COMPOSE_FILE" == *"redis.yml"* ]]; then docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console cache:pool:clear --all" fi + +# Migration (update 'company' content type) +docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:migrations:import vendor/ibexa/corporate-account/src/bundle/Resources/migrations/2025_07_08_09_27_set_container_to_company.yaml" +docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:migrations:migrate --file=2025_07_08_09_27_set_container_to_company.yaml --siteaccess=admin" + +# Generate new GraphQL schema if used (while admin-ui doesn't use it anymore) docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:graphql:generate-schema" # reindex From 843c9168e01d8f4f22250dd7e0f75f8197ac9565 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Wed, 9 Jul 2025 14:32:55 +0200 Subject: [PATCH 50/53] Added installer dependency --- bin/5.0.x-dev/prepare_project_edition.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/5.0.x-dev/prepare_project_edition.sh b/bin/5.0.x-dev/prepare_project_edition.sh index 8640559..ac19ff3 100755 --- a/bin/5.0.x-dev/prepare_project_edition.sh +++ b/bin/5.0.x-dev/prepare_project_edition.sh @@ -241,7 +241,7 @@ docker compose --env-file=.env exec -T --user www-data app sh -c "composer confi docker compose --env-file=.env exec -T --user www-data app sh -c "composer update --with-all-dependencies --no-scripts --verbose" # TMP DEPENDENCIES -# docker compose --env-file=.env exec -T --user www-data app sh -c "composer require 'ibexa/core:dev-fix-legacy-aliases as 5.0.x-dev' --no-scripts" +docker compose --env-file=.env exec -T --user www-data app sh -c "composer require 'ibexa/installer:dev-alter-sequence as 5.0.x-dev' --no-scripts" # TMP: Move to development recipes docker compose --env-file=.env exec -T --user www-data app sh -c "composer config extra.symfony.endpoint \"https://api.github.com/repos/ibexa/recipes-dev/contents/index.json?ref=flex/main\"" From fd8c5c90f4c3b59b537187c6ec294f55c1dd9f1b Mon Sep 17 00:00:00 2001 From: Adrien Dupuis <61695653+adriendupuis@users.noreply.github.com> Date: Thu, 10 Jul 2025 11:49:26 +0200 Subject: [PATCH 51/53] prepare_project_edition.sh: More migration files --- bin/5.0.x-dev/prepare_project_edition.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bin/5.0.x-dev/prepare_project_edition.sh b/bin/5.0.x-dev/prepare_project_edition.sh index ac19ff3..222c5ac 100755 --- a/bin/5.0.x-dev/prepare_project_edition.sh +++ b/bin/5.0.x-dev/prepare_project_edition.sh @@ -295,6 +295,10 @@ fi # Migration (update 'company' content type) docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:migrations:import vendor/ibexa/corporate-account/src/bundle/Resources/migrations/2025_07_08_09_27_set_container_to_company.yaml" docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:migrations:migrate --file=2025_07_08_09_27_set_container_to_company.yaml --siteaccess=admin" +docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:migrations:import vendor/ibexa/product-catalog/src/bundle/Resources/migrations/2025_07_09_13_52_mark_product_category_container.yaml" +docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:migrations:migrate --file=2025_07_09_13_52_mark_product_category_container.yaml --siteaccess=admin" +docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:migrations:import vendor/ibexa/taxonomy/src/bundle/Resources/install/migrations/2025_08_09_14_47_mark_tag_as_container.yaml" +docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:migrations:migrate --file=2025_08_09_14_47_mark_tag_as_container.yaml --siteaccess=admin" # Generate new GraphQL schema if used (while admin-ui doesn't use it anymore) docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:graphql:generate-schema" From 75cb1961608f1b9c5aa88b5c29649200181db606 Mon Sep 17 00:00:00 2001 From: tomaszszopinski Date: Wed, 16 Jul 2025 14:22:19 +0200 Subject: [PATCH 52/53] update to symfony 7.3 --- bin/5.0.x-dev/prepare_project_edition.sh | 28 +++++++++++++----------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/bin/5.0.x-dev/prepare_project_edition.sh b/bin/5.0.x-dev/prepare_project_edition.sh index 222c5ac..f87006d 100755 --- a/bin/5.0.x-dev/prepare_project_edition.sh +++ b/bin/5.0.x-dev/prepare_project_edition.sh @@ -202,7 +202,7 @@ docker compose --env-file=.env exec -T --user www-data app sh -c "composer confi # Update required PHP version docker compose --env-file=.env exec -T --user www-data app sh -c "composer require --no-update 'php:>=8.3'" # Update required Symfony version -docker compose --env-file=.env exec -T --user www-data app sh -c "composer config extra.symfony.require '7.2.*'" +docker compose --env-file=.env exec -T --user www-data app sh -c "composer config extra.symfony.require '7.3.*'" echo "> Remove cache dir" docker compose --env-file=.env exec -T --user www-data app sh -c "rm -rf var/cache/*" @@ -213,25 +213,25 @@ docker compose --env-file=.env exec -T --user www-data app sh -c "composer requi ibexa/commerce:5.0.x-dev \ ibexa/behat:5.0.x-dev \ ibexa/docker:5.0.x-dev \ - symfony/console:^7.2 \ - symfony/dotenv:^7.2 \ - symfony/framework-bundle:^7.2 \ - symfony/runtime:^7.2 \ - symfony/yaml:^7.2 \ + symfony/console:^7.3 \ + symfony/dotenv:^7.3 \ + symfony/framework-bundle:^7.3 \ + symfony/runtime:^7.3 \ + symfony/yaml:^7.3 \ ;" # TMP: admin-ui-assets and headless-assets need to be on a tag docker compose --env-file=.env exec -T --user www-data app sh -c "composer require --no-update \ - ibexa/admin-ui-assets:v5.0.0-beta2 \ - ibexa/headless-assets:v5.0.0-beta1 \ + ibexa/admin-ui-assets:v5.0.0-rc1 \ + ibexa/headless-assets:v5.0.0-rc1 \ ;" # Upgrade Ibexa and Symfony packages (dev tools) docker compose --env-file=.env exec -T --user www-data app sh -c "composer require --dev --no-update \ ibexa/rector:5.0.x-dev \ - symfony/debug-bundle:^7.2 \ - symfony/stopwatch:^7.2 \ - symfony/web-profiler-bundle:^7.2 \ + symfony/debug-bundle:^7.3 \ + symfony/stopwatch:^7.3 \ + symfony/web-profiler-bundle:^7.3 \ ;" # Remove Php82HideDeprecationsErrorHandler @@ -251,8 +251,10 @@ docker compose --env-file=.env exec -T --user www-data app sh -c "rm symfony.loc docker compose --env-file=.env exec -T --user www-data app sh -c "composer recipes:install ibexa/commerce --force --yes -v" # Swap tsconfig.json usage and creation -docker compose --env-file=.env exec -T --user www-data app sh -c "perl -0pe 's/\"ibexa:encore:compile\": \"symfony-cmd\",\n\s+\"yarn ibexa-generate-tsconfig\": \"script\"/\"yarn ibexa-generate-tsconfig\": \"script\",\n \"ibexa:encore:compile\": \"symfony-cmd\"/gms' -i composer.json" - +docker compose --env-file=.env exec -T --user www-data app sh -c "perl -0pe 's/\"ibexa:encore:compile --config-name\": \"symfony-cmd\",\n\s+\"yarn ibexa-generate-tsconfig\": \"script\"/\"yarn ibexa-generate-tsconfig\": \"script\",\n \"ibexa:encore:compile\": \"symfony-cmd\"/gms' -i composer.json" + +docker compose --env-file=.env exec -T --user www-data app sh -c "perl -ne 'print unless /IbexaIconsBundle/' -i config/bundles.php" + # Manually clear cache to ensure scripts won't use a piece of it docker compose --env-file=.env exec -T --user www-data app sh -c "rm -rf var/cache" From 329862440e0a8cfff0bed732389da521a6b70aef Mon Sep 17 00:00:00 2001 From: tomaszszopinski Date: Wed, 23 Jul 2025 10:28:01 +0200 Subject: [PATCH 53/53] removed installer dependencies --- bin/5.0.x-dev/prepare_project_edition.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/bin/5.0.x-dev/prepare_project_edition.sh b/bin/5.0.x-dev/prepare_project_edition.sh index f87006d..d854529 100755 --- a/bin/5.0.x-dev/prepare_project_edition.sh +++ b/bin/5.0.x-dev/prepare_project_edition.sh @@ -240,9 +240,6 @@ docker compose --env-file=.env exec -T --user www-data app sh -c "composer confi # Update packages / Install new dependencies docker compose --env-file=.env exec -T --user www-data app sh -c "composer update --with-all-dependencies --no-scripts --verbose" -# TMP DEPENDENCIES -docker compose --env-file=.env exec -T --user www-data app sh -c "composer require 'ibexa/installer:dev-alter-sequence as 5.0.x-dev' --no-scripts" - # TMP: Move to development recipes docker compose --env-file=.env exec -T --user www-data app sh -c "composer config extra.symfony.endpoint \"https://api.github.com/repos/ibexa/recipes-dev/contents/index.json?ref=flex/main\"" # Reset recipes