Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SF7, other deps and code refactoring #493

Merged
merged 5 commits into from
Jan 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ block_comment_end = */
[{*.yml,*.yaml}]
indent_size = 2

[*.neon]
indent_style = tab

[*.md]
trim_trailing_whitespace = false

Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/integrate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: "ubuntu-latest"
steps:
- name: "Checkout code"
uses: "actions/checkout@v3"
uses: "actions/checkout@v4"

- name: "Check file permissions"
run: |
Expand All @@ -34,7 +34,7 @@ jobs:
php-version: "8.1"

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

- name: "Install dependencies"
uses: "ramsey/composer-install@v2"
Expand Down Expand Up @@ -68,7 +68,7 @@ jobs:
coverage: "xdebug"

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

- name: "Install dependencies"
uses: "ramsey/composer-install@v2"
Expand Down Expand Up @@ -101,7 +101,7 @@ jobs:
extensions: "json, mbstring, openssl, sqlite3, curl, uuid"

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

- name: "Validate Composer configuration"
run: "composer validate --strict"
Expand Down Expand Up @@ -129,7 +129,7 @@ jobs:
extensions: "json, mbstring, openssl, sqlite3, curl, uuid"

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

- name: "Check adherence to EditorConfig"
uses: "greut/eclint-action@v0"
Expand Down Expand Up @@ -157,7 +157,7 @@ jobs:
extensions: "json, mbstring, openssl, sqlite3, curl, uuid"

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

- name: "Fetch Git base reference"
run: "git fetch --depth=1 origin ${GITHUB_BASE_REF}"
Expand Down Expand Up @@ -186,7 +186,7 @@ jobs:
coverage: "xdebug"

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

- name: "Fetch Git base reference"
run: "git fetch --depth=1 origin ${GITHUB_BASE_REF}"
Expand All @@ -208,7 +208,7 @@ jobs:
runs-on: "ubuntu-20.04"
steps:
- name: "Checkout code"
uses: "actions/checkout@v3"
uses: "actions/checkout@v4"

- name: "Check exported files"
run: |
Expand Down
37 changes: 18 additions & 19 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,19 +99,19 @@
"ext-mbstring": "*",
"ext-openssl": "*",
"ext-sodium": "*",
"brick/math": "^0.9|^0.10|^0.11",
"brick/math": "^0.9|^0.10|^0.11|^0.12",
"paragonie/constant_time_encoding": "^2.4",
"psr/clock": "^1.0",
"psr/event-dispatcher": "^1.0",
"psr/http-client": "^1.0",
"psr/http-factory": "^1.0",
"spomky-labs/aes-key-wrap": "^7.0",
"spomky-labs/pki-framework": "^1.0",
"symfony/config": "^5.4|^6.0",
"symfony/console": "^5.4|^6.0",
"symfony/dependency-injection": "^5.4|^6.0",
"symfony/event-dispatcher": "^5.4|^6.0",
"symfony/http-kernel": "^5.4|^6.0",
"symfony/config": "^5.4|^6.0|^7.0",
"symfony/console": "^5.4|^6.0|^7.0",
"symfony/dependency-injection": "^5.4|^6.0|^7.0",
"symfony/event-dispatcher": "^5.4|^6.0|^7.0",
"symfony/http-kernel": "^5.4|^6.0|^7.0",
"symfony/polyfill-mbstring": "^1.12"
},
"require-dev": {
Expand All @@ -121,7 +121,7 @@
"blackfire/php-sdk": "^2.0",
"ekino/phpstan-banned-code": "^1.0",
"infection/infection": "^0.27",
"matthiasnoback/symfony-config-test": "^4.3.0",
"matthiasnoback/symfony-config-test": "^5.0",
"nyholm/psr7": "^1.5",
"php-http/mock-client": "^1.5",
"php-parallel-lint/php-parallel-lint": "^1.3",
Expand All @@ -131,20 +131,19 @@
"phpstan/phpstan-deprecation-rules": "^1.0",
"phpstan/phpstan-phpunit": "^1.1",
"phpstan/phpstan-strict-rules": "^1.4",
"phpunit/phpunit": "^9.5.23",
"phpunit/phpunit": "^10.1",
"qossmic/deptrac-shim": "^1.0",
"rector/rector": "^0.16",
"rector/rector": "^0.18",
"roave/security-advisories": "dev-latest",
"symfony/browser-kit": "^6.1.3",
"symfony/finder": "^5.4|^6.0",
"symfony/framework-bundle": "^6.1.3",
"symfony/http-client": "^5.4|^6.0",
"symfony/phpunit-bridge": "^6.1.3",
"symfony/serializer": "^6.1.3",
"symfony/var-dumper": "^6.1.3",
"symfony/yaml": "^6.1.3",
"symplify/easy-coding-standard": "^11.0",
"symplify/monorepo-builder": "11.2.3.72"
"symfony/browser-kit": "^6.1|^7.0",
"symfony/finder": "^6.1|^7.0",
"symfony/framework-bundle": "^6.1|^7.0",
"symfony/http-client": "^6.1|^7.0",
"symfony/phpunit-bridge": "^6.1|^7.0",
"symfony/serializer": "^6.1|^7.0",
"symfony/var-dumper": "^6.1|^7.0",
"symfony/yaml": "^6.1|^7.0",
"symplify/easy-coding-standard": "^12.0"
},
"replace": {
"web-token/encryption-pack": "self.version",
Expand Down
5 changes: 3 additions & 2 deletions ecs.php
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,9 @@
'import_functions' => true,
]);

$config->services()
->remove(PhpUnitTestClassRequiresCoversFixer::class);
$config->skip([
PhpUnitTestClassRequiresCoversFixer::class
]);
$config->parallel();
$config->paths([
__DIR__ . '/performance',
Expand Down
31 changes: 0 additions & 31 deletions monorepo-builder.php

This file was deleted.

Loading
Loading