Skip to content

Commit 1bd4099

Browse files
symfony-swoole-botRastusik
authored andcommitted
chore(doctrine): fix for doctrine proxy factory + monolog upgrade
1 parent 91fd8a6 commit 1bd4099

File tree

7 files changed

+983
-862
lines changed

7 files changed

+983
-862
lines changed

.circleci/config.yml

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ aliases:
9494
only: /pull\/[0-9]+/
9595

9696
orbs:
97-
codecov: codecov/codecov@3.3.0
97+
qlty-orb: qltysh/qlty-orb@0.0
9898

9999
executors:
100100
swoole-bundle-docker-client:
@@ -392,30 +392,26 @@ jobs:
392392
name: Run Composer
393393
command: |
394394
composer install --no-progress --no-interaction --ansi
395-
- run:
396-
name: Prepare CodeClimate Code Coverage reporter
397-
command: |-
398-
wget -O cc-test-reporter https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64
399-
chmod +x ./cc-test-reporter
400-
./cc-test-reporter before-build
401395
- attach_workspace:
402396
at: /usr/src/app/cov
403397
- run:
404398
name: Merge code coverage files generated across test suites
405399
command: composer run merge-code-coverage
406400
- run:
407-
name: Send Code Coverage report to CodeClimate
408-
command: ./cc-test-reporter after-build -t clover --exit-code 0 --prefix /usr/src/app
409-
- codecov/upload:
410-
file: clover.xml
401+
name: Publish Qlty coverage
402+
command: |
403+
bash -c '
404+
curl https://qlty.sh | sh
405+
~/.qlty/bin/qlty coverage publish clover.xml
406+
'
411407
docker:
412408
- image: docker.io/symfonywithswoole/swoole-bundle-merge-code-coverage:8.2-$CIRCLE_SHA1
413409
auth:
414410
username: $DOCKER_HUB_USERNAME
415411
password: $DOCKER_HUB_TOKEN
416412
user: app
417413
environment:
418-
CC_TEST_REPORTER_ID: bf289560199c71f3aace641542bbe012262dd7c3381558fccf46dff27855a587
414+
QLTY_COVERAGE_TOKEN: ${{ secrets.QLTY_COVERAGE_TOKEN }}
419415

420416
check-composer-config:
421417
docker:

Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,9 @@ ENTRYPOINT ["composer"]
133133
CMD ["unit-code-coverage"]
134134

135135
FROM base-pcov-xdebug AS MergeCodeCoverage
136+
USER root:root
137+
RUN apk add --no-cache bash
138+
USER app:runner
136139
ENTRYPOINT ["composer"]
137140
CMD ["merge-code-coverage"]
138141

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"ext-json": "*",
3131
"beberlei/assert": "^3.3.3",
3232
"laminas/laminas-code": "^4.7||^4.8",
33-
"monolog/monolog": "^3.3",
33+
"monolog/monolog": "^3.6",
3434
"symfony/cache": "^6.4|^7.2",
3535
"symfony/config": "^6.4|^7.2",
3636
"symfony/console": "^6.4|^7.2",
@@ -73,7 +73,7 @@
7373
"slevomat/coding-standard": "^8.14",
7474
"squizlabs/php_codesniffer": "^3.8",
7575
"swoole-bundle/resetter-bundle": "^1.1",
76-
"swoole-bundle/z-engine": "^8.2.1|^8.3|^8.4",
76+
"swoole-bundle/z-engine": "8.2.3||8.3.1||8.4.1",
7777
"swoole/ide-helper": "^6.0.0",
7878
"symfony/debug-bundle": "^6.4|^7.2",
7979
"symfony/doctrine-messenger": "^6.4|^7.2",

0 commit comments

Comments
 (0)