Skip to content

Commit

Permalink
Merge branch 'release/3.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
MKodde committed Dec 21, 2021
2 parents 78ead56 + daf6a5a commit 4e01a2e
Show file tree
Hide file tree
Showing 22 changed files with 4,440 additions and 6,012 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ before_script:
- phpenv config-add .travis.php.ini
- composer self-update --1
- curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.34.0/install.sh | bash
- nvm install 10.22.0
- nvm install 14
- curl --compressed -o- -L https://yarnpkg.com/install.sh | bash
- export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"
- composer install --prefer-dist
Expand Down
10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
# Changelog
## 3.5.3
- Added browserlist entry in package.json to ensure IE 11 support

## 3.4.0
## 3.5.2
Update Stepup Bundle and Http Foundation to prevent deprecation warnings

## 3.5.1
Update stepup-saml-bundle and stepup-bundle

## 3.5.0
**Feature**
* Self vetting (vet token with previously RA vetted token) #227

Expand Down
2 changes: 1 addition & 1 deletion component_info
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PHP_VERSION=72
SYMFONY_VERSION=4
ENCORE=yes
NODE_VERSION=12
NODE_VERSION=14
ASSETIC=no
13 changes: 4 additions & 9 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,14 @@
"nelmio/security-bundle": "^2",
"openconext/monitor-bundle": "^2.0",
"sensio/framework-extra-bundle": "^5.0",
"surfnet/stepup-bundle": "^4.0",
"surfnet/stepup-bundle": "^4.2",
"surfnet/stepup-middleware-client-bundle": "^4.1",
"surfnet/stepup-saml-bundle": "^4.2.1",
"surfnet/stepup-saml-bundle": "^4.3.1",
"symfony/console": "4.4.*",
"symfony/expression-language": "4.4.*",
"symfony/flex": "^1.8",
"symfony/form": "4.4.*",
"symfony/http-foundation": "^5.0",
"symfony/monolog-bundle": "^3.1.0",
"symfony/security-bundle": "4.4.*",
"symfony/stopwatch": "4.4.*",
Expand All @@ -54,12 +55,6 @@
"symfony/css-selector": "4.4.*",
"symfony/phpunit-bridge": "^3.0"
},
"repositories": [
{
"type": "git",
"url": "https://github.com/OpenConext/Stepup-Middleware-clientbundle.git"
}
],
"scripts": {
"test": [
"@lint",
Expand Down Expand Up @@ -112,7 +107,7 @@
"optimize-autoloader": true,
"sort-packages": true,
"platform": {
"php": "7.2"
"php": "7.2.5"
}
},
"archive": {
Expand Down
Loading

0 comments on commit 4e01a2e

Please sign in to comment.