Skip to content

Commit

Permalink
Merge branch '6.4' into 7.0
Browse files Browse the repository at this point in the history
* 6.4: (47 commits)
  Sync .github/expected-missing-return-types.diff
  [FrameworkBundle] Add void return-type to ErrorLoggerCompilerPass
  [DoctrineBridge] Fix cross-versions compat
  [HttpKernel] Handle nullable callback of StreamedResponse
  [Mailer] Capitalize sender header for Mailgun
  [FrameworkBundle] Configure `logger` as error logger if the Monolog Bundle is not registered
  DX: PHP CS Fixer - drop explicit nullable_type_declaration_for_default_null_value config, as it's part of ruleset anyway
  DX: PHP CS Fixer - drop explicit no_superfluous_phpdoc_tags config, as it's part of ruleset already
  [DI] Simplify using DI attributes with `ServiceLocator/Iterator`'s
  [FrameworkBundle] Fix registering workflow.registry
  Revert "Add keyword `dev` to leverage composer hint"
  [Validator] Add missing Ukrainian translations #51960
  [Validator] Add missing translations for Indonesian (id)
  [Validator] Add missing translations for Vietnamese (VI)
  Add missing Validator translations - Croatian (hr)
  [HttpFoundation]  Improve PHPDoc of Cache attribute
  [Validator] Add missing Spanish (es) translations #51956
  [Serializer] Add `XmlEncoder::CDATA_WRAPPING` context option
  [Finder] Add early directory prunning filter support
  Add missing dutch translations
  ...
  • Loading branch information
nicolas-grekas committed Oct 12, 2023
2 parents d6ec1c9 + 2136b00 commit 4823b14
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Command/DebugCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
*
* @author Christopher Hertel <mail@christopher-hertel.de>
*/
#[AsCommand(name: 'debug:dotenv', description: 'Lists all dotenv files with variables and values')]
#[AsCommand(name: 'debug:dotenv', description: 'List all dotenv files with variables and values')]
final class DebugCommand extends Command
{
private string $kernelEnvironment;
Expand Down
2 changes: 1 addition & 1 deletion Command/DotenvDumpCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
* @internal
*/
#[Autoconfigure(bind: ['$projectDir' => '%kernel.project_dir%', '$defaultEnv' => '%kernel.environment%'])]
#[AsCommand(name: 'dotenv:dump', description: 'Compiles .env files to .env.local.php')]
#[AsCommand(name: 'dotenv:dump', description: 'Compile .env files to .env.local.php')]
final class DotenvDumpCommand extends Command
{
private string $projectDir;
Expand Down

0 comments on commit 4823b14

Please sign in to comment.