Skip to content

Commit c834d6c

Browse files
johanibjohanib
authored
Merge pull request #470 from OpenConext/feature/package_updates_nov_25
Composer update patch versions
2 parents 867aa80 + de1f119 commit c834d6c

File tree

88 files changed

+2626
-3068
lines changed

Some content is hidden

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

88 files changed

+2626
-3068
lines changed

‎.github/workflows/test-integration.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Run CI tests
2727
run: |
2828
cd ci/docker && docker compose exec -T gateway bash -c '
29-
composer check
29+
composer check-ci
3030
'
3131
3232
- name: Output logs on failure

‎CHANGELOG.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
# Changelog
22

3+
## 6.0.0
4+
- Upgrade from Symfony 6.4 to Symfony 7.3
5+
- Maintenance release, Update tooling, packages
6+
7+
Upgrade instructions:
8+
- Ensure the `database_server_version` setting in parameters.yaml is up-to-date with the production db server version. e.g. `10.6.23-MariaDB`
9+
10+
Attention:
11+
- `jms/translation-bundle` seems EOL, it relies on `doctrine/annotations`, which is abandoned. See https://github.com/OpenConext/Stepup-Gateway/issues/471
12+
313
## 5.1.1
414
- Bugfix: LoA 1.5 SFO authentications fail for institutions with default config configuration (SSO & GSSP fallbang off)
515
when GSSP fallback attributes are present ()

‎README.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ This component is part of "Step-up Authentication as-a Service". See [Stepup-Dep
1919

2020
## Installation
2121

22-
Clone the repository or download the archive to a directory. Install the dependencies by running `composer install && yarn install` and fill out the database credentials et cetera.
22+
* Clone the repository or download the archive to a directory.
23+
* Install the dependencies & build frontend by running `composer install && composer frontend-install`.
24+
* Run `composer check` to ensure everything is installed correctly.
2325

2426
The Gateway is configured to only accept connections over SSL. Disable this under `nelmio_security` in `config.yml` or run the web server using a (self-signed) certificate.
2527

‎ci/qa/behat-functional‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,7 @@
22

33
cd $(dirname $0)/../../
44

5+
chown -R www-data:www-data /var/www/html/var/cache
6+
chown -R www-data:www-data /var/www/html/var/log
7+
58
./vendor/bin/behat --config=ci/qa/behat.yml --tags=functional $1

‎ci/qa/phpcbf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
cd $(dirname $0)/../../
44

55
# https://github.com/squizlabs/PHP_CodeSniffer/wiki/Fixing-Errors-Automatically
6-
./vendor/bin/phpcbf --standard=ci/qa/phpcs.xml $1
6+
./vendor/bin/phpcbf --standard=ci/qa/phpcs.xml --extensions=php src

‎ci/qa/phpcpd‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
cd $(dirname $0)/../../
44

55
# https://github.com/sebastianbergmann/phpcpd
6-
./vendor/bin/phpcpd \
7-
--names=*.php \
8-
--names-exclude=Sms*SearchConditions.php \
9-
--regexps-exclude="#Client/.*Client.php#" \
10-
src $1
6+
vendor/bin/phpcpd \
7+
--exclude src/Surfnet/StepupGateway/GatewayBundle/Tests/Sso2fa/CookieServiceTest.php \
8+
--exclude src/Surfnet/StepupGateway/GatewayBundle/Tests/Service/Gateway/ConsumeAssertionServiceTest.php \
9+
--exclude src/Surfnet/StepupGateway/SecondFactorOnlyBundle/Tests/Service/Gateway/RespondServiceTest.php \
10+
./src $1

‎ci/qa/phplint.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
path: [./src, ./tests]
22
jobs: 10
3-
cache: /var/qa/phplint.cache
3+
cache-dir: var/cache/qa/phplint.cache
44
extensions:
55
- php
66
exclude:

‎ci/qa/phpstan-baseline.php‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,5 @@
88
'count' => 1,
99
'path' => __DIR__ . '/../../src/Surfnet/StepupGateway/GatewayBundle/Entity/SamlEntity.php',
1010
];
11-
$ignoreErrors[] = [
12-
// identifier: parameter.requiredAfterOptional
13-
'message' => '#^Deprecated in PHP 8\\.0\\: Required parameter \\$value follows optional parameter \\$propertyPath\\.$#',
14-
'count' => 1,
15-
'path' => __DIR__ . '/../../src/Surfnet/StepupGateway/GatewayBundle/Exception/AssertionFailedException.php',
16-
];
1711

1812
return ['parameters' => ['ignoreErrors' => $ignoreErrors]];

‎ci/qa/phpstan.neon‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
includes:
22
- ./phpstan-baseline.php
3-
- ../../vendor/phpstan/phpstan-symfony/extension.neon
4-
- ../../vendor/phpstan/phpstan-deprecation-rules/rules.neon
5-
rules:
6-
# Put here your cutom rules for this repository
7-
# - Surfnet\NoDebugFunctionRule
8-
# - Surfnet\InvokableControllerRule
9-
# - Surfnet\UntypedIdParamRule
10-
# - Surfnet\NoNullOrArrayReturnRule
3+
114
parameters:
125
checkUninitializedProperties: true
136
level: 1

‎ci/qa/phpunit.xml‎

Lines changed: 14 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,20 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
32
<!-- http://phpunit.de/manual/4.1/en/appendixes.configuration.html -->
43
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5-
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
6-
backupGlobals="false"
7-
colors="true"
4+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" backupGlobals="false" colors="true"
85
bootstrap="../../vendor/autoload.php"
6+
cacheDirectory="../../var/qa/phpunit.cache"
97
>
10-
<php>
11-
<ini name="error_reporting" value="-1"/>
12-
<server name="APP_ENV" value="test" force="true"/>
13-
<server name="KERNEL_CLASS" value="App\Kernel"/>
14-
<server name="SHELL_VERBOSITY" value="-1"/>
15-
<server name="SYMFONY_PHPUNIT_REMOVE" value=""/>
16-
<server name="SYMFONY_PHPUNIT_VERSION" value="6.5"/>
17-
<env name="SYMFONY_DEPRECATIONS_HELPER" value="weak" />
18-
</php>
19-
20-
<testsuites>
21-
<testsuite name="Project Test Suite">
22-
<directory suffix="Test.php">../../src</directory>
23-
</testsuite>
24-
</testsuites>
25-
<filter>
26-
<whitelist>
27-
<directory>../../src</directory>
28-
<exclude>
29-
<directory suffix="Test.php">../../src</directory>
30-
</exclude>
31-
</whitelist>
32-
</filter>
33-
<listeners>
34-
<listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener">
35-
<arguments>
36-
<array>
37-
<!-- set this option to 0 to disable the DebugClassLoader integration -->
38-
<element key="debug-class-loader">
39-
<integer>0</integer>
40-
</element>
41-
</array>
42-
</arguments>
43-
</listener>
44-
</listeners>
8+
<php>
9+
<ini name="error_reporting" value="-1"/>
10+
<server name="APP_ENV" value="test" force="true"/>
11+
<server name="KERNEL_CLASS" value="App\Kernel"/>
12+
<server name="SHELL_VERBOSITY" value="-1"/>
13+
<env name="SYMFONY_DEPRECATIONS_HELPER" value="weak"/>
14+
</php>
15+
<testsuites>
16+
<testsuite name="Project Test Suite">
17+
<directory suffix="Test.php">../../src</directory>
18+
</testsuite>
19+
</testsuites>
4520
</phpunit>

0 commit comments

Comments
 (0)