diff --git a/.gitattributes b/.gitattributes index 5d2a6d7ff2..14ee0d161a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -16,6 +16,7 @@ /.* export-ignore /.phpstorm.meta.php -export-ignore /addons/ export-ignore +/project/ export-ignore /tests/ export-ignore /docker-compose.yml export-ignore /phpstan.dist.neon export-ignore diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index f35b36f066..adfbb6b635 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -205,9 +205,9 @@ jobs: run: | sudo /etc/init.d/mysql start mysql -uroot -h127.0.0.1 -proot -e 'create database redaxo6;' - php .tools/bin/console setup:run -n --lang=de_de --db-host=127.0.0.1 --db-name=redaxo6 --db-password=root --db-createdb=no --db-setup=normal --admin-username=admin --admin-password=adminpassword --error-email=test@redaxo.invalid --ansi -v - php .tools/bin/console config:set --type boolean debug.enabled true -v - php .tools/bin/console config:set --type boolean debug.throw_always_exception true -v + php project/bin/console setup:run -n --lang=de_de --db-host=127.0.0.1 --db-name=redaxo6 --db-password=root --db-createdb=no --db-setup=normal --admin-username=admin --admin-password=adminpassword --error-email=test@redaxo.invalid --ansi -v + php project/bin/console config:set --type boolean debug.enabled true -v + php project/bin/console config:set --type boolean debug.throw_always_exception true -v - name: Run phpstan analysis if: github.event_name != 'repository_dispatch' diff --git a/.github/workflows/styles-compile.yml b/.github/workflows/styles-compile.yml index b21174646e..a9e280cb09 100644 --- a/.github/workflows/styles-compile.yml +++ b/.github/workflows/styles-compile.yml @@ -71,12 +71,12 @@ jobs: run: | sudo /etc/init.d/mysql start mysql -uroot -h127.0.0.1 -proot -e 'create database redaxo6;' - php .tools/bin/console setup:run -n --lang=de_de --db-host=127.0.0.1 --db-name=redaxo6 --db-password=root --db-createdb=no --db-setup=normal --admin-username=admin --admin-password=adminpassword --error-email=test@redaxo.invalid --ansi -v - php .tools/bin/console config:set --type boolean debug.enabled true -v - php .tools/bin/console config:set --type boolean debug.throw_always_exception true -v + php project/bin/console setup:run -n --lang=de_de --db-host=127.0.0.1 --db-name=redaxo6 --db-password=root --db-createdb=no --db-setup=normal --admin-username=admin --admin-password=adminpassword --error-email=test@redaxo.invalid --ansi -v + php project/bin/console config:set --type boolean debug.enabled true -v + php project/bin/console config:set --type boolean debug.throw_always_exception true -v - name: Compile styles - run: php .tools/bin/console assets:compile-styles --ansi -v + run: php project/bin/console assets:compile-styles --ansi -v - name: Commit changed files uses: stefanzweifel/git-auto-commit-action@04702edda442b2e678b25b537cec683a1493fcb9 # v7.1.0 @@ -92,4 +92,4 @@ jobs: if: env.writable == 0 run: | # check if compiling the scss lead to uncommitted changes - git diff HEAD --exit-code --output=/dev/null || (echo "::error::It seems you missed to commit the compiled css files, run '.tools/bin/console assets:compile-styles' and push the changes." && exit 1) + git diff HEAD --exit-code --output=/dev/null || (echo "::error::It seems you missed to commit the compiled css files, run 'project/bin/console assets:compile-styles' and push the changes." && exit 1) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 7feaf57576..ff19cb0e41 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -74,11 +74,11 @@ jobs: - name: Setup REDAXO run: | mysql -uroot -h127.0.0.1 -proot -e 'create database redaxo6;' - php .tools/bin/console setup:run -n --lang=de_de --db-host=127.0.0.1 --db-name=redaxo6 --db-password=root --db-createdb=no --db-setup=normal --admin-username=admin --admin-password=adminpassword --error-email=test@redaxo.invalid --ansi -v - php .tools/bin/console config:set --type boolean debug.enabled true -v - php .tools/bin/console config:set --type boolean debug.throw_always_exception true -v - .tools/bin/console addon:install test -v - .tools/bin/console system:report -v + php project/bin/console setup:run -n --lang=de_de --db-host=127.0.0.1 --db-name=redaxo6 --db-password=root --db-createdb=no --db-setup=normal --admin-username=admin --admin-password=adminpassword --error-email=test@redaxo.invalid --ansi -v + php project/bin/console config:set --type boolean debug.enabled true -v + php project/bin/console config:set --type boolean debug.throw_always_exception true -v + project/bin/console addon:install test -v + project/bin/console system:report -v - name: Run phpunit run: vendor/bin/phpunit --colors=always diff --git a/.github/workflows/visual-tests.yml b/.github/workflows/visual-tests.yml index 4bf38bb616..3aa559e8fe 100644 --- a/.github/workflows/visual-tests.yml +++ b/.github/workflows/visual-tests.yml @@ -94,37 +94,37 @@ jobs: run: | sudo /etc/init.d/mysql start mysql -uroot -h127.0.0.1 -proot -e 'create database redaxo6;' - php .tools/bin/console setup:run -n --lang=de_de --db-host=127.0.0.1 --db-name=redaxo6 --db-password=root --db-createdb=no --db-setup=normal --admin-username=admin --admin-password=adminpassword --error-email=test@redaxo.invalid --ansi -v - php .tools/bin/console config:set --type boolean debug.enabled true -v - php .tools/bin/console config:set --type boolean debug.throw_always_exception true -v - php .tools/bin/console addon:install test -v + php project/bin/console setup:run -n --lang=de_de --db-host=127.0.0.1 --db-name=redaxo6 --db-password=root --db-createdb=no --db-setup=normal --admin-username=admin --admin-password=adminpassword --error-email=test@redaxo.invalid --ansi -v + php project/bin/console config:set --type boolean debug.enabled true -v + php project/bin/console config:set --type boolean debug.throw_always_exception true -v + php project/bin/console addon:install test -v - name: Import mock data run: | - mkdir -p $GITHUB_WORKSPACE/.tools/project/var/data/core/backup && cp -r .tools/visual-tests/fixtures/initial-content.sql $GITHUB_WORKSPACE/.tools/project/var/data/core/backup/ - cp -r .tools/visual-tests/fixtures/media/* $GITHUB_WORKSPACE/.tools/project/public/media/ + mkdir -p $GITHUB_WORKSPACE/project/var/data/core/backup && cp -r .tools/visual-tests/fixtures/initial-content.sql $GITHUB_WORKSPACE/project/var/data/core/backup/ + cp -r .tools/visual-tests/fixtures/media/* $GITHUB_WORKSPACE/project/public/media/ cp -f .tools/visual-tests/fixtures/README.md $GITHUB_WORKSPACE/addons/test/README.de.md - php .tools/bin/console setup:run -n --lang=de_de --db-password=root --db-setup=import --db-import=initial-content --admin-username=myusername --admin-password=mypassword --ansi -v + php project/bin/console setup:run -n --lang=de_de --db-password=root --db-setup=import --db-import=initial-content --admin-username=myusername --admin-password=mypassword --ansi -v - name: Install packages run: | - php .tools/bin/console addon:install debug --ansi -v + php project/bin/console addon:install debug --ansi -v - name: Start php server run: | - cat < .tools/project/public/router.php + cat < project/public/router.php -