Skip to content

Commit 19b49b3

Browse files
maintenance : updated dependencies for security and PHP constraints (#50)
* maintenance : updated dependencies for security and PHP constraints This is mostly a cleaning of the composer file. ## Security update guzzlehttp/guzzle upgrade to 6.5 or 7.4 : https://devhub.checkmarx.com/cve-details/CVE-2022-31090/ symfony/http-kernel upgrade to : https://devhub.checkmarx.com/cve-details/CVE-2022-24894/ ## Incompatibility minishlink/web-push: Version 4 and 5 are not possible due to PHP version constraints. * https://github.com/web-push-libs/web-push-php/blob/v4.0.2/composer.json * https://github.com/web-push-libs/web-push-php/blob/v5.2.5/composer.json phpunit/phpunit: versions 5 to 7 are not posible due to PHP version constraints. * minor : bump packages
1 parent 6b8b8f0 commit 19b49b3

File tree

3 files changed

+17
-8
lines changed

3 files changed

+17
-8
lines changed

.github/workflows/ci.yml

+8-2
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ on:
55

66
env:
77
COMPOSER_FLAGS: "--prefer-stable"
8-
8+
99
jobs:
1010
ci_job:
1111
runs-on: ${{ matrix.operating-system }}
1212
strategy:
1313
matrix:
1414
operating-system: ['ubuntu-latest']
15-
php-versions: ['8.1', '8.2']
15+
php-versions: ['8.1', '8.2', '8.3']
1616

1717
steps:
1818
- name: Checkout
@@ -29,3 +29,9 @@ jobs:
2929

3030
- name: Process the tests
3131
run: vendor/bin/phpunit
32+
33+
# Too much conflict with PHPUnit and old low package versions
34+
# - name: Tests with lowest posible packages
35+
# run: |
36+
# composer update $COMPOSER_FLAGS --no-interaction --prefer-dist --prefer-lowest --no-progress --ansi
37+
# vendor/bin/phpunit

composer.json

+7-6
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
"ext-json": "*",
1616
"ext-mbstring": "*",
1717
"ext-openssl": "*",
18-
"guzzlehttp/guzzle": "~6.0|~7.0",
19-
"minishlink/web-push": "~4.0|~5.0|~6.0|~7.0",
20-
"symfony/http-kernel": "~3.0|~4.0|~5.0|~6.0"
18+
"guzzlehttp/guzzle": "^6.5.8|^7.4",
19+
"minishlink/web-push": "~6.0|~7.0|~8.0",
20+
"symfony/http-kernel": "^4.4.50|^5.4.20|^6.0"
2121
},
2222
"require-dev": {
2323
"bentools/doctrine-static": "1.0.x-dev",
2424
"doctrine/dbal": "~2.5 <=2.9",
2525
"nyholm/symfony-bundle-test": "~1.8",
26-
"phpunit/phpunit": "~5.0|~6.0|~7.0|~8.0|~9.0",
26+
"phpunit/phpunit": "^8.5.38|~9.0",
2727
"symfony/config": "~4.0|~5.0|~6.0",
2828
"symfony/dependency-injection": "~3.0|~4.0|~5.0|~6.0",
2929
"symfony/framework-bundle": "~3.0|~4.0|~5.0|~6.0",
@@ -32,7 +32,8 @@
3232
"symfony/security": "~3.0|~4.0|~5.0|~6.0",
3333
"symfony/var-dumper": "~3.0|~4.0|~5.0|~6.0",
3434
"symfony/yaml": "~3.0|~4.0|~5.0|~6.0",
35-
"twig/twig": "~1.0|~2.0"
35+
"twig/twig": "~1.0|~2.0",
36+
"web-token/jwt-util-ecc": ">=2.1"
3637
},
3738
"autoload": {
3839
"psr-4": {
@@ -149,4 +150,4 @@
149150
"chrome",
150151
"firefox"
151152
]
152-
}
153+
}

src/Command/WebPushGenerateKeysCommand.php

+2
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@
33
namespace BenTools\WebPushBundle\Command;
44

55
use Minishlink\WebPush\VAPID;
6+
use Symfony\Component\Console\Attribute\AsCommand;
67
use Symfony\Component\Console\Command\Command;
78
use Symfony\Component\Console\Input\InputInterface;
89
use Symfony\Component\Console\Output\OutputInterface;
910
use Symfony\Component\Console\Style\SymfonyStyle;
1011
use Symfony\Component\HttpKernel\Kernel;
1112

13+
#[AsCommand('webpush:generate:keys')]
1214
final class WebPushGenerateKeysCommand extends Command
1315
{
1416
protected static $defaultName = 'webpush:generate:keys';

0 commit comments

Comments
 (0)