Skip to content

Commit

Permalink
Merge branch 'develop' into SHARE-530
Browse files Browse the repository at this point in the history
  • Loading branch information
@dmetzner
dmetzner authored Sep 28, 2023
2 parents b532ca5 + faee9e6 commit 56c1166
Show file tree
Hide file tree
Showing 83 changed files with 560 additions and 352 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/tests.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,7 @@ jobs:
with:
name: PhpUnitTestReport
path: tests/TestReports/CoverageReports/PhpUnit

- uses: codecov/codecov-action@v4-beta
- uses: codecov/codecov-action@v3
with:
# token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos
file: tests/TestReports/CoverageReports/PhpUnit/coverage.xml
Expand Down Expand Up @@ -235,8 +234,7 @@ jobs:
cat tests/TestReports/Behat/${{ matrix.testSuite }}.log;
docker exec app.catroweb bin/behat -s ${{ matrix.testSuite }} -f pretty;
fi
- uses: codecov/codecov-action@v4-beta
- uses: codecov/codecov-action@v3
with:
# token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos
file: tests/TestReports/CoverageReports/Behat/coverage.xml
Expand Down
106 changes: 53 additions & 53 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,85 +13,85 @@
"ext-pcntl": "*",
"ext-posix": "*",
"ext-zip": "*",
"beberlei/doctrineextensions": "^1.3",
"beberlei/doctrineextensions": "1.3.*",
"catrobat/capi": "1.1.*",
"codercat/jwk-to-pem": "^1.1",
"doctrine/annotations": "^2.0",
"doctrine/dbal": "^3.6",
"doctrine/doctrine-bundle": "^2.9",
"doctrine/doctrine-migrations-bundle": "^3.2",
"doctrine/orm": "^2.15",
"eightpoints/guzzle-bundle": "^8.4",
"friendsofsymfony/elastica-bundle": "^6.3",
"gesdinet/jwt-refresh-token-bundle": "^1.1",
"google/apiclient": "^2.14",
"google/cloud-translate": "^1.13",
"codercat/jwk-to-pem": "1.1.*",
"doctrine/annotations": "2.0.*",
"doctrine/dbal": "3.7.*",
"doctrine/doctrine-bundle": "2.9.*",
"doctrine/doctrine-migrations-bundle": "3.2.*",
"doctrine/orm": "2.15.*",
"eightpoints/guzzle-bundle": "8.4.*",
"friendsofsymfony/elastica-bundle": "6.3.*",
"gesdinet/jwt-refresh-token-bundle": "1.1.*",
"google/apiclient": "2.14.*",
"google/cloud-translate": "1.13.*",
"http-interop/http-factory-guzzle": "*",
"hwi/oauth-bundle": "dev-master",
"incenteev/composer-parameter-handler": "^2.1",
"lexik/jwt-authentication-bundle": "^2.19",
"php-http/guzzle7-adapter": "^1.0",
"php-http/httplug-bundle": "^1.29",
"php-http/message": "^1.16",
"ramsey/uuid": "^4.7",
"ramsey/uuid-doctrine": "^2.0",
"rosell-dk/webp-convert": "^2.9",
"sonata-project/admin-bundle": "^4.24",
"sonata-project/doctrine-orm-admin-bundle": "^4.13",
"sonata-project/exporter": "^3.1",
"sonata-project/twig-extensions": "^2.1",
"sonata-project/user-bundle": "^5.8",
"symfony/acl-bundle": "^2.3",
"incenteev/composer-parameter-handler": "2.1.*",
"lexik/jwt-authentication-bundle": "2.19.*",
"php-http/guzzle7-adapter": "1.0.*",
"php-http/httplug-bundle": "1.29.*",
"php-http/message": "1.16.*",
"ramsey/uuid": "4.7.*",
"ramsey/uuid-doctrine": "2.0.*",
"rosell-dk/webp-convert": "2.9.*",
"sonata-project/admin-bundle": "4.24.*",
"sonata-project/doctrine-orm-admin-bundle": "4.13.*",
"sonata-project/exporter": "3.1.*",
"sonata-project/twig-extensions": "2.1.*",
"sonata-project/user-bundle": "5.8.*",
"symfony/acl-bundle": "2.3.*",
"symfony/asset": "6.3.*",
"symfony/cache": "6.3.*",
"symfony/console": "6.3.*",
"symfony/dotenv": "6.3.*",
"symfony/flex": "^2.3",
"symfony/flex": "2.3.*",
"symfony/framework-bundle": "6.3.*",
"symfony/intl": "6.3.*",
"symfony/mailer": "6.3.*",
"symfony/monolog-bundle": "^3.8",
"symfony/polyfill-iconv": "^1.27",
"symfony/monolog-bundle": "3.8.*",
"symfony/polyfill-iconv": "1.27.*",
"symfony/process": "6.3.*",
"symfony/routing": "6.3.*",
"symfony/sendinblue-mailer": "6.3.*",
"symfony/stimulus-bundle": "^2.9",
"symfony/stimulus-bundle": "2.11.*",
"symfony/translation": "6.3.*",
"symfony/twig-bundle": "6.3.*",
"symfony/validator": "6.3.*",
"symfony/webpack-encore-bundle": "^2.0",
"symfony/webpack-encore-bundle": "2.1.*",
"symfony/yaml": "6.3.*",
"symfonycasts/reset-password-bundle": "^1.17",
"symfonycasts/verify-email-bundle": "^1.13",
"twig/extra-bundle": "^3.6",
"twig/twig": "^3.6"
"symfonycasts/reset-password-bundle": "1.18.*",
"symfonycasts/verify-email-bundle": "1.14.*",
"twig/extra-bundle": "3.6.*",
"twig/twig": "3.6.*"
},
"require-dev": {
"behat/behat": "^3.13",
"behat/mink": "^1.10",
"deployer/deployer": "^v7.3",
"dmore/behat-chrome-extension": "^1.4",
"behat/behat": "3.13.*",
"behat/mink": "1.10.*",
"deployer/deployer": "v7.3.*",
"dmore/behat-chrome-extension": "1.4.*",
"dmore/chrome-mink-driver": "2.9.*",
"doctrine/doctrine-fixtures-bundle": "^3.4",
"dvdoug/behat-code-coverage": "^5.3",
"friends-of-behat/symfony-extension": "^2.4",
"doctrine/doctrine-fixtures-bundle": "3.4.*",
"dvdoug/behat-code-coverage": "5.3.*",
"friends-of-behat/symfony-extension": "2.4.*",
"friends-of-behat/mink-extension": "v2.7.3",
"friendsofphp/php-cs-fixer": "^3.17",
"phpstan/phpstan": "^1.10",
"phpstan/phpstan-doctrine": "^1.3",
"phpstan/phpstan-phpunit": "^1.3",
"phpstan/phpstan-symfony": "^1.3",
"phpunit/phpunit": "^10.3",
"rector/rector": "^0.18.0",
"friendsofphp/php-cs-fixer": "3.30.*",
"phpstan/phpstan": "1.10.*",
"phpstan/phpstan-doctrine": "1.3.*",
"phpstan/phpstan-phpunit": "1.3.*",
"phpstan/phpstan-symfony": "1.3.*",
"phpunit/phpunit": "10.3.*",
"rector/rector": "0.18.*",
"symfony/browser-kit": "6.3.*",
"symfony/http-client": "6.3.*",
"symfony/maker-bundle": "^1.48",
"symfony/maker-bundle": "1.48.*",
"symfony/phpunit-bridge": "6.3.*",
"symfony/stopwatch": "6.3.*",
"symfony/web-profiler-bundle": "6.3.*",
"vimeo/psalm": "^5.14.0",
"wapmorgan/php-deprecation-detector": "^2.0",
"textalk/websocket": "1.5.8"
"vimeo/psalm": "5.15.*",
"wapmorgan/php-deprecation-detector": "2.0.*",
"textalk/websocket": "1.5.8.*"
},
"config": {
"platform": {
Expand Down
Loading

0 comments on commit 56c1166

Please sign in to comment.