Merge branch '7.0' into 7.1

* 7.0: (39 commits)
  fix merge
  add missing return type-hints
  fix merge
  explicitly mark nullable parameters as nullable
  fix low deps tests
  [HttpKernel] Fix datacollector caster for reference object property
  [Serializer] Fixing PHP warning in the ObjectNormalizer with MaxDepth enabled
  bug #51578 [Cache] always select database for persistent redis connections
  [Security] Validate that CSRF token in form login is string similar to username/password
  [Serializer] Use explicit nullable type
  [validator] validated Dutch translation
  Improve dutch translations
  initialize the current time with midnight before modifying the date
  [Translation] Skip state=needs-translation entries only when source == target
  [HttpKernel] Ensure controllers are not lazy
  [Validator] Fill in trans-unit id 113: This URL does not contain a TLD.
  [Validator] added missing Polish translation for unit 113
  [Validator] add missing lv translation
  fix tests
  [HttpClient] Let curl handle transfer encoding
  ...

Author: xabbuh

Loader/XliffFileLoader.php

@@ -112,16 +112,20 @@ private function extractXliff1(\DOMDocument $dom, MessageCatalogue $catalogue, s
                     continue;
                 }
 
-                if (isset($translation->target) && 'needs-translation' === (string) $translation->target->attributes()['state']) {
+                $source = (string) (isset($attributes['resname']) && $attributes['resname'] ? $attributes['resname'] : $translation->source);
+
+                if (isset($translation->target)
+                    && 'needs-translation' === (string) $translation->target->attributes()['state']
+                    && \in_array((string) $translation->target, [$source, (string) $translation->source], true)
+                ) {
                     continue;
                 }
 
-                $source = isset($attributes['resname']) && $attributes['resname'] ? $attributes['resname'] : $translation->source;
                 // If the xlf file has another encoding specified, try to convert it because
                 // simple_xml will always return utf-8 encoded values
                 $target = $this->utf8ToCharset((string) ($translation->target ?? $translation->source), $encoding);
 
-                $catalogue->set((string) $source, $target, $domain);
+                $catalogue->set($source, $target, $domain);
 
                 $metadata = [
                     'source' => (string) $translation->source,
@@ -144,7 +148,7 @@ private function extractXliff1(\DOMDocument $dom, MessageCatalogue $catalogue, s
                     $metadata['id'] = (string) $attributes['id'];
                 }
 
-                $catalogue->setMetadata((string) $source, $metadata, $domain);
+                $catalogue->setMetadata($source, $metadata, $domain);
             }
         }
     }

Resources/bin/translation-status.php

@@ -166,7 +166,7 @@ function extractTranslationKeys($filePath): array
 
     foreach ($contents->file->body->{'trans-unit'} as $translationKey) {
         $translationId = (string) $translationKey['id'];
-        $translationKey = (string) $translationKey->source;
+        $translationKey = (string) ($translationKey['resname'] ?? $translationKey->source);
 
         $translationKeys[$translationId] = $translationKey;
     }

Tests/Loader/XliffFileLoaderTest.php

@@ -52,9 +52,17 @@ public function testLoadRawXliff()
       </trans-unit>
       <trans-unit id="4">
         <source>test</source>
-        <target>with</target>
+        <target state="needs-translation">with</target>
         <note>note</note>
       </trans-unit>
+      <trans-unit id="5">
+        <source>baz</source>
+        <target state="needs-translation">baz</target>
+      </trans-unit>
+      <trans-unit id="6" resname="buz">
+        <source>baz</source>
+        <target state="needs-translation">buz</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>
@@ -65,6 +73,7 @@ public function testLoadRawXliff()
         $this->assertEquals('en', $catalogue->getLocale());
         $this->assertSame([], libxml_get_errors());
         $this->assertContainsOnly('string', $catalogue->all('domain1'));
+        $this->assertSame(['foo', 'extra', 'key', 'test'], array_keys($catalogue->all('domain1')));
     }
 
     public function testLoadWithInternalErrorsEnabled()