Skip to content

Commit 9b9b67a

Browse files
committed
Merge branch 'master' into md3
2 parents 5b014de + 20fafcf commit 9b9b67a

37 files changed

+1335
-1390
lines changed

.github/workflows/main.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ jobs:
3030

3131
- uses: shivammathur/setup-php@v2
3232
with:
33-
php-version: '8.2'
34-
coverage: pcov
33+
php-version: '8.4'
34+
coverage: none
3535
tools: cs2pr
3636
extensions: imagick
3737

@@ -62,12 +62,7 @@ jobs:
6262
# Lint and tests
6363
- run: ./vendor/bin/php-cs-fixer fix --format=checkstyle | cs2pr
6464
- run: ./vendor/bin/phpstan analyse
65-
- run: ./vendor/bin/phpunit --coverage-clover coverage-clover.xml
65+
- run: ./vendor/bin/phpunit
6666
- run: yarn lint
6767
- run: ./node_modules/.bin/prettier --experimental-cli --check .
6868
- run: ./node_modules/.bin/ng test --progress false --watch=false --browsers ChromeHeadlessCustom
69-
70-
- name: Upload code coverage
71-
run: |
72-
composer global require scrutinizer/ocular
73-
~/.composer/vendor/bin/ocular code-coverage:upload --format=php-clover coverage-clover.xml

.scrutinizer.yml

Lines changed: 0 additions & 36 deletions
This file was deleted.

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
# Les artisans de la transition
22

33
[![Build Status](https://github.com/ecodev/artisans/workflows/main/badge.svg)](https://github.com/ecodev/artisans/actions)
4-
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/Ecodev/artisans/badges/quality-score.png?b=master&s=2b6588a62b5d35d80bd104014502605b7520f49a)](https://scrutinizer-ci.com/g/Ecodev/artisans/?branch=master)  
5-
[![Code Coverage](https://scrutinizer-ci.com/g/Ecodev/artisans/badges/coverage.png?b=master&s=cc2eec510484f44409973822e7e3a805df6a1e91)](https://scrutinizer-ci.com/g/Ecodev/artisans/?branch=master)
64

75
## Introduction
86

bin/build.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ if id "$DEPLOY_USER" >/dev/null 2>&1; then
4343
export HOME="$TMP_DIR/home-$DEPLOY_USER"
4444
fi
4545

46-
# Try to use PHP 8.2, or fallback to default version
47-
PHP=`which php8.2` || PHP='php'
46+
# Try to use PHP 8.4, or fallback to default version
47+
PHP=`which php8.4` || PHP='php'
4848
COMPOSER="$PHP `which composer` --no-interaction --no-plugins"
4949

5050
# Exit script on any error
@@ -74,7 +74,6 @@ $PHP ./bin/clear-config-cache.php
7474

7575
echo "Updating database..."
7676
$PHP ./bin/doctrine migrations:migrate --no-interaction
77-
$PHP ./bin/doctrine orm:generate-proxies
7877
$PHP ./bin/create-triggers.php
7978

8079
echo "Delete old logs..."

bin/dump-schema

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ function write(folder, filename, content) {
2020
}
2121

2222
const query = utilities.getIntrospectionQuery();
23-
const php = execSync('which php8.2 || which php').toString().trim();
23+
const php = execSync('which php8.4 || which php').toString().trim();
2424
const schemaJsonString = execFileSync(php, ['./bin/graphql.php', query], {maxBuffer: 10 * 1024 * 1024}).toString();
2525
const schemaLiteral = JSON.parse(schemaJsonString).data;
2626
const schemaObject = buildClientSchema(schemaLiteral);

composer.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,30 +49,30 @@
4949
}
5050
},
5151
"require": {
52-
"php": "^8.2",
52+
"php": "^8.4",
5353
"ext-bcmath": "*",
5454
"ext-dom": "*",
5555
"ext-fileinfo": "*",
5656
"ext-iconv": "*",
5757
"ext-json": "*",
5858
"ext-pdo": "*",
5959
"beberlei/doctrineextensions": "^1.5",
60-
"ecodev/felix": "^16.3",
60+
"ecodev/felix": "^17.0",
6161
"ecodev/graphql-doctrine": "^11.0",
6262
"ecodev/graphql-upload": "^8.0",
63-
"laminas/laminas-config-aggregator": "^1.15",
64-
"laminas/laminas-http": "^2.19",
65-
"laminas/laminas-servicemanager": "^3.22",
66-
"mezzio/mezzio": "^3.19",
67-
"mezzio/mezzio-fastroute": "^3.11",
68-
"mezzio/mezzio-helpers": "^5.16",
69-
"mezzio/mezzio-laminasviewrenderer": "^2.15",
70-
"mezzio/mezzio-session-ext": "^1.19"
63+
"laminas/laminas-config-aggregator": "^1.19",
64+
"laminas/laminas-http": "^2.23",
65+
"laminas/laminas-servicemanager": "^3.24",
66+
"mezzio/mezzio": "^3.26",
67+
"mezzio/mezzio-fastroute": "^3.14",
68+
"mezzio/mezzio-helpers": "^5.20",
69+
"mezzio/mezzio-laminasviewrenderer": "^2.19",
70+
"mezzio/mezzio-session-ext": "^1.21"
7171
},
7272
"require-dev": {
7373
"friendsofphp/php-cs-fixer": "@stable",
74-
"laminas/laminas-development-mode": "^3.12",
74+
"laminas/laminas-development-mode": "^3.15",
7575
"phpstan/phpstan-doctrine": "@stable",
76-
"phpunit/phpunit": "^9.6"
76+
"phpunit/phpunit": "@stable"
7777
}
7878
}

0 commit comments

Comments
 (0)