Skip to content

Commit ff1ce6a

Browse files
loevgaardloevgaard
committed
Upgrade test application
1 parent 3017aea commit ff1ce6a

54 files changed

Lines changed: 451 additions & 552 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.editorconfig‎

Lines changed: 1 addition & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,90 +1,25 @@
1-
# EditorConfig helps developers define and maintain consistent
2-
# coding styles between different editors and IDEs
3-
# editorconfig.org
4-
51
root = true
62

73
[*]
8-
# Change these settings to your own preference
94
indent_style = space
105
indent_size = 4
116

12-
# We recommend you to keep these unchanged
137
end_of_line = lf
148
charset = utf-8
159
trim_trailing_whitespace = true
1610
insert_final_newline = true
1711

1812
[*.feature]
19-
indent_style = space
20-
indent_size = 2
21-
22-
[*.js]
23-
indent_style = space
24-
indent_size = 2
25-
26-
[*.json]
27-
indent_style = space
2813
indent_size = 2
2914

3015
[*.md]
31-
indent_style = space
32-
indent_size = 4
3316
trim_trailing_whitespace = false
3417

35-
[*.neon]
36-
indent_style = tab
37-
indent_size = 4
38-
39-
[*.php]
40-
indent_style = space
41-
indent_size = 4
42-
4318
[*.sh]
4419
indent_style = tab
45-
indent_size = 4
4620

4721
[*.{yaml,yml}]
48-
indent_style = space
49-
indent_size = 4
5022
trim_trailing_whitespace = false
5123

52-
[.babelrc]
53-
indent_style = space
24+
[{webpack.config.js,.eslintrc.js}]
5425
indent_size = 2
55-
56-
[.gitmodules]
57-
indent_style = tab
58-
indent_size = 4
59-
60-
[.php_cs{,.dist}]
61-
indent_style = space
62-
indent_size = 4
63-
64-
[composer.json]
65-
indent_style = space
66-
indent_size = 4
67-
68-
[docker-compose{,.override}.{yaml,yml}]
69-
indent_style = space
70-
indent_size = 2
71-
72-
[Dockerfile]
73-
indent_style = tab
74-
indent_size = 4
75-
76-
[package.json]
77-
indent_style = space
78-
indent_size = 2
79-
80-
[phpspec.yml{,.dist}]
81-
indent_style = space
82-
indent_size = 4
83-
84-
[phpstan.neon]
85-
indent_style = tab
86-
indent_size = 4
87-
88-
[phpunit.xml{,.dist}]
89-
indent_style = space
90-
indent_size = 4

‎.gitattributes‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
/etc export-ignore
2-
/features export-ignore
3-
/spec export-ignore
4-
/tests export-ignore
5-
/.editorconfig export-ignore
6-
/.gitattributes export-ignore
7-
/.gitignore export-ignore
8-
/.scrutinizer.yml export-ignore
9-
/.travis.yml export-ignore
10-
/behat.yml.dist export-ignore
11-
/easy-coding-standard.yml export-ignore
12-
/phpspec.yml.dist export-ignore
13-
/phpstan.neon export-ignore
14-
/README.md export-ignore
1+
/.editorconfig export-ignore
2+
/.gitattributes export-ignore
3+
/.github export-ignore
4+
/.gitignore export-ignore
5+
/README.md export-ignore
6+
/behat.yml.dist export-ignore
7+
/composer-require-checker.json export-ignore
8+
/docs export-ignore
9+
/ecs.php export-ignore
10+
/node_modules export-ignore
11+
/phpunit.xml.dist export-ignore
12+
/psalm-baseline.xml export-ignore
13+
/psalm.xml export-ignore
14+
/tests export-ignore

‎.github/dependabot.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@
33
version: 2
44

55
updates:
6-
- allow:
7-
- dependency-type: "development"
8-
commit-message:
6+
- commit-message:
97
include: "scope"
108
prefix: "composer"
119
directory: "/"
10+
ignore:
11+
- dependency-name: "symfony/*"
12+
- dependency-name: "sylius/*"
1213
open-pull-requests-limit: 10
1314
package-ecosystem: "composer"
1415
schedule:
15-
interval: "daily"
16-
versioning-strategy: "increase"
16+
interval: "weekly"
17+
versioning-strategy: "increase-if-necessary"

‎.github/workflows/build.yaml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727

2828
steps:
2929
- name: "Checkout"
30-
uses: "actions/checkout@v2"
30+
uses: "actions/checkout@v3"
3131

3232
- name: "Setup PHP, with composer and extensions"
3333
uses: "shivammathur/setup-php@v2"
@@ -37,7 +37,7 @@ jobs:
3737
coverage: "none"
3838

3939
- name: "Install composer dependencies"
40-
uses: "ramsey/composer-install@v1"
40+
uses: "ramsey/composer-install@v2"
4141
with:
4242
dependency-versions: "${{ matrix.dependencies }}"
4343

@@ -71,7 +71,7 @@ jobs:
7171

7272
steps:
7373
- name: "Checkout"
74-
uses: "actions/checkout@v2"
74+
uses: "actions/checkout@v3"
7575

7676
- name: "Setup PHP, with composer and extensions"
7777
uses: "shivammathur/setup-php@v2"
@@ -82,7 +82,7 @@ jobs:
8282
tools: "composer-require-checker, composer-unused"
8383

8484
- name: "Install composer dependencies"
85-
uses: "ramsey/composer-install@v1"
85+
uses: "ramsey/composer-install@v2"
8686
with:
8787
dependency-versions: "${{ matrix.dependencies }}"
8888

@@ -107,7 +107,7 @@ jobs:
107107

108108
steps:
109109
- name: "Checkout"
110-
uses: "actions/checkout@v2"
110+
uses: "actions/checkout@v3"
111111

112112
- name: "Setup PHP, with composer and extensions"
113113
uses: "shivammathur/setup-php@v2"
@@ -117,7 +117,7 @@ jobs:
117117
coverage: "none"
118118

119119
- name: "Install composer dependencies"
120-
uses: "ramsey/composer-install@v1"
120+
uses: "ramsey/composer-install@v2"
121121
with:
122122
dependency-versions: "${{ matrix.dependencies }}"
123123

@@ -140,7 +140,7 @@ jobs:
140140

141141
steps:
142142
- name: "Checkout"
143-
uses: "actions/checkout@v2"
143+
uses: "actions/checkout@v3"
144144

145145
- name: "Setup PHP, with composer and extensions"
146146
uses: "shivammathur/setup-php@v2"
@@ -150,7 +150,7 @@ jobs:
150150
coverage: "none"
151151

152152
- name: "Install composer dependencies"
153-
uses: "ramsey/composer-install@v1"
153+
uses: "ramsey/composer-install@v2"
154154
with:
155155
dependency-versions: "${{ matrix.dependencies }}"
156156

@@ -178,7 +178,7 @@ jobs:
178178
run: "sudo /etc/init.d/mysql start"
179179

180180
- name: "Checkout"
181-
uses: "actions/checkout@v2"
181+
uses: "actions/checkout@v3"
182182

183183
- name: "Setup PHP, with composer and extensions"
184184
uses: "shivammathur/setup-php@v2"
@@ -188,7 +188,7 @@ jobs:
188188
coverage: "none"
189189

190190
- name: "Install composer dependencies"
191-
uses: "ramsey/composer-install@v1"
191+
uses: "ramsey/composer-install@v2"
192192
with:
193193
dependency-versions: "${{ matrix.dependencies }}"
194194

@@ -222,7 +222,7 @@ jobs:
222222

223223
steps:
224224
- name: "Checkout"
225-
uses: "actions/checkout@v2"
225+
uses: "actions/checkout@v3"
226226

227227
- name: "Setup PHP, with composer and extensions"
228228
uses: "shivammathur/setup-php@v2"
@@ -235,7 +235,7 @@ jobs:
235235
run: "echo \"::add-matcher::${{ runner.tool_cache }}/phpunit.json\""
236236

237237
- name: "Install composer dependencies"
238-
uses: "ramsey/composer-install@v1"
238+
uses: "ramsey/composer-install@v2"
239239
with:
240240
dependency-versions: "${{ matrix.dependencies }}"
241241

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2020 Setono
3+
Copyright (c) 2023 Setono
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎composer.json‎

Lines changed: 34 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,51 @@
11
{
22
"name": "setono/sylius-redirect-plugin",
3-
"type": "sylius-plugin",
43
"description": "Sylius plugin for managing redirects",
4+
"license": "MIT",
5+
"type": "sylius-plugin",
56
"keywords": [
67
"redirect",
78
"setono",
89
"sylius",
910
"sylius-plugin"
1011
],
11-
"license": "MIT",
1212
"require": {
1313
"php": ">=7.4",
1414
"doctrine/collections": "^1.6",
1515
"doctrine/orm": "^2.7",
1616
"doctrine/persistence": "^1.3 || ^2.1",
1717
"sylius/resource-bundle": "^1.6",
18-
"symfony/config": "^4.4 || ^5.0",
19-
"symfony/console": "^4.4 || ^5.0",
20-
"symfony/dependency-injection": "^4.4 || ^5.0",
21-
"symfony/event-dispatcher": "^4.4 || ^5.0",
22-
"symfony/form": "^4.4 || ^5.0",
18+
"symfony/config": "^5.4 || ^6.0",
19+
"symfony/console": "^5.4 || ^6.0",
20+
"symfony/dependency-injection": "^5.4 || ^6.0",
21+
"symfony/event-dispatcher": "^5.4 || ^6.0",
22+
"symfony/form": "^5.4 || ^6.0",
2323
"symfony/http-foundation": "^4.4 || ^5.0.7",
2424
"symfony/http-kernel": "^4.4 || ^5.1.5",
25-
"symfony/routing": "^4.4 || ^5.0",
26-
"symfony/validator": "^4.4 || ^5.0",
27-
"thecodingmachine/safe": "^1.0",
28-
"webmozart/assert": "^1.9"
25+
"symfony/routing": "^5.4 || ^6.0",
26+
"symfony/validator": "^5.4 || ^6.0",
27+
"webmozart/assert": "^1.11"
2928
},
3029
"require-dev": {
31-
"friendsofphp/proxy-manager-lts": "^1.0",
30+
"api-platform/core": "^2.7",
31+
"lexik/jwt-authentication-bundle": "^2.16",
3232
"phpspec/phpspec": "^6.1",
33-
"phpunit/phpunit": "^8.5",
34-
"psalm/plugin-phpunit": "^0.16.1",
35-
"psalm/plugin-symfony": "^3.0",
33+
"phpspec/prophecy-phpunit": "^2.0",
34+
"phpunit/phpunit": "^9.6",
35+
"psalm/plugin-phpunit": "^0.18",
36+
"psalm/plugin-symfony": "^5.0",
3637
"roave/security-advisories": "dev-latest",
37-
"setono/code-quality-pack": "^2.1.3",
38-
"setono/sylius-behat-pack": "^0.1",
39-
"sylius/sylius": "~1.7.11",
40-
"symfony/debug-bundle": "^5.1",
41-
"symfony/dotenv": "^5.2",
42-
"symfony/intl": "^4.4 || ^5.0",
43-
"symfony/web-profiler-bundle": "^5.0",
44-
"weirdan/doctrine-psalm-plugin": "^1.2"
45-
},
46-
"config": {
47-
"sort-packages": true
48-
},
49-
"extra": {
50-
"branch-alias": {
51-
"dev-master": "2.1-dev"
52-
}
38+
"setono/code-quality-pack": "^2.4",
39+
"setono/sylius-behat-pack": "^0.2",
40+
"sylius/sylius": "~1.10.14",
41+
"symfony/debug-bundle": "^5.4 || ^6.0",
42+
"symfony/dotenv": "^5.4 || ^6.0",
43+
"symfony/intl": "^5.4 || ^6.0",
44+
"symfony/web-profiler-bundle": "^5.4 || ^6.0",
45+
"symfony/webpack-encore-bundle": "^1.16",
46+
"weirdan/doctrine-psalm-plugin": "^2.8"
5347
},
48+
"prefer-stable": true,
5449
"autoload": {
5550
"psr-4": {
5651
"Setono\\SyliusRedirectPlugin\\": "src/"
@@ -64,7 +59,14 @@
6459
"tests/Application/Kernel.php"
6560
]
6661
},
67-
"prefer-stable": true,
62+
"config": {
63+
"allow-plugins": {
64+
"dealerdirect/phpcodesniffer-composer-installer": false,
65+
"ergebnis/composer-normalize": true,
66+
"symfony/thanks": false
67+
},
68+
"sort-packages": true
69+
},
6870
"scripts": {
6971
"analyse": [
7072
"@ensure-test-container-exists",

‎phpunit.xml.dist‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

33
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/5.6/phpunit.xsd"
4+
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
55
backupGlobals="false"
66
colors="true"
77
bootstrap="tests/Application/config/bootstrap.php">
8+
<coverage includeUncoveredFiles="true" processUncoveredFiles="true">
9+
<include>
10+
<directory suffix=".php">src/</directory>
11+
</include>
12+
</coverage>
813
<testsuites>
914
<testsuite name="SetonoSyliusRedirectPlugin Test Suite">
1015
<directory>tests</directory>
1116
</testsuite>
1217
</testsuites>
13-
1418
<php>
15-
<server name="KERNEL_CLASS_PATH" value="/tests/Application/Kernel.php" />
16-
<server name="IS_DOCTRINE_ORM_SUPPORTED" value="true" />
1719
<env name="APP_ENV" value="test"/>
18-
<env name="SHELL_VERBOSITY" value="-1" />
20+
<env name="SHELL_VERBOSITY" value="-1"/>
1921
</php>
2022
</phpunit>

0 commit comments

Comments
 (0)