Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[stable23] Bump symfony/translation to 4.4.41 #1043

Merged
merged 1 commit into from
May 30, 2022
Merged

[stable23] Bump symfony/translation to 4.4.41 #1043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions autoload.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

// autoload.php @generated by Composer

if (PHP_VERSION_ID < 50600) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need composer 2.3.5

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is with 2.3.5, stable23 was last build with an older version so this was added.
Otherwise it would be removed like in the master PR:
#1041 (comment)

echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
exit(1);
}

require_once __DIR__ . '/composer/autoload_real.php';

return ComposerAutoloaderInit2f23f73bc0cc116b4b1eee1521aa8652::getLoader();
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"symfony/polyfill-intl-normalizer": "^1.20",
"symfony/process": "4.4.30",
"symfony/routing": "4.4.30",
"symfony/translation": "4.4.30",
"symfony/translation": "^4.4.41",
"web-auth/webauthn-lib": "^3.1"
},
"extra": {
Expand Down
16 changes: 8 additions & 8 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion composer/autoload_real.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public static function getLoader()
set_include_path(implode(PATH_SEPARATOR, $includePaths));

require __DIR__ . '/autoload_static.php';
\Composer\Autoload\ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652::getInitializer($loader)();
call_user_func(\Composer\Autoload\ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652::getInitializer($loader));

$loader->setClassMapAuthoritative(true);
$loader->register(true);
Expand Down
16 changes: 8 additions & 8 deletions composer/installed.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5669,17 +5669,17 @@
},
{
"name": "symfony/translation",
"version": "v4.4.30",
"version_normalized": "4.4.30.0",
"version": "v4.4.41",
"version_normalized": "4.4.41.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
"reference": "db0ba1e85280d8ff11e38d53c70f8814d4d740f5"
"reference": "dcb67eae126e74507e0b4f0b9ac6ef35b37c3331"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/translation/zipball/db0ba1e85280d8ff11e38d53c70f8814d4d740f5",
"reference": "db0ba1e85280d8ff11e38d53c70f8814d4d740f5",
"url": "https://api.github.com/repos/symfony/translation/zipball/dcb67eae126e74507e0b4f0b9ac6ef35b37c3331",
"reference": "dcb67eae126e74507e0b4f0b9ac6ef35b37c3331",
"shasum": ""
},
"require": {
Expand Down Expand Up @@ -5713,7 +5713,7 @@
"symfony/config": "",
"symfony/yaml": ""
},
"time": "2021-08-26T05:57:13+00:00",
"time": "2022-04-21T07:22:34+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
Expand Down Expand Up @@ -5741,7 +5741,7 @@
"description": "Provides tools to internationalize your application",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/translation/tree/v4.4.30"
"source": "https://github.com/symfony/translation/tree/v4.4.41"
},
"funding": [
{
Expand Down Expand Up @@ -6206,6 +6206,6 @@
"install-path": "../web-auth/webauthn-lib"
}
],
"dev": false,
"dev": true,
"dev-package-names": []
}
12 changes: 6 additions & 6 deletions composer/installed.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
'type' => 'library',
'install_path' => __DIR__ . '/../',
'aliases' => array(),
'reference' => 'fd3e5128c875571ce89742bf45c9b460fa2a8351',
'reference' => '1a54ba059004f94350c851844df9044ca0f5c2bf',
'name' => 'nextcloud/3rdparty',
'dev' => false,
'dev' => true,
),
'versions' => array(
'aws/aws-sdk-php' => array(
Expand Down Expand Up @@ -286,7 +286,7 @@
'type' => 'library',
'install_path' => __DIR__ . '/../',
'aliases' => array(),
'reference' => 'fd3e5128c875571ce89742bf45c9b460fa2a8351',
'reference' => '1a54ba059004f94350c851844df9044ca0f5c2bf',
'dev_requirement' => false,
),
'nextcloud/lognormalizer' => array(
Expand Down Expand Up @@ -812,12 +812,12 @@
'dev_requirement' => false,
),
'symfony/translation' => array(
'pretty_version' => 'v4.4.30',
'version' => '4.4.30.0',
'pretty_version' => 'v4.4.41',
'version' => '4.4.41.0',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/translation',
'aliases' => array(),
'reference' => 'db0ba1e85280d8ff11e38d53c70f8814d4d740f5',
'reference' => 'dcb67eae126e74507e0b4f0b9ac6ef35b37c3331',
'dev_requirement' => false,
),
'symfony/translation-contracts' => array(
Expand Down
2 changes: 1 addition & 1 deletion symfony/translation/Catalogue/TargetOperation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ protected function processDomain($domain)
foreach ($this->source->all($domain) as $id => $message) {
if ($this->target->has($id, $domain)) {
$this->messages[$domain]['all'][$id] = $message;
$d = $this->target->defines($id, $intlDomain) ? $intlDomain : $domain;
$d = $this->source->defines($id, $intlDomain) ? $intlDomain : $domain;
$this->result->add([$id => $message], $d);
if (null !== $keyMetadata = $this->source->getMetadata($id, $d)) {
$this->result->setMetadata($id, $keyMetadata, $d);
Expand Down
2 changes: 1 addition & 1 deletion symfony/translation/LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2004-2021 Fabien Potencier
Copyright (c) 2004-2022 Fabien Potencier

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
4 changes: 2 additions & 2 deletions symfony/translation/Loader/MoFileLoader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ class MoFileLoader extends FileLoader
* Magic used for validating the format of an MO file as well as
* detecting if the machine used to create that file was little endian.
*/
public const MO_LITTLE_ENDIAN_MAGIC = 0x950412de;
public const MO_LITTLE_ENDIAN_MAGIC = 0x950412DE;

/**
* Magic used for validating the format of an MO file as well as
* detecting if the machine used to create that file was big endian.
*/
public const MO_BIG_ENDIAN_MAGIC = 0xde120495;
public const MO_BIG_ENDIAN_MAGIC = 0xDE120495;

/**
* The size of the header of an MO file in bytes.
Expand Down
7 changes: 5 additions & 2 deletions symfony/translation/Resources/data/parents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"en_BS": "en_001",
"en_BW": "en_001",
"en_BZ": "en_001",
"en_CA": "en_001",
"en_CC": "en_001",
"en_CH": "en_150",
"en_CK": "en_001",
Expand Down Expand Up @@ -55,6 +54,7 @@
"en_MS": "en_001",
"en_MT": "en_001",
"en_MU": "en_001",
"en_MV": "en_001",
"en_MW": "en_001",
"en_MY": "en_001",
"en_NA": "en_001",
Expand All @@ -65,7 +65,6 @@
"en_NU": "en_001",
"en_NZ": "en_001",
"en_PG": "en_001",
"en_PH": "en_001",
"en_PK": "en_001",
"en_PN": "en_001",
"en_PW": "en_001",
Expand Down Expand Up @@ -118,6 +117,10 @@
"es_UY": "es_419",
"es_VE": "es_419",
"ff_Adlm": "root",
"hi_Latn": "en_IN",
"ks_Deva": "root",
"nb": "no",
"nn": "no",
"pa_Arab": "root",
"pt_AO": "pt_PT",
"pt_CH": "pt_PT",
Expand Down