Skip to content
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
29 changes: 14 additions & 15 deletions .github/workflows/code_checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,28 @@ on: ["push", "pull_request"]
jobs:
js-tests:
name: "JS Tests"
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v5

- name: Install JS dependencies
run: |
cd Resources && npm install

- name: Install PHP dependencies (for PhantomJS)
uses: ramsey/composer-install@v3

- name: Run JS tests
run: |
cd Resources && npm run test
cd Resources && OPENSSL_CONF=/dev/null npm run test
phpunit:
name: "PHP ${{ matrix.php }} + ${{ matrix.dependencies }} dependencies + Symfony ${{ matrix.symfony }}"
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
strategy:
fail-fast: false
matrix:
php: ['8.0', '8.1', '8.2']
php: ['8.0', '8.1', '8.2', '8.3', '8.4']
dependencies: [highest]
symfony: ['*']
include:
Expand All @@ -34,11 +37,11 @@ jobs:
symfony: '*'

# Minimum supported dependencies with the latest supported PHP version
- php: '8.2'
- php: '8.4'
dependencies: lowest
symfony: '*'

- php: '8.2'
- php: '8.4'
dependencies: highest
symfony: '*'

Expand All @@ -48,20 +51,16 @@ jobs:
dependencies: highest
symfony: '5.4.*'

- php: '8.0'
dependencies: highest
symfony: '6.0.*'

- php: '8.1'
dependencies: highest
symfony: '6.2.*'
symfony: '6.4.*'

- php: '8.2'
dependencies: highest
symfony: '7.0.*'
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v5

- name: Setup PHP
uses: shivammathur/setup-php@v2
Expand All @@ -76,12 +75,12 @@ jobs:
composer config extra.symfony.require ${{ matrix.symfony }}

- name: Update project dependencies
uses: ramsey/composer-install@v2
uses: ramsey/composer-install@v3
with:
dependency-versions: ${{ matrix.dependencies }}

- name: Cache PHPUnit
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: vendor/bin/.phpunit
key: ${{ runner.os }}-phpunit-${{ matrix.php }}
Expand Down
2 changes: 1 addition & 1 deletion Resources/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"scripts": {
"build": "gulp && npm run build:types",
"build:types": "tsc --declaration --emitDeclarationOnly",
"test": "npm run build && npm run test:types && phantomjs js/run_jsunit.js js/router_test.html",
"test": "npm run build && npm run test:types && ../vendor/bin/phantomjs js/run_jsunit.js js/router_test.html",
"test:types": "tsd",
"prepublish": "npm run build"
},
Expand Down
28 changes: 23 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,42 @@
],
"require": {
"php": "^8.0",
"symfony/framework-bundle": "^5.4|^6.0|^7.0",
"symfony/serializer": "^5.4|^6.0.1|^7.0",
"symfony/console": "^5.4|^6.0|^7.0",
"symfony/framework-bundle": "^5.4|^6.4|^7.0",
"symfony/serializer": "^5.4|^6.4|^7.0",
"symfony/console": "^5.4|^6.4|^7.0",
"willdurand/jsonp-callback-validator": "~1.1|^2.0"
},
"require-dev": {
"symfony/expression-language": "^5.4|^6.0|^7.0",
"symfony/phpunit-bridge": "^5.4|^6.0|^7.0"
"neronmoon/scriptsdev": "^0.1",
"jakoch/phantomjs-installer": "^3",
"symfony/expression-language": "^5.4|^6.4|^7.0",
"symfony/phpunit-bridge": "^5.4|^6.4|^7.0"
},
"autoload": {
"psr-4": { "FOS\\JsRoutingBundle\\": "" },
"exclude-from-classmap": [
"/Tests/"
]
},
"config": {
"allow-plugins": {
"neronmoon/scriptsdev": true
}
},
"extra": {
"branch-alias": {
"dev-master": "3.x-dev"
},
"scripts-dev": {
"post-install-cmd": [
"PhantomInstaller\\Installer::installPhantomJS"
],
"post-update-cmd": [
"PhantomInstaller\\Installer::installPhantomJS"
]
},
"jakoch/phantomjs-installer": {
"cdnurl": "https://github.com/Medium/phantomjs/releases/download/v2.1.1/"
}
}
}