Upgrade 1-11.38

vendor/symfony/translation/Dumper/FileDumper.php

@@ -17,7 +17,6 @@ use Symfony\Component\Translation\MessageCatalogue;
 
 /**
  * FileDumper is an implementation of DumperInterface that dump a message catalogue to file(s).
- * Performs backup of already existing files.
  *
  * Options:
  * - path (mandatory): the directory where the files should be saved
@@ -33,13 +32,6 @@ abstract class FileDumper implements DumperInterface
      */
     protected $relativePathTemplate = '%domain%.%locale%.%extension%';
 
-    /**
-     * Make file backup before the dump.
-     *
-     * @var bool
-     */
-    private $backup = true;
-
     /**
      * Sets the template for the relative paths to files.
      *
@@ -54,10 +46,16 @@ abstract class FileDumper implements DumperInterface
      * Sets backup flag.
      *
      * @param bool $backup
+     *
+     * @deprecated since Symfony 4.1
      */
     public function setBackup($backup)
     {
-        $this->backup = $backup;
+        @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.1.', __METHOD__), E_USER_DEPRECATED);
+
+        if (false !== $backup) {
+            throw new \LogicException('The backup feature is no longer supported.');
+        }
     }
 
     /**
@@ -71,20 +69,33 @@ abstract class FileDumper implements DumperInterface
 
         // save a file for each domain
         foreach ($messages->getDomains() as $domain) {
-            // backup
             $fullpath = $options['path'].'/'.$this->getRelativePath($domain, $messages->getLocale());
-            if (file_exists($fullpath)) {
-                if ($this->backup) {
-                    @trigger_error('Creating a backup while dumping a message catalogue is deprecated since Symfony 3.1 and will be removed in 4.0. Use TranslationWriter::disableBackup() to disable the backup.', \E_USER_DEPRECATED);
-                    copy($fullpath, $fullpath.'~');
-                }
-            } else {
+            if (!file_exists($fullpath)) {
                 $directory = \dirname($fullpath);
                 if (!file_exists($directory) && !@mkdir($directory, 0777, true)) {
                     throw new RuntimeException(sprintf('Unable to create directory "%s".', $directory));
                 }
             }
-            // save file
+
+            $intlDomain = $domain.MessageCatalogue::INTL_DOMAIN_SUFFIX;
+            $intlMessages = $messages->all($intlDomain);
+
+            if ($intlMessages) {
+                $intlPath = $options['path'].'/'.$this->getRelativePath($intlDomain, $messages->getLocale());
+                file_put_contents($intlPath, $this->formatCatalogue($messages, $intlDomain, $options));
+
+                $messages->replace([], $intlDomain);
+
+                try {
+                    if ($messages->all($domain)) {
+                        file_put_contents($fullpath, $this->formatCatalogue($messages, $domain, $options));
+                    }
+                    continue;
+                } finally {
+                    $messages->replace($intlMessages, $intlDomain);
+                }
+            }
+
             file_put_contents($fullpath, $this->formatCatalogue($messages, $domain, $options));
         }
     }
@@ -107,13 +118,8 @@ abstract class FileDumper implements DumperInterface
 
     /**
      * Gets the relative file path using the template.
-     *
-     * @param string $domain The domain
-     * @param string $locale The locale
-     *
-     * @return string The relative file path
      */
-    private function getRelativePath($domain, $locale)
+    private function getRelativePath(string $domain, string $locale): string
     {
         return strtr($this->relativePathTemplate, [
             '%domain%' => $domain,

vendor/symfony/translation/Dumper/JsonFileDumper.php

@@ -25,11 +25,7 @@ class JsonFileDumper extends FileDumper
      */
     public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = [])
     {
-        if (isset($options['json_encoding'])) {
-            $flags = $options['json_encoding'];
-        } else {
-            $flags = \JSON_PRETTY_PRINT;
-        }
+        $flags = $options['json_encoding'] ?? JSON_PRETTY_PRINT;
 
         return json_encode($messages->all($domain), $flags);
     }

vendor/symfony/translation/Dumper/PoFileDumper.php

@@ -39,6 +39,18 @@ class PoFileDumper extends FileDumper
             } else {
                 $newLine = true;
             }
+            $metadata = $messages->getMetadata($source, $domain);
+
+            if (isset($metadata['comments'])) {
+                $output .= $this->formatComments($metadata['comments']);
+            }
+            if (isset($metadata['flags'])) {
+                $output .= $this->formatComments(implode(',', (array) $metadata['flags']), ',');
+            }
+            if (isset($metadata['sources'])) {
+                $output .= $this->formatComments(implode(' ', (array) $metadata['sources']), ':');
+            }
+
             $output .= sprintf('msgid "%s"'."\n", $this->escape($source));
             $output .= sprintf('msgstr "%s"'."\n", $this->escape($target));
         }
@@ -58,4 +70,15 @@ class PoFileDumper extends FileDumper
     {
         return addcslashes($str, "\0..\37\42\134");
     }
+
+    private function formatComments($comments, string $prefix = ''): ?string
+    {
+        $output = null;
+
+        foreach ((array) $comments as $comment) {
+            $output .= sprintf('#%s %s'."\n", $prefix, $comment);
+        }
+
+        return $output;
+    }
 }

vendor/symfony/translation/Dumper/QtFileDumper.php

@@ -33,6 +33,17 @@ class QtFileDumper extends FileDumper
 
         foreach ($messages->all($domain) as $source => $target) {
             $message = $context->appendChild($dom->createElement('message'));
+            $metadata = $messages->getMetadata($source, $domain);
+            if (isset($metadata['sources'])) {
+                foreach ((array) $metadata['sources'] as $location) {
+                    $loc = explode(':', $location, 2);
+                    $location = $message->appendChild($dom->createElement('location'));
+                    $location->setAttribute('filename', $loc[0]);
+                    if (isset($loc[1])) {
+                        $location->setAttribute('line', $loc[1]);
+                    }
+                }
+            }
             $message->appendChild($dom->createElement('source', $source));
             $message->appendChild($dom->createElement('translation', $target));
         }

vendor/symfony/translation/Dumper/XliffFileDumper.php

@@ -141,11 +141,20 @@ class XliffFileDumper extends FileDumper
         $xliff->setAttribute('trgLang', str_replace('_', '-', $messages->getLocale()));
 
         $xliffFile = $xliff->appendChild($dom->createElement('file'));
-        $xliffFile->setAttribute('id', $domain.'.'.$messages->getLocale());
+        if (MessageCatalogue::INTL_DOMAIN_SUFFIX === substr($domain, -($suffixLength = \strlen(MessageCatalogue::INTL_DOMAIN_SUFFIX)))) {
+            $xliffFile->setAttribute('id', substr($domain, 0, -$suffixLength).'.'.$messages->getLocale());
+        } else {
+            $xliffFile->setAttribute('id', $domain.'.'.$messages->getLocale());
+        }
 
         foreach ($messages->all($domain) as $source => $target) {
             $translation = $dom->createElement('unit');
             $translation->setAttribute('id', strtr(substr(base64_encode(hash('sha256', $source, true)), 0, 7), '/+', '._'));
+            $name = $source;
+            if (\strlen($source) > 80) {
+                $name = substr(md5($source), -7);
+            }
+            $translation->setAttribute('name', $name);
             $metadata = $messages->getMetadata($source, $domain);
 
             // Add notes section

vendor/symfony/translation/Dumper/YamlFileDumper.php

@@ -25,7 +25,7 @@ class YamlFileDumper extends FileDumper
 {
     private $extension;
 
-    public function __construct(/**string */$extension = 'yml')
+    public function __construct(string $extension = 'yml')
     {
         $this->extension = $extension;
     }