Merge branch '3.4' into 4.2

nicolas-grekas · nicolas-grekas · commit e9814030c604 · 2019-03-15T14:37:34.000+01:00
* 3.4:
  Fix Cache error while using anonymous class
  Update validators.cs.xlf
diff --git a/src/Symfony/Component/Validator/Mapping/Cache/Psr6Cache.php b/src/Symfony/Component/Validator/Mapping/Cache/Psr6Cache.php
@@ -66,6 +66,11 @@ public function write(ClassMetadata $metadata)
      */
     private function escapeClassName(string $class): string
     {
+        if (false !== strpos($class, '@')) {
+            // anonymous class: replace all PSR6-reserved characters
+            return str_replace(["\0", '\\', '/', '@', ':', '{', '}', '(', ')'], '.', $class);
+        }
+
         return str_replace('\\', '.', $class);
     }
 }
diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.cs.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.cs.xlf
@@ -318,6 +318,22 @@
                 <source>Error</source>
                 <target>Chyba</target>
             </trans-unit>
+            <trans-unit id="83">
+                <source>This is not a valid UUID.</source>
+                <target>Tato hodnota není platné UUID.</target>
+            </trans-unit>
+            <trans-unit id="84">
+                <source>This value should be a multiple of {{ compared_value }}.</source>
+                <target>Tato hodnota musí být násobek hodnoty {{ compared_value }}.</target>
+            </trans-unit>
+            <trans-unit id="85">
+                <source>This Business Identifier Code (BIC) is not associated with IBAN {{ iban }}.</source>
+                <target>Bankovní identifikační kód (BIC) neodpovídá mezinárodnímu číslu účtu (IBAN) {{ iban }}.</target>
+            </trans-unit>
+            <trans-unit id="86">
+                <source>This value should be valid JSON.</source>
+                <target>Tato hodnota musí být validní JSON.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/src/Symfony/Component/Validator/Tests/Mapping/Cache/Psr6CacheTest.php b/src/Symfony/Component/Validator/Tests/Mapping/Cache/Psr6CacheTest.php
@@ -23,4 +23,12 @@ public function testNameCollision()
         $this->cache->write($metadata);
         $this->assertFalse($this->cache->has('Foo_Bar'));
     }
+
+    public function testNameWithInvalidChars()
+    {
+        $metadata = new ClassMetadata('class@anonymous/path/file');
+
+        $this->cache->write($metadata);
+        $this->assertTrue($this->cache->has('class@anonymous/path/file'));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,11 @@ public function write(ClassMetadata $metadata)`
`66`	`66`	`*/`
`67`	`67`	`private function escapeClassName(string $class): string`
`68`	`68`	`{`
	`69`	`+ if (false !== strpos($class, '@')) {`
	`70`	`+ // anonymous class: replace all PSR6-reserved characters`
	`71`	`+ return str_replace(["\0", '\\', '/', '@', ':', '{', '}', '(', ')'], '.', $class);`
	`72`	`+ }`
	`73`	`+`
`69`	`74`	`return str_replace('\\', '.', $class);`
`70`	`75`	`}`
`71`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,4 +23,12 @@ public function testNameCollision()`
`23`	`23`	`$this->cache->write($metadata);`
`24`	`24`	`$this->assertFalse($this->cache->has('Foo_Bar'));`
`25`	`25`	`}`
	`26`	`+`
	`27`	`+ public function testNameWithInvalidChars()`
	`28`	`+ {`
	`29`	`+ $metadata = new ClassMetadata('class@anonymous/path/file');`
	`30`	`+`
	`31`	`+ $this->cache->write($metadata);`
	`32`	`+ $this->assertTrue($this->cache->has('class@anonymous/path/file'));`
	`33`	`+ }`
`26`	`34`	`}`