diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '4.4' into 5.2 

* 4.4:
  Update translations for Norwegian Nynorsk (nn) #38756
  Fix eventListener initialization when eventSubscriber constructor dispatch an event
  clear unchecked choice radio boxes even if clear missing is set to false
  [ErrorHandler] Added missing type annotations to FlattenException
  [TwigBridge] Allow version 3 of the Twig extra packages
  Fix FrameworkBundle PropertyAccess definition when not in debug
This commit is contained in:
Alexander M. Turek 2021-03-10 23:10:15 +01:00
parent 74c3c5fcb3 756522e977
commit 16bacb1b27
10 changed files with 225 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
composer.json
View File

@ -149,9 +149,9 @@
"symfony/phpunit-bridge": "^5.2",
"symfony/security-acl": "~2.8|~3.0",
"phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
"twig/cssinliner-extra": "^2.12",
"twig/inky-extra": "^2.12",
"twig/markdown-extra": "^2.12"
"twig/cssinliner-extra": "^2.12|^3",
"twig/inky-extra": "^2.12|^3",
"twig/markdown-extra": "^2.12|^3"
},
"conflict": {
"doctrine/dbal": "<2.10",

1
src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php
View File

@ -177,6 +177,7 @@ class ContainerAwareEventManager extends EventManager
if (!isset($this->listeners[$event])) {
$this->listeners[$event] = [];
}
unset($this->initialized[$event]);
$this->listeners[$event] += $listeners;
}
$this->subscribers = [];

6
src/Symfony/Bridge/Twig/composer.json
View File

@ -47,9 +47,9 @@
"symfony/expression-language": "^4.4|^5.0",
"symfony/web-link": "^4.4|^5.0",
"symfony/workflow": "^5.2",
"twig/cssinliner-extra": "^2.12",
"twig/inky-extra": "^2.12",
"twig/markdown-extra": "^2.12"
"twig/cssinliner-extra": "^2.12|^3",
"twig/inky-extra": "^2.12|^3",
"twig/markdown-extra": "^2.12|^3"
},
"conflict": {
"phpdocumentor/reflection-docblock": "<3.2.2",

2
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
View File

@ -1997,7 +1997,7 @@ class FrameworkExtension extends Extension
if (!$container->getParameter('kernel.debug')) {
$propertyAccessDefinition->setFactory([PropertyAccessor::class, 'createCache']);
$propertyAccessDefinition->setArguments([null, 0, $version, new Reference('logger', ContainerInterface::IGNORE_ON_INVALID_REFERENCE)]);
$propertyAccessDefinition->setArguments(['', 0, $version, new Reference('logger', ContainerInterface::IGNORE_ON_INVALID_REFERENCE)]);
$propertyAccessDefinition->addTag('cache.pool', ['clearer' => 'cache.system_clearer']);
$propertyAccessDefinition->addTag('monolog.logger', ['channel' => 'cache']);
} else {

39
src/Symfony/Component/ErrorHandler/Exception/FlattenException.php
View File

@ -24,17 +24,40 @@ use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
*/
class FlattenException
{
/** @var string */
private $message;
/** @var int|string */
private $code;
/** @var self|null */
private $previous;
/** @var array */
private $trace;
/** @var string */
private $traceAsString;
/** @var string */
private $class;
/** @var int */
private $statusCode;
/** @var string */
private $statusText;
/** @var array */
private $headers;
/** @var string */
private $file;
/** @var int */
private $line;
/** @var string|null */
private $asString;
/**
@ -108,6 +131,8 @@ class FlattenException
}
/**
* @param int $code
*
* @return $this
*/
public function setStatusCode($code): self
@ -138,6 +163,8 @@ class FlattenException
}
/**
* @param string $class
*
* @return $this
*/
public function setClass($class): self
@ -153,6 +180,8 @@ class FlattenException
}
/**
* @param string $file
*
* @return $this
*/
public function setFile($file): self
@ -168,6 +197,8 @@ class FlattenException
}
/**
* @param int $line
*
* @return $this
*/
public function setLine($line): self
@ -195,6 +226,8 @@ class FlattenException
}
/**
* @param string $message
*
* @return $this
*/
public function setMessage($message): self
@ -219,6 +252,8 @@ class FlattenException
}
/**
* @param int|string $code
*
* @return $this
*/
public function setCode($code): self
@ -273,6 +308,10 @@ class FlattenException
}
/**
* @param array $trace
* @param string|null $file
* @param int|null $line
*
* @return $this
*/
public function setTrace($trace, $file, $line): self

2
src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
View File

@ -159,6 +159,8 @@ class ChoiceType extends AbstractType
$knownValues[$child->getName()] = $value;
unset($unknownValues[$value]);
continue;
} else {
$knownValues[$child->getName()] = null;
}
}
} else {

122
src/Symfony/Component/Form/Resources/translations/validators.nn.xlf
View File

@ -4,7 +4,7 @@
<body>
<trans-unit id="28">
<source>This form should not contain extra fields.</source>
<target>Feltgruppa må ikkje innehalde ekstra felt.</target>
<target>Feltgruppa kan ikkje innehalde ekstra felt.</target>
</trans-unit>
<trans-unit id="29">
<source>The uploaded file was too large. Please try to upload a smaller file.</source>
@ -14,6 +14,126 @@
<source>The CSRF token is invalid.</source>
<target>CSRF-nøkkelen er ikkje gyldig.</target>
</trans-unit>
<trans-unit id="99">
<source>This value is not a valid HTML5 color.</source>
<target>Verdien er ikkje ein gyldig HTML5-farge.</target>
</trans-unit>
<trans-unit id="100">
<source>Please enter a valid birthdate.</source>
<target>Gje opp ein gyldig fødselsdato.</target>
</trans-unit>
<trans-unit id="101">
<source>The selected choice is invalid.</source>
<target>Valget du gjorde er ikkje gyldig.</target>
</trans-unit>
<trans-unit id="102">
<source>The collection is invalid.</source>
<target>Samlinga er ikkje gyldig.</target>
</trans-unit>
<trans-unit id="103">
<source>Please select a valid color.</source>
<target>Gje opp ein gyldig farge.</target>
</trans-unit>
<trans-unit id="104">
<source>Please select a valid country.</source>
<target>Gje opp eit gyldig land.</target>
</trans-unit>
<trans-unit id="105">
<source>Please select a valid currency.</source>
<target>Gje opp ein gyldig valuta.</target>
</trans-unit>
<trans-unit id="106">
<source>Please choose a valid date interval.</source>
<target>Gje opp eit gyldig datointervall.</target>
</trans-unit>
<trans-unit id="107">
<source>Please enter a valid date and time.</source>
<target>Gje opp ein gyldig dato og tid.</target>
</trans-unit>
<trans-unit id="108">
<source>Please enter a valid date.</source>
<target>Gje opp ein gyldig dato.</target>
</trans-unit>
<trans-unit id="109">
<source>Please select a valid file.</source>
<target>Velg ei gyldig fil.</target>
</trans-unit>
<trans-unit id="110">
<source>The hidden field is invalid.</source>
<target>Det skjulte feltet er ikkje gyldig.</target>
</trans-unit>
<trans-unit id="111">
<source>Please enter an integer.</source>
<target>Gje opp eit heiltal.</target>
</trans-unit>
<trans-unit id="112">
<source>Please select a valid language.</source>
<target>Gje opp eit gyldig språk.</target>
</trans-unit>
<trans-unit id="113">
<source>Please select a valid locale.</source>
<target>Gje opp eit gyldig locale.</target>
</trans-unit>
<trans-unit id="114">
<source>Please enter a valid money amount.</source>
<target>Gje opp ein gyldig sum pengar.</target>
</trans-unit>
<trans-unit id="115">
<source>Please enter a number.</source>
<target>Gje opp eit nummer.</target>
</trans-unit>
<trans-unit id="116">
<source>The password is invalid.</source>
<target>Passordet er ikkje gyldig.</target>
</trans-unit>
<trans-unit id="117">
<source>Please enter a percentage value.</source>
<target>Gje opp ein prosentverdi.</target>
</trans-unit>
<trans-unit id="118">
<source>The values do not match.</source>
<target>Verdiane er ikkje eins.</target>
</trans-unit>
<trans-unit id="119">
<source>Please enter a valid time.</source>
<target>Gje opp ei gyldig tid.</target>
</trans-unit>
<trans-unit id="120">
<source>Please select a valid timezone.</source>
<target>Gje opp ei gyldig tidssone.</target>
</trans-unit>
<trans-unit id="121">
<source>Please enter a valid URL.</source>
<target>Gje opp ein gyldig URL.</target>
</trans-unit>
<trans-unit id="122">
<source>Please enter a valid search term.</source>
<target>Gje opp gyldige søkjeord.</target>
</trans-unit>
<trans-unit id="123">
<source>Please provide a valid phone number.</source>
<target>Gje opp eit gyldig telefonnummer.</target>
</trans-unit>
<trans-unit id="124">
<source>The checkbox has an invalid value.</source>
<target>Sjekkboksen har ein ugyldig verdi.</target>
</trans-unit>
<trans-unit id="125">
<source>Please enter a valid email address.</source>
<target>Gje opp ei gyldig e-postadresse.</target>
</trans-unit>
<trans-unit id="126">
<source>Please select a valid option.</source>
<target>Velg eit gyldig vilkår.</target>
</trans-unit>
<trans-unit id="127">
<source>Please select a valid range.</source>
<target>Velg eit gyldig spenn.</target>
</trans-unit>
<trans-unit id="128">
<source>Please enter a valid week.</source>
<target>Gje opp ei gyldig veke.</target>
</trans-unit>
</body>
</file>
</xliff>

14
src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
View File

@ -1321,6 +1321,20 @@ class ChoiceTypeTest extends BaseTypeTest
$this->assertNull($form[4]->getViewData());
}
public function testSubmitSingleExpandedClearMissingFalse()
{
$form = $this->factory->create(self::TESTED_TYPE, 'foo', [
'choices' => [
'foo label' => 'foo',
'bar label' => 'bar',
],
'expanded' => true,
]);
$form->submit('bar', false);
$this->assertSame('bar', $form->getData());
}
public function testSubmitMultipleExpanded()
{
$form = $this->factory->create(static::TESTED_TYPE, null, [

12
src/Symfony/Component/Security/Core/Resources/translations/security.nn.xlf
View File

@ -36,7 +36,7 @@
</trans-unit>
<trans-unit id="10">
<source>No session available, it either timed out or cookies are not enabled.</source>
<target>Ingen sesjon tilgjengeleg. Sesjonen er anten ikkje lenger gyldig, eller informasjonskapslar er ikke skrudd på i nettlesaren.</target>
<target>Ingen sesjon tilgjengeleg. Sesjonen er anten ikkje lenger gyldig, eller informasjonskapslar er ikkje skrudd på i nettlesaren.</target>
</trans-unit>
<trans-unit id="11">
<source>No token could be found.</source>
@ -56,12 +56,20 @@
</trans-unit>
<trans-unit id="15">
<source>Account is disabled.</source>
<target>Brukarkontoen er deaktivert.</target>
<target>Brukarkontoen er sperra.</target>
</trans-unit>
<trans-unit id="16">
<source>Account is locked.</source>
<target>Brukarkontoen er sperra.</target>
</trans-unit>
<trans-unit id="17">
<source>Too many failed login attempts, please try again later.</source>
<target>For mange innloggingsforsøk har feila, prøv igjen seinare.</target>
</trans-unit>
<trans-unit id="18">
<source>Invalid or expired login link.</source>
<target>Innloggingslenka er ugyldig eller utgjengen.</target>
</trans-unit>
</body>
</file>
</xliff>

58
src/Symfony/Component/Validator/Resources/translations/validators.nn.xlf
View File

@ -36,7 +36,7 @@
</trans-unit>
<trans-unit id="9">
<source>This field was not expected.</source>
<target>Dette feltet var ikke forventa.</target>
<target>Dette feltet var ikkje forventa.</target>
</trans-unit>
<trans-unit id="10">
<source>This field is missing.</source>
@ -248,7 +248,7 @@
</trans-unit>
<trans-unit id="65">
<source>This value should be equal to {{ compared_value }}.</source>
<target>Verdien bør vera like med {{ compared_value }}.</target>
<target>Verdien bør vera eins med {{ compared_value }}.</target>
</trans-unit>
<trans-unit id="66">
<source>This value should be greater than {{ compared_value }}.</source>
@ -256,11 +256,11 @@
</trans-unit>
<trans-unit id="67">
<source>This value should be greater than or equal to {{ compared_value }}.</source>
<target>Verdien bør vera større enn eller så med {{ compared_value }}.</target>
<target>Verdien bør vera større enn eller eins med {{ compared_value }}.</target>
</trans-unit>
<trans-unit id="68">
<source>This value should be identical to {{ compared_value_type }} {{ compared_value }}.</source>
<target>Verdien bør vera identisk med {{ compared_value_type }} {{ compared_value }}.</target>
<target>Verdien bør vera eins med {{ compared_value_type }} {{ compared_value }}.</target>
</trans-unit>
<trans-unit id="69">
<source>This value should be less than {{ compared_value }}.</source>
@ -268,47 +268,47 @@
</trans-unit>
<trans-unit id="70">
<source>This value should be less than or equal to {{ compared_value }}.</source>
<target>Verdi bør vera mindre enn eller så med {{ compared_value }}.</target>
<target>Verdi bør vera mindre enn eller eins med {{ compared_value }}.</target>
</trans-unit>
<trans-unit id="71">
<source>This value should not be equal to {{ compared_value }}.</source>
<target>Verdi bør ikkje vera så med {{ compared_value }}.</target>
<target>Verdi bør ikkje vera eins med {{ compared_value }}.</target>
</trans-unit>
<trans-unit id="72">
<source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
<target>Dette verdi bør ikkje vera identisk med {{ compared_value_type }} {{ compared_value }}.</target>
<target>Denne verdien bør ikkje vera eins med {{ compared_value_type }} {{ compared_value }}.</target>
</trans-unit>
<trans-unit id="73">
<source>The image ratio is too big ({{ ratio }}). Allowed maximum ratio is {{ max_ratio }}.</source>
<target>Bildetilhøvet er for stort ({{ ratio }}). Det tillatne maksimale tilhøvet er {{ max_ratio }}.</target>
<target>Sideforholdet til biletet er for stort ({{ ratio }}). Sideforholdet kan ikkje vere større enn {{ max_ratio }}.</target>
</trans-unit>
<trans-unit id="74">
<source>The image ratio is too small ({{ ratio }}). Minimum ratio expected is {{ min_ratio }}.</source>
<target>Bildetilhøvet er for lite ({{ ratio }}). Forventa minimikvot er {{ min_ratio }}.</target>
<target>Sideforholdet til biletet er for lite ({{ ratio }}). Sideforholdet kan ikkje vere mindre enn {{ min_ratio }}.</target>
</trans-unit>
<trans-unit id="75">
<source>The image is square ({{ width }}x{{ height }}px). Square images are not allowed.</source>
<target>Bildet er firkanta ({{ width }}x{{ height }}px). Fyrkantiga bilde er ikkje tillatne.</target>
<target>Biletet er kvadratisk ({{ width }}x{{ height }}px). Kvadratiske bilete er ikkje tillatne.</target>
</trans-unit>
<trans-unit id="76">
<source>The image is landscape oriented ({{ width }}x{{ height }}px). Landscape oriented images are not allowed.</source>
<target>Bildet er liggande orientert ({{ width }}x{{ height }}px). Landskapsorienterade bilde er ikkje tillatne.</target>
<target>Biletet er landskapsorientert ({{ width }}x{{ height }}px). Landskapsorienterte bilete er ikkje tillatne.</target>
</trans-unit>
<trans-unit id="77">
<source>The image is portrait oriented ({{ width }}x{{ height }}px). Portrait oriented images are not allowed.</source>
<target>Bildet er porträttorienterad ({{ width }}x{{ height }}px). Porträttorienterade bilde er ikkje tillatne.</target>
<target>Biletet er portrettorientert ({{ width }}x{{ height }}px). Portrettorienterte bilete er ikkje tillatne.</target>
</trans-unit>
<trans-unit id="78">
<source>An empty file is not allowed.</source>
<target>Ein tom fil er ikkje tillaten.</target>
<target>Ei tom fil er ikkje tillate.</target>
</trans-unit>
<trans-unit id="79">
<source>The host could not be resolved.</source>
<target>Verdiar kunne ikkje løysast.</target>
<target>Verten kunne ikkje finnast.</target>
</trans-unit>
<trans-unit id="80">
<source>This value does not match the expected {{ charset }} charset.</source>
<target>Verdi stemmer ikkje med forventa {{ charset }} charset.</target>
<target>Verdien stemmer ikkje med forventa {{ charset }} charset.</target>
</trans-unit>
<trans-unit id="81">
<source>This is not a valid Business Identifier Code (BIC).</source>
@ -324,7 +324,7 @@
</trans-unit>
<trans-unit id="84">
<source>This value should be a multiple of {{ compared_value }}.</source>
<target>Verdi bør vera eit multipel av {{ compared_value }}.</target>
<target>Verdien bør vera eit multipel av {{ compared_value }}.</target>
</trans-unit>
<trans-unit id="85">
<source>This Business Identifier Code (BIC) is not associated with IBAN {{ iban }}.</source>
@ -332,7 +332,7 @@
</trans-unit>
<trans-unit id="86">
<source>This value should be valid JSON.</source>
<target>Verdi bør vera gyldig JSON.</target>
<target>Verdien bør vera gyldig JSON.</target>
</trans-unit>
<trans-unit id="87">
<source>This collection should contain only unique elements.</source>
@ -340,31 +340,31 @@
</trans-unit>
<trans-unit id="88">
<source>This value should be positive.</source>
<target>Verdi bør vera positivt.</target>
<target>Verdien bør vera positiv.</target>
</trans-unit>
<trans-unit id="89">
<source>This value should be either positive or zero.</source>
<target>Verdi bør vera enten positivt eller noll.</target>
<target>Verdien bør vera anten positiv eller null.</target>
</trans-unit>
<trans-unit id="90">
<source>This value should be negative.</source>
<target>Verdi bør vera negativt.</target>
<target>Verdien bør vera negativ.</target>
</trans-unit>
<trans-unit id="91">
<source>This value should be either negative or zero.</source>
<target>Verdi bør vera negativt eller noll.</target>
<target>Verdien bør vera negativ eller null.</target>
</trans-unit>
<trans-unit id="92">
<source>This value is not a valid timezone.</source>
<target>Verdi er ikkje ei gyldig tidssone.</target>
<target>Verdien er ikkje ei gyldig tidssone.</target>
</trans-unit>
<trans-unit id="93">
<source>This password has been leaked in a data breach, it must not be used. Please use another password.</source>
<target>Det her passordet har lekt ut ved eit datainnbrot, det får ikkje nyttast. Nytt eit anna passord.</target>
<target>Dette passordet har lekt ut ved eit datainnbrot, det får ikkje nyttast. Gje opp eit anna passord.</target>
</trans-unit>
<trans-unit id="94">
<source>This value should be between {{ min }} and {{ max }}.</source>
<target>Dette verdi bør ligga mellom {{ min }} og {{ max }}.</target>
<target>Denne verdien bør liggje mellom {{ min }} og {{ max }}.</target>
</trans-unit>
<trans-unit id="95">
<source>This value is not a valid hostname.</source>
@ -372,15 +372,19 @@
</trans-unit>
<trans-unit id="96">
<source>The number of elements in this collection should be a multiple of {{ compared_value }}.</source>
<target>Talet på element i denne samlinga bør vera eit multipel av {{ compared_value }}.</target>
<target>Talet på element i denne samlinga bør vera eit multippel av {{ compared_value }}.</target>
</trans-unit>
<trans-unit id="97">
<source>This value should satisfy at least one of the following constraints:</source>
<target>Verdien burde oppfylla minst ein av følgjande begränsningar:</target>
<target>Verdien burde oppfylla minst ein av følgjande avgrensingar:</target>
</trans-unit>
<trans-unit id="98">
<source>Each element of this collection should satisfy its own set of constraints.</source>
<target>Kvart element i denne samlinga bør oppfylla sine eigne begränsningar.</target>
<target>Kvart element i denne samlinga bør oppfylla sine eigne avgrensingar.</target>
</trans-unit>
<trans-unit id="99">
<source>This value is not a valid International Securities Identification Number (ISIN).</source>
<target>Verdien er ikkje eit gyldig International Securities Identification Number (ISIN).</target>
</trans-unit>
</body>
</file>