Skip to content

Commit 0cfefeb

Browse files
NyholmNyholm
committed
Add 6.0.* for all symfony deps
1 parent f9326ed commit 0cfefeb

File tree

8 files changed

+87
-81
lines changed

8 files changed

+87
-81
lines changed

‎composer.json‎

Lines changed: 30 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -5,53 +5,52 @@
55
"php": ">=7.1.3",
66
"ext-ctype": "*",
77
"ext-iconv": "*",
8-
"api-platform/core": "^2.6",
98
"composer/package-versions-deprecated": "1.11.99.1",
109
"doctrine/annotations": "^1.0",
1110
"doctrine/doctrine-bundle": "^2.3",
1211
"doctrine/orm": "^2.8",
1312
"phpdocumentor/reflection-docblock": "^5.2",
1413
"sensio/framework-extra-bundle": "^6.1",
15-
"symfony/asset": "5.4.*",
16-
"symfony/console": "5.4.*",
17-
"symfony/dotenv": "5.4.*",
18-
"symfony/expression-language": "5.4.*",
14+
"symfony/asset": "6.0.*",
15+
"symfony/console": "6.0.*",
16+
"symfony/dotenv": "6.0.*",
17+
"symfony/expression-language": "6.0.*",
1918
"symfony/flex": "^1.3.1",
20-
"symfony/form": "5.4.*",
21-
"symfony/framework-bundle": "5.4.*",
22-
"symfony/http-client": "5.4.*",
23-
"symfony/intl": "5.4.*",
24-
"symfony/mailer": "5.4.*",
19+
"symfony/form": "6.0.*",
20+
"symfony/framework-bundle": "6.0.*",
21+
"symfony/http-client": "6.0.*",
22+
"symfony/intl": "6.0.*",
23+
"symfony/mailer": "6.0.*",
2524
"symfony/mercure-bundle": "^0.3.2",
26-
"symfony/messenger": "5.4.*",
25+
"symfony/messenger": "6.0.*",
2726
"symfony/monolog-bundle": "^3.1",
28-
"symfony/notifier": "5.4.*",
29-
"symfony/process": "5.4.*",
30-
"symfony/property-access": "5.4.*",
31-
"symfony/property-info": "5.4.*",
32-
"symfony/proxy-manager-bridge": "5.4.*",
33-
"symfony/rate-limiter": "5.4.*",
34-
"symfony/security-bundle": "5.4.*",
35-
"symfony/serializer": "5.4.*",
36-
"symfony/translation": "5.4.*",
37-
"symfony/twig-bundle": "5.4.*",
38-
"symfony/uid": "5.4.*",
39-
"symfony/validator": "5.4.*",
40-
"symfony/web-link": "5.4.*",
27+
"symfony/notifier": "6.0.*",
28+
"symfony/process": "6.0.*",
29+
"symfony/property-access": "6.0.*",
30+
"symfony/property-info": "6.0.*",
31+
"symfony/proxy-manager-bridge": "6.0.*",
32+
"symfony/rate-limiter": "6.0.*",
33+
"symfony/security-bundle": "6.0.*",
34+
"symfony/serializer": "6.0.*",
35+
"symfony/translation": "6.0.*",
36+
"symfony/twig-bundle": "6.0.*",
37+
"symfony/uid": "6.0.*",
38+
"symfony/validator": "6.0.*",
39+
"symfony/web-link": "6.0.*",
4140
"symfony/webpack-encore-bundle": "^1.11",
42-
"symfony/yaml": "5.4.*",
41+
"symfony/yaml": "6.0.*",
4342
"twig/extra-bundle": "^3.0",
4443
"twig/twig": "^3.0"
4544
},
4645
"require-dev": {
47-
"symfony/browser-kit": "5.4.*",
48-
"symfony/css-selector": "5.4.*",
49-
"symfony/debug-bundle": "5.4.*",
46+
"symfony/browser-kit": "6.0.*",
47+
"symfony/css-selector": "6.0.*",
48+
"symfony/debug-bundle": "6.0.*",
5049
"symfony/maker-bundle": "^1.0",
5150
"symfony/phpunit-bridge": "^5.2",
52-
"symfony/stopwatch": "5.4.*",
53-
"symfony/var-dumper": "5.4.*",
54-
"symfony/web-profiler-bundle": "5.4.*"
51+
"symfony/stopwatch": "6.0.*",
52+
"symfony/var-dumper": "6.0.*",
53+
"symfony/web-profiler-bundle": "6.0.*"
5554
},
5655
"config": {
5756
"preferred-install": {

‎config/bundles.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,4 @@
1313
Twig\Extra\TwigExtraBundle\TwigExtraBundle::class => ['all' => true],
1414
Symfony\Bundle\MercureBundle\MercureBundle::class => ['all' => true],
1515
Symfony\WebpackEncoreBundle\WebpackEncoreBundle::class => ['all' => true],
16-
ApiPlatform\Core\Bridge\Symfony\Bundle\ApiPlatformBundle::class => ['all' => true],
1716
];

‎config/packages/api_platform.yaml‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎config/packages/lock.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
framework:
2+
lock: '%env(LOCK_DSN)%'

‎config/packages/notifier.yaml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
framework:
2+
notifier:
3+
#chatter_transports:
4+
# slack: '%env(SLACK_DSN)%'
5+
# telegram: '%env(TELEGRAM_DSN)%'
6+
#texter_transports:
7+
# twilio: '%env(TWILIO_DSN)%'
8+
# nexmo: '%env(NEXMO_DSN)%'
9+
channel_policy:
10+
# use chat/slack, chat/telegram, sms/twilio or sms/nexmo
11+
urgent: ['email']
12+
high: ['email']
13+
medium: ['email']
14+
low: ['email']
15+
admin_recipients:
16+
- { email: admin@example.com }

‎config/routes/api_platform.yaml‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎src/Kernel.php‎

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -3,52 +3,14 @@
33
namespace App;
44

55
use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
6-
use Symfony\Component\Config\Loader\LoaderInterface;
7-
use Symfony\Component\Config\Resource\FileResource;
8-
use Symfony\Component\DependencyInjection\ContainerBuilder;
96
use Symfony\Component\HttpKernel\Kernel as BaseKernel;
10-
use Symfony\Component\Routing\RouteCollectionBuilder;
117

128
class Kernel extends BaseKernel
139
{
1410
use MicroKernelTrait;
1511

16-
private const CONFIG_EXTS = '.{php,xml,yaml,yml}';
17-
18-
public function registerBundles(): iterable
19-
{
20-
$contents = require $this->getProjectDir().'/config/bundles.php';
21-
foreach ($contents as $class => $envs) {
22-
if ($envs[$this->environment] ?? $envs['all'] ?? false) {
23-
yield new $class();
24-
}
25-
}
26-
}
27-
2812
public function getProjectDir(): string
2913
{
3014
return \dirname(__DIR__);
3115
}
32-
33-
protected function configureContainer(ContainerBuilder $container, LoaderInterface $loader): void
34-
{
35-
$container->addResource(new FileResource($this->getProjectDir().'/config/bundles.php'));
36-
$container->setParameter('container.dumper.inline_class_loader', \PHP_VERSION_ID < 70400 || $this->debug);
37-
$container->setParameter('container.dumper.inline_factories', true);
38-
$confDir = $this->getProjectDir().'/config';
39-
40-
$loader->load($confDir.'/{packages}/*'.self::CONFIG_EXTS, 'glob');
41-
$loader->load($confDir.'/{packages}/'.$this->environment.'/*'.self::CONFIG_EXTS, 'glob');
42-
$loader->load($confDir.'/{services}'.self::CONFIG_EXTS, 'glob');
43-
$loader->load($confDir.'/{services}_'.$this->environment.self::CONFIG_EXTS, 'glob');
44-
}
45-
46-
protected function configureRoutes(RouteCollectionBuilder $routes): void
47-
{
48-
$confDir = $this->getProjectDir().'/config';
49-
50-
$routes->import($confDir.'/{routes}/'.$this->environment.'/*'.self::CONFIG_EXTS, '/', 'glob');
51-
$routes->import($confDir.'/{routes}/*'.self::CONFIG_EXTS, '/', 'glob');
52-
$routes->import($confDir.'/{routes}'.self::CONFIG_EXTS, '/', 'glob');
53-
}
5416
}

‎symfony.lock‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,9 @@
125125
"psr/container": {
126126
"version": "1.1.1"
127127
},
128+
"psr/event-dispatcher": {
129+
"version": "1.0.0"
130+
},
128131
"psr/link": {
129132
"version": "1.1.1"
130133
},
@@ -285,6 +288,18 @@
285288
"symfony/intl": {
286289
"version": "v4.4.20"
287290
},
291+
"symfony/lock": {
292+
"version": "6.0",
293+
"recipe": {
294+
"repo": "github.com/symfony/recipes",
295+
"branch": "master",
296+
"version": "5.2",
297+
"ref": "a1c8800e40ae735206bb14586fdd6c4630a51b8d"
298+
},
299+
"files": [
300+
"config/packages/lock.yaml"
301+
]
302+
},
288303
"symfony/mailer": {
289304
"version": "4.3",
290305
"recipe": {
@@ -354,12 +369,27 @@
354369
"config/packages/test/monolog.yaml"
355370
]
356371
},
372+
"symfony/notifier": {
373+
"version": "6.0",
374+
"recipe": {
375+
"repo": "github.com/symfony/recipes",
376+
"branch": "master",
377+
"version": "5.0",
378+
"ref": "c31585e252b32fe0e1f30b1f256af553f4a06eb9"
379+
},
380+
"files": [
381+
"config/packages/notifier.yaml"
382+
]
383+
},
357384
"symfony/options-resolver": {
358385
"version": "v4.4.20"
359386
},
360387
"symfony/orm-pack": {
361388
"version": "v2.1.0"
362389
},
390+
"symfony/password-hasher": {
391+
"version": "v6.0.0"
392+
},
363393
"symfony/phpunit-bridge": {
364394
"version": "5.1",
365395
"recipe": {
@@ -402,6 +432,9 @@
402432
"symfony/polyfill-php81": {
403433
"version": "v1.23.0"
404434
},
435+
"symfony/polyfill-uuid": {
436+
"version": "v1.23.0"
437+
},
405438
"symfony/process": {
406439
"version": "v4.4.20"
407440
},
@@ -417,6 +450,9 @@
417450
"symfony/proxy-manager-bridge": {
418451
"version": "v4.4.20"
419452
},
453+
"symfony/rate-limiter": {
454+
"version": "v6.0.0"
455+
},
420456
"symfony/redis-messenger": {
421457
"version": "v5.3.10"
422458
},
@@ -512,6 +548,9 @@
512548
"symfony/twig-pack": {
513549
"version": "v1.0.1"
514550
},
551+
"symfony/uid": {
552+
"version": "v6.0.0"
553+
},
515554
"symfony/validator": {
516555
"version": "4.3",
517556
"recipe": {

0 commit comments

Comments
 (0)