Skip to content

Commit

Permalink
Merge pull request #38 from Spomky-Labs/3.1.x-merge-up-into-3.2.x_nsr…
Browse files Browse the repository at this point in the history
…qAkrq

Merge release 3.1.2 into 3.2.x
  • Loading branch information
Spomky authored Apr 11, 2024
2 parents 5a91152 + b63efde commit 68a01f5
Show file tree
Hide file tree
Showing 5 changed files with 39 additions and 56 deletions.
35 changes: 35 additions & 0 deletions .github/workflows/infection.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# yaml-language-server: $schema=https://json.schemastore.org/github-workflow

name: "Integrate"

on:
push:
branches:
- "*.x"

jobs:
mutation_testing:
name: "5️⃣ Mutation Testing"
runs-on: "ubuntu-latest"
steps:
- name: "Set up PHP"
uses: "shivammathur/setup-php@v2"
with:
php-version: "8.2"
extensions: "ctype, curl, dom, json, libxml, mbstring, openssl, phar, simplexml, sodium, tokenizer, xml, xmlwriter, zlib"
coverage: "xdebug"

- name: "Checkout code"
uses: "actions/checkout@v4"

- name: "Fetch Git base reference"
run: "git fetch --depth=1 origin ${GITHUB_BASE_REF}"

- name: "Install dependencies"
uses: "ramsey/composer-install@v2"
with:
dependency-versions: "highest"
composer-options: "--optimize-autoloader"

- name: "Execute Infection"
run: "make ci-mu"
29 changes: 0 additions & 29 deletions .github/workflows/integrate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -157,35 +157,6 @@ jobs:
run: |
vendor/bin/deptrac analyse --fail-on-uncovered --no-cache
mutation_testing:
name: "5️⃣ Mutation Testing"
needs:
- "byte_level"
- "syntax_errors"
runs-on: "ubuntu-latest"
steps:
- name: "Set up PHP"
uses: "shivammathur/setup-php@v2"
with:
php-version: "8.2"
extensions: "ctype, curl, dom, json, libxml, mbstring, openssl, phar, simplexml, sodium, tokenizer, xml, xmlwriter, zlib"
coverage: "xdebug"

- name: "Checkout code"
uses: "actions/checkout@v4"

- name: "Fetch Git base reference"
run: "git fetch --depth=1 origin ${GITHUB_BASE_REF}"

- name: "Install dependencies"
uses: "ramsey/composer-install@v3"
with:
dependency-versions: "highest"
composer-options: "--optimize-autoloader"

- name: "Execute Infection"
run: "make ci-mu"

rector_checkstyle:
name: "6️⃣ Rector Checkstyle"
needs:
Expand Down
23 changes: 0 additions & 23 deletions .github/workflows/tweet.yml

This file was deleted.

6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@
"symfony/http-kernel": "^6.2|^7.0"
},
"require-dev": {
"doctrine/dbal": "^3.0",
"doctrine/dbal": "^3.0|^4.0",
"doctrine/doctrine-bundle": "^2.0",
"doctrine/doctrine-fixtures-bundle": "^3.4",
"doctrine/orm": "^2.6",
"doctrine/orm": "^2.6|^3.0",
"ekino/phpstan-banned-code": "^1.0",
"infection/infection": "^0.27",
"infection/infection": "^0.28",
"lcobucci/jwt": "^4.3|^5.0",
"matthiasnoback/symfony-config-test": "^4.2|^5.0",
"matthiasnoback/symfony-dependency-injection-test": "^4.2|^5.0",
Expand Down
2 changes: 1 addition & 1 deletion src/library/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"psr/cache": "^1.0|^2.0|^3.0",
"psr/clock": "^1.0",
"psr/log": "^1.1|^2.0|^3.0",
"symfony/http-kernel": "^6.2"
"symfony/http-kernel": "^6.2|^7.0"
},
"autoload": {
"psr-4" : {
Expand Down

0 comments on commit 68a01f5

Please sign in to comment.