Skip to content

Commit 7884164

Browse files
committed
Merge branch 'composer-dependencies'
2 parents 2c9bc36 + 49d1783 commit 7884164

File tree

15 files changed

+489
-466
lines changed

15 files changed

+489
-466
lines changed

bin/console

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ if (!is_file(dirname(__DIR__) . '/vendor/autoload_runtime.php')) {
1414

1515
require_once dirname(__DIR__) . '/vendor/autoload_runtime.php';
1616

17-
return function (array $context) {
17+
return static function (array $context) {
1818
$kernel = new Kernel($context['APP_ENV'], (bool) $context['APP_DEBUG']);
1919

2020
return new Application($kernel);

bin/dirigent

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ if (!is_file(dirname(__DIR__) . '/vendor/autoload_runtime.php')) {
1414

1515
require_once dirname(__DIR__) . '/vendor/autoload_runtime.php';
1616

17-
return function (array $context) {
17+
return static function (array $context) {
1818
$kernel = new Kernel($context['APP_ENV'], (bool) $context['APP_DEBUG']);
1919

2020
return new ConsoleApplication($kernel);

composer.lock

Lines changed: 464 additions & 441 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/packages/messenger.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ framework:
1010
sync: 'sync://'
1111
async:
1212
dsn: '%env(MESSENGER_TRANSPORT_DSN)%'
13-
options:
14-
use_notify: true
15-
check_delayed_interval: 60000
1613
retry_strategy:
1714
max_retries: 3
1815
multiplier: 2

config/packages/sentry.yaml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ when@prod:
1010
- 'Symfony\Component\Debug\Exception\FatalErrorException'
1111
#
1212
# # If you are using Monolog, you also need this additional configuration to log the errors correctly:
13-
# # https://docs.sentry.io/platforms/php/guides/symfony/#monolog-integration
13+
# # https://docs.sentry.io/platforms/php/guides/symfony/integrations/monolog/
1414
# register_error_listener: false
1515
# register_error_handler: false
1616
#
@@ -19,18 +19,21 @@ when@prod:
1919
# # Use this only if you don't want to use structured logging and instead receive
2020
# # certain log levels as errors.
2121
# sentry:
22-
# type: sentry
23-
# level: !php/const Monolog\Logger::ERROR
24-
# hub_id: Sentry\State\HubInterface
25-
# fill_extra_context: true # Enables sending monolog context to Sentry
26-
# process_psr_3_messages: false # Disables the resolution of PSR-3 placeholders
22+
# type: service
23+
# id: Sentry\Monolog\Handler
2724
#
2825
# # Use this for structured log integration
2926
# sentry_logs:
3027
# type: service
3128
# id: Sentry\SentryBundle\Monolog\LogsHandler
3229
#
30+
# # Enable one of the two services below, depending on your choice above
3331
# services:
32+
# Sentry\Monolog\Handler:
33+
# arguments:
34+
# $hub: '@Sentry\State\HubInterface'
35+
# $level: !php/const Monolog\Logger::ERROR
36+
# $fillExtraContext: true # Enables sending monolog context to Sentry
3437
# Sentry\SentryBundle\Monolog\LogsHandler:
3538
# arguments:
3639
# - !php/const Monolog\Logger::INFO

public/index.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44

55
require_once dirname(__DIR__) . '/vendor/autoload_runtime.php';
66

7-
return function (array $context) {
7+
return static function (array $context) {
88
return new Kernel($context['APP_ENV'], (bool) $context['APP_DEBUG']);
99
};

src/Controller/Dashboard/DashboardCredentialsController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function configureFields(string $pageName): iterable
3636
->setTemplatePath('dashboard/fields/credentials_type.html.twig')
3737
->setRequired(true)
3838
->setChoices(CredentialsType::cases())
39-
->setFormTypeOption('choice_label', function (CredentialsType $choice): string {
39+
->setFormTypeOption('choice_label', static function (CredentialsType $choice): string {
4040
return "credentials.type.{$choice->value}";
4141
})
4242
->renderExpanded();

src/Controller/Dashboard/DashboardRegistryController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public function configureFields(string $pageName): iterable
6969
->setTemplatePath('dashboard/fields/registry_package_mirroring.html.twig')
7070
->setRequired(true)
7171
->setChoices(RegistryPackageMirroring::cases())
72-
->setFormTypeOption('choice_label', function (RegistryPackageMirroring $choice): string {
72+
->setFormTypeOption('choice_label', static function (RegistryPackageMirroring $choice): string {
7373
return "registry.package-mirroring.{$choice->value}";
7474
})
7575
->renderExpanded();

src/Doctrine/Entity/Version.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -718,7 +718,7 @@ public function toComposerArray(): array
718718
}
719719

720720
if (isset($data['php-ext']['configure-options'])) {
721-
usort($data['php-ext']['configure-options'], fn ($a, $b) => ($a['name'] ?? '') <=> ($b['name'] ?? ''));
721+
usort($data['php-ext']['configure-options'], static fn ($a, $b) => ($a['name'] ?? '') <=> ($b['name'] ?? ''));
722722
}
723723

724724
return $data;

src/Doctrine/Repository/PackageRepository.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ public function updatePackageLinks(Package $package, Version $version): void
166166
public function deletePackageLinks(Package $package): void
167167
{
168168
$connection = $this->getEntityManager()->getConnection();
169-
$connection->transactional(function (Connection $connection) use ($package) {
169+
$connection->transactional(static function (Connection $connection) use ($package) {
170170
$queryParameters = ['id' => $package->getId()];
171171

172172
$connection->executeStatement('DELETE FROM package_provide_link WHERE package_id = :id', $queryParameters);

0 commit comments

Comments
 (0)