Merge branch '3.4' into 4.3
* 3.4: [DI] Dont cache classes with missing parents [Validator] Add the missing translations for the Hebrew (\"he\") locale and fix 2 typos
This commit is contained in:
Nicolas Grekas
commit
a1fc280bf2
|
|
@ -147,7 +147,7 @@ class ClassExistenceResource implements SelfCheckingResourceInterface
|
|||
throw $previous;
|
||||
}
|
||||
|
||||
$e = new \ReflectionException("Class $class not found", 0, $previous);
|
||||
$e = new \ReflectionException(sprintf('Class "%s" not found while loading "%s".', $class, self::$autoloadedClass), 0, $previous);
|
||||
|
||||
if (null !== $previous) {
|
||||
throw $e;
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@ EOF
|
|||
public function testBadParentWithNoTimestamp()
|
||||
{
|
||||
$this->expectException('ReflectionException');
|
||||
$this->expectExceptionMessage('Class Symfony\Component\Config\Tests\Fixtures\MissingParent not found');
|
||||
$this->expectExceptionMessage('Class "Symfony\Component\Config\Tests\Fixtures\MissingParent" not found while loading "Symfony\Component\Config\Tests\Fixtures\BadParent".');
|
||||
|
||||
$res = new ClassExistenceResource(BadParent::class, false);
|
||||
$res->isFresh(0);
|
||||
|
|
|
|||
|
|
@ -343,7 +343,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
|
|||
return null;
|
||||
}
|
||||
|
||||
$resource = null;
|
||||
$resource = $classReflector = null;
|
||||
|
||||
try {
|
||||
if (isset($this->classReflectors[$class])) {
|
||||
|
|
@ -358,7 +358,6 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
|
|||
if ($throw) {
|
||||
throw $e;
|
||||
}
|
||||
$classReflector = false;
|
||||
}
|
||||
|
||||
if ($this->trackResources) {
|
||||
|
|
|
|||
|
|
@ -149,12 +149,7 @@ abstract class FileLoader extends BaseFileLoader
|
|||
try {
|
||||
$r = $this->container->getReflectionClass($class);
|
||||
} catch (\ReflectionException $e) {
|
||||
$classes[$class] = sprintf(
|
||||
'While discovering services from namespace "%s", an error was thrown when processing the class "%s": "%s".',
|
||||
$namespace,
|
||||
$class,
|
||||
$e->getMessage()
|
||||
);
|
||||
$classes[$class] = $e->getMessage();
|
||||
continue;
|
||||
}
|
||||
// check to make sure the expected class exists
|
||||
|
|
|
|||
|
|
@ -363,7 +363,7 @@ class AutowirePassTest extends TestCase
|
|||
$pass->process($container);
|
||||
$this->fail('AutowirePass should have thrown an exception');
|
||||
} catch (AutowiringFailedException $e) {
|
||||
$this->assertSame('Cannot autowire service "a": argument "$r" of method "Symfony\Component\DependencyInjection\Tests\Compiler\BadParentTypeHintedArgument::__construct()" has type "Symfony\Component\DependencyInjection\Tests\Compiler\OptionalServiceClass" but this class is missing a parent class (Class Symfony\Bug\NotExistClass not found).', (string) $e->getMessage());
|
||||
$this->assertRegExp('{^Cannot autowire service "a": argument "\$r" of method "(Symfony\\\\Component\\\\DependencyInjection\\\\Tests\\\\Compiler\\\\)BadParentTypeHintedArgument::__construct\(\)" has type "\1OptionalServiceClass" but this class is missing a parent class \(Class "?Symfony\\\\Bug\\\\NotExistClass"? not found}', (string) $e->getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -196,9 +196,9 @@ class FileLoaderTest extends TestCase
|
|||
|
||||
$this->assertTrue($container->has(MissingParent::class));
|
||||
|
||||
$this->assertSame(
|
||||
['While discovering services from namespace "Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\BadClasses\", an error was thrown when processing the class "Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\BadClasses\MissingParent": "Class Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\BadClasses\MissingClass not found".'],
|
||||
$container->getDefinition(MissingParent::class)->getErrors()
|
||||
$this->assertRegExp(
|
||||
'{Class "?Symfony\\\\Component\\\\DependencyInjection\\\\Tests\\\\Fixtures\\\\Prototype\\\\BadClasses\\\\MissingClass"? not found}',
|
||||
$container->getDefinition(MissingParent::class)->getErrors()[0]
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@
|
|||
</trans-unit>
|
||||
<trans-unit id="18">
|
||||
<source>This value should be {{ limit }} or less.</source>
|
||||
<target>הערך צריל להכיל {{ limit }} תווים לכל היותר.</target>
|
||||
<target>הערך צריך להכיל {{ limit }} תווים לכל היותר.</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="19">
|
||||
<source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source>
|
||||
|
|
@ -84,7 +84,7 @@
|
|||
</trans-unit>
|
||||
<trans-unit id="21">
|
||||
<source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source>
|
||||
<target>הערך קצר מידיץ הוא צריך להכיל {{ limit }} תווים לפחות.|הערך קצר מידיץ הוא צריך להכיל {{ limit }} תווים לפחות.</target>
|
||||
<target>הערך קצר מידי. הוא צריך להכיל {{ limit }} תווים לפחות.|הערך קצר מידיץ הוא צריך להכיל {{ limit }} תווים לפחות.</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="22">
|
||||
<source>This value should not be blank.</source>
|
||||
|
|
@ -224,83 +224,147 @@
|
|||
</trans-unit>
|
||||
<trans-unit id="59">
|
||||
<source>This is not a valid International Bank Account Number (IBAN).</source>
|
||||
<target>This is not a valid International Bank Account Number (IBAN).</target>
|
||||
<target>מספר חשבון בנק בינלאומי אינו חוקי (IBAN).</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="60">
|
||||
<source>This value is not a valid ISBN-10.</source>
|
||||
<target>This value is not a valid ISBN-10.</target>
|
||||
<target>הערך אינו ערך ISBN-10 חוקי.</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="61">
|
||||
<source>This value is not a valid ISBN-13.</source>
|
||||
<target>This value is not a valid ISBN-13.</target>
|
||||
<target>הערך אינו ערך ISBN-13 חוקי.</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="62">
|
||||
<source>This value is neither a valid ISBN-10 nor a valid ISBN-13.</source>
|
||||
<target>This value is neither a valid ISBN-10 nor a valid ISBN-13.</target>
|
||||
<target>הערך אינו ערך ISBN-10 חוקי או ערך ISBN-13 חוקי.</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="63">
|
||||
<source>This value is not a valid ISSN.</source>
|
||||
<target>This value is not a valid ISSN.</target>
|
||||
<target>הערך אינו ערך ISSN חוקי.</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="64">
|
||||
<source>This value is not a valid currency.</source>
|
||||
<target>This value is not a valid currency.</target>
|
||||
<target>הערך אינו ערך מטבע חוקי.</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="65">
|
||||
<source>This value should be equal to {{ compared_value }}.</source>
|
||||
<target>This value should be equal to {{ compared_value }}.</target>
|
||||
<target>הערך חייב להיות שווה ל {{ compared_value }}.</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="66">
|
||||
<source>This value should be greater than {{ compared_value }}.</source>
|
||||
<target>This value should be greater than {{ compared_value }}.</target>
|
||||
<target>הערך חייב להיות גדול מ {{ compared_value }}.</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="67">
|
||||
<source>This value should be greater than or equal to {{ compared_value }}.</source>
|
||||
<target>This value should be greater than or equal to {{ compared_value }}.</target>
|
||||
<target>הערך חייב להיות גדול או שווה ל {{ compared_value }}.</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="68">
|
||||
<source>This value should be identical to {{ compared_value_type }} {{ compared_value }}.</source>
|
||||
<target>This value should be identical to {{ compared_value_type }} {{ compared_value }}.</target>
|
||||
<target>הערך חייב להיות זהה ל {{ compared_value_type }} {{ compared_value }}.</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="69">
|
||||
<source>This value should be less than {{ compared_value }}.</source>
|
||||
<target>This value should be less than {{ compared_value }}.</target>
|
||||
<target>הערך חייב להיות קטן מ {{ compared_value }}.</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="70">
|
||||
<source>This value should be less than or equal to {{ compared_value }}.</source>
|
||||
<target>This value should be less than or equal to {{ compared_value }}.</target>
|
||||
<target>הערך חייב להיות קטן או שווה ל {{ compared_value }}.</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="71">
|
||||
<source>This value should not be equal to {{ compared_value }}.</source>
|
||||
<target>This value should not be equal to {{ compared_value }}.</target>
|
||||
<target>הערך חייב להיות לא שווה ל {{ compared_value }}.</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="72">
|
||||
<source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
|
||||
<target>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</target>
|
||||
<target>הערך חייב להיות לא זהה ל {{ 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>The image ratio is too big ({{ ratio }}). Allowed maximum ratio is {{ max_ratio }}.</target>
|
||||
<target>היחס של התמונה הוא גדול מדי ({{ ratio }}). היחס המקסימלי האפשרי הוא {{ 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>The image ratio is too small ({{ ratio }}). Minimum ratio expected is {{ min_ratio }}.</target>
|
||||
<target>היחס של התמונה הוא קטן מדי ({{ ratio }}). היחס המינימלי האפשרי הוא {{ 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>The image is square ({{ width }}x{{ height }}px). Square images are not allowed.</target>
|
||||
<target>התמונה מרובעת ({{ width }}x{{ height }}px). אסורות תמונות מרובעות.</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>The image is landscape oriented ({{ width }}x{{ height }}px). Landscape oriented images are not allowed.</target>
|
||||
<target>התמונה היא לרוחב ({{ width }}x{{ height }}px). אסורות תמונות לרוחב.</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>The image is portrait oriented ({{ width }}x{{ height }}px). Portrait oriented images are not allowed.</target>
|
||||
<target>התמונה היא לאורך ({{ width }}x{{ height }}px). אסורות תמונות לאורך.</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="78">
|
||||
<source>An empty file is not allowed.</source>
|
||||
<target>An empty file is not allowed.</target>
|
||||
<target>אסור קובץ ריק.</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="79">
|
||||
<source>The host could not be resolved.</source>
|
||||
<target>לא הייתה אפשרות לזהות את המארח.</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="80">
|
||||
<source>This value does not match the expected {{ charset }} charset.</source>
|
||||
<target>הערך אינו תואם למערך התווים {{ charset }} הצפוי.</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="81">
|
||||
<source>This is not a valid Business Identifier Code (BIC).</source>
|
||||
<target>קוד זיהוי עסקי אינו חוקי (BIC).</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="82">
|
||||
<source>Error</source>
|
||||
<target>שגיאה</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="83">
|
||||
<source>This is not a valid UUID.</source>
|
||||
<target>הערך אינו ערך UUID חוקי.</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="84">
|
||||
<source>This value should be a multiple of {{ compared_value }}.</source>
|
||||
<target>הערך חייב להיות כפולה של {{ compared_value }}.</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="85">
|
||||
<source>This Business Identifier Code (BIC) is not associated with IBAN {{ iban }}.</source>
|
||||
<target>הקוד זיהוי עסקי (BIC) אינו משוייך ל IBAN {{ iban }}.</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="86">
|
||||
<source>This value should be valid JSON.</source>
|
||||
<target>הערך אינו ערך JSON תקין.</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="87">
|
||||
<source>This collection should contain only unique elements.</source>
|
||||
<target>האוסף חייב להכיל רק אלמנטים ייחודיים.</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="88">
|
||||
<source>This value should be positive.</source>
|
||||
<target>הערך חייב להיות חיובי.</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="89">
|
||||
<source>This value should be either positive or zero.</source>
|
||||
<target>הערך חייב להיות חיובי או אפס.</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="90">
|
||||
<source>This value should be negative.</source>
|
||||
<target>הערך חייב להיות שלילי.</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="91">
|
||||
<source>This value should be either negative or zero.</source>
|
||||
<target>הערך חייב להיות שלילי או אפס.</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="92">
|
||||
<source>This value is not a valid timezone.</source>
|
||||
<target>הערך אינו אזור זמן תקין.</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>סיסמא זו הודלפה בהדלפת מידע, אסור להשתמש בה. אנא השתמש בסיסמה אחרת.</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="94">
|
||||
<source>This value should be between {{ min }} and {{ max }}.</source>
|
||||
<target>הערך חייב להיות בין {{ min }} ו- {{ max }}.</target>
|
||||
</trans-unit>
|
||||
</body>
|
||||
</file>
|
||||
|
|
|
|||
Reference in New Issue