From e6a6aa5c9b18c391d54232ed166e978a9712ba57 Mon Sep 17 00:00:00 2001 From: Niels Keurentjes Date: Thu, 7 Dec 2023 16:45:26 +0100 Subject: [PATCH] Tighten low end dependencies --- .github/workflows/ci.yaml | 19 ------------------- bin/prepare-commit | 6 +----- composer.json | 22 +++++++++++----------- 3 files changed, 12 insertions(+), 35 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 0ab3585..ed68dc2 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -69,25 +69,6 @@ jobs: - name: Run automated tests run: vendor/bin/phpunit --coverage-text --coverage-xml build/coverage-xml --coverage-cobertura build/cobertura.xml - - name: Code Coverage Report - uses: irongut/CodeCoverageSummary@v1.3.0 - with: - filename: build/cobertura.xml - fail_below_min: true - format: markdown - hide_branch_rate: false - hide_complexity: true - indicators: true - output: both - thresholds: '80 90' - - - name: Add Coverage PR Comment - uses: marocchino/sticky-pull-request-comment@v2 - if: github.event_name == 'pull_request' - with: - recreate: true - path: code-coverage-results.md - - name: Upload coverage reports to Codecov uses: codecov/codecov-action@v3 env: diff --git a/bin/prepare-commit b/bin/prepare-commit index c1ed15e..9eb1969 100755 --- a/bin/prepare-commit +++ b/bin/prepare-commit @@ -9,13 +9,9 @@ export XDEBUG_MODE=coverage vendor/bin/php-cs-fixer fix vendor/bin/phpstan -# Clear cache and quarantine manually to avoid locking up with corrupted container +# Clear cache manually to avoid locking up with corrupted container rm -rf tests/Fixtures/var/cache/test php -d "zend.assertions=1" vendor/bin/phpunit --testdox --coverage-text \ --coverage-xml=build/coverage/coverage-xml --log-junit=build/coverage/junit.xml -# Run with lower MSI in diff-filter mode as it doesn't include coverage from other tests -#vendor/bin/infection --threads=max --git-diff-filter=AM --min-msi=80 --min-covered-msi=80 \ -# --coverage=build/coverage - echo "All good, ready for commit!" diff --git a/composer.json b/composer.json index 1d0c393..51df23c 100644 --- a/composer.json +++ b/composer.json @@ -33,10 +33,10 @@ "ext-mongodb": "*", "ext-pdo_sqlite": "*", "ext-zip": "*", - "doctrine/common": "^2.6|^3.3", + "doctrine/common": "^3.4", "doctrine/doctrine-bundle": "^2.11.1", - "doctrine/orm": "^2.17", - "doctrine/persistence": "^3.0.3", + "doctrine/orm": "^2.17.1", + "doctrine/persistence": "^3.2.0", "friendsofphp/php-cs-fixer": "^v3.40.0", "mongodb/mongodb": "^1.12", "ocramius/package-versions": "^2.8", @@ -48,16 +48,16 @@ "phpstan/phpstan-symfony": "^1.3.5", "phpunit/phpunit": "^10.5.1", "ruflin/elastica": "^6.2|^7.2", - "symfony/browser-kit": "^6.1.3|^7.0", - "symfony/css-selector": "^6.1.3|^7.0", + "symfony/browser-kit": "^6.3|^7.0", + "symfony/css-selector": "^6.3|^7.0", "symfony/doctrine-bridge": "^6.3|^7.0", - "symfony/dom-crawler": "^6.3.0|^7.0", - "symfony/intl": "^6.1|^7.0", - "symfony/mime": "^6.2.0|^7.0", + "symfony/dom-crawler": "^6.3|^7.0", + "symfony/intl": "^6.3|^7.0", + "symfony/mime": "^6.3|^7.0", "symfony/phpunit-bridge": "^6.3|^7.0", - "symfony/twig-bundle": "^6.1.1|^7.0", - "symfony/var-dumper": "^6.3.0|^7.0", - "symfony/yaml": "^6.1.3|^7.0" + "symfony/twig-bundle": "^6.3|^7.0", + "symfony/var-dumper": "^6.3|^7.0", + "symfony/yaml": "^6.3|^7.0" }, "suggest": { "doctrine/doctrine-bundle": "For integrated access to Doctrine object managers",