Issue #2842942 by alexpott: Fix tempnam() usage in PHP7.1
parent
6b34291332
commit
8872b0dd1a
|
@ -648,7 +648,7 @@ class ConfigTranslationUiTest extends WebTestBase {
|
||||||
|
|
||||||
foreach ($languages as $langcode => $data) {
|
foreach ($languages as $langcode => $data) {
|
||||||
// Import a .po file to add a new language with a given number of plural forms
|
// Import a .po file to add a new language with a given number of plural forms
|
||||||
$name = tempnam('temporary://', $langcode . '_') . '.po';
|
$name = \Drupal::service('file_system')->tempnam('temporary://', $langcode . '_') . '.po';
|
||||||
file_put_contents($name, $this->getPoFile($data['plurals']));
|
file_put_contents($name, $this->getPoFile($data['plurals']));
|
||||||
$this->drupalPostForm('admin/config/regional/translate/import', array(
|
$this->drupalPostForm('admin/config/regional/translate/import', array(
|
||||||
'langcode' => $langcode,
|
'langcode' => $langcode,
|
||||||
|
@ -684,7 +684,7 @@ class ConfigTranslationUiTest extends WebTestBase {
|
||||||
|
|
||||||
// First import a .po file with multiple plural forms.
|
// First import a .po file with multiple plural forms.
|
||||||
// This will also automatically add the 'sl' language.
|
// This will also automatically add the 'sl' language.
|
||||||
$name = tempnam('temporary://', "sl_") . '.po';
|
$name = \Drupal::service('file_system')->tempnam('temporary://', "sl_") . '.po';
|
||||||
file_put_contents($name, $this->getPoFile(4));
|
file_put_contents($name, $this->getPoFile(4));
|
||||||
$this->drupalPostForm('admin/config/regional/translate/import', array(
|
$this->drupalPostForm('admin/config/regional/translate/import', array(
|
||||||
'langcode' => 'sl',
|
'langcode' => 'sl',
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
namespace Drupal\locale\Form;
|
namespace Drupal\locale\Form;
|
||||||
|
|
||||||
use Drupal\Component\Gettext\PoStreamWriter;
|
use Drupal\Component\Gettext\PoStreamWriter;
|
||||||
|
use Drupal\Core\File\FileSystemInterface;
|
||||||
use Drupal\Core\Form\FormBase;
|
use Drupal\Core\Form\FormBase;
|
||||||
use Drupal\Core\Form\FormStateInterface;
|
use Drupal\Core\Form\FormStateInterface;
|
||||||
use Drupal\Core\Language\LanguageInterface;
|
use Drupal\Core\Language\LanguageInterface;
|
||||||
|
@ -23,14 +24,24 @@ class ExportForm extends FormBase {
|
||||||
*/
|
*/
|
||||||
protected $languageManager;
|
protected $languageManager;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The file system service.
|
||||||
|
*
|
||||||
|
* @var \Drupal\Core\File\FileSystemInterface
|
||||||
|
*/
|
||||||
|
protected $fileSystem;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructs a new ExportForm.
|
* Constructs a new ExportForm.
|
||||||
*
|
*
|
||||||
* @param \Drupal\Core\Language\LanguageManagerInterface $language_manager
|
* @param \Drupal\Core\Language\LanguageManagerInterface $language_manager
|
||||||
* The language manager.
|
* The language manager.
|
||||||
|
* @param \Drupal\Core\File\FileSystemInterface $file_system
|
||||||
|
* The file system service.
|
||||||
*/
|
*/
|
||||||
public function __construct(LanguageManagerInterface $language_manager) {
|
public function __construct(LanguageManagerInterface $language_manager, FileSystemInterface $file_system) {
|
||||||
$this->languageManager = $language_manager;
|
$this->languageManager = $language_manager;
|
||||||
|
$this->fileSystem = $file_system;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -38,7 +49,8 @@ class ExportForm extends FormBase {
|
||||||
*/
|
*/
|
||||||
public static function create(ContainerInterface $container) {
|
public static function create(ContainerInterface $container) {
|
||||||
return new static(
|
return new static(
|
||||||
$container->get('language_manager')
|
$container->get('language_manager'),
|
||||||
|
$container->get('file_system')
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -147,7 +159,7 @@ class ExportForm extends FormBase {
|
||||||
|
|
||||||
$item = $reader->readItem();
|
$item = $reader->readItem();
|
||||||
if (!empty($item)) {
|
if (!empty($item)) {
|
||||||
$uri = tempnam('temporary://', 'po_');
|
$uri = $this->fileSystem->tempnam('temporary://', 'po_');
|
||||||
$header = $reader->getHeader();
|
$header = $reader->getHeader();
|
||||||
$header->setProjectName($this->config('system.site')->get('name'));
|
$header->setProjectName($this->config('system.site')->get('name'));
|
||||||
$header->setLanguageName($language_name);
|
$header->setLanguageName($language_name);
|
||||||
|
|
|
@ -43,7 +43,7 @@ class LocaleExportTest extends WebTestBase {
|
||||||
public function testExportTranslation() {
|
public function testExportTranslation() {
|
||||||
// First import some known translations.
|
// First import some known translations.
|
||||||
// This will also automatically add the 'fr' language.
|
// This will also automatically add the 'fr' language.
|
||||||
$name = tempnam('temporary://', "po_") . '.po';
|
$name = \Drupal::service('file_system')->tempnam('temporary://', "po_") . '.po';
|
||||||
file_put_contents($name, $this->getPoFile());
|
file_put_contents($name, $this->getPoFile());
|
||||||
$this->drupalPostForm('admin/config/regional/translate/import', array(
|
$this->drupalPostForm('admin/config/regional/translate/import', array(
|
||||||
'langcode' => 'fr',
|
'langcode' => 'fr',
|
||||||
|
@ -62,7 +62,7 @@ class LocaleExportTest extends WebTestBase {
|
||||||
$this->assertRaw('msgstr "lundi"', 'French translations present in exported file.');
|
$this->assertRaw('msgstr "lundi"', 'French translations present in exported file.');
|
||||||
|
|
||||||
// Import some more French translations which will be marked as customized.
|
// Import some more French translations which will be marked as customized.
|
||||||
$name = tempnam('temporary://', "po2_") . '.po';
|
$name = \Drupal::service('file_system')->tempnam('temporary://', "po2_") . '.po';
|
||||||
file_put_contents($name, $this->getCustomPoFile());
|
file_put_contents($name, $this->getCustomPoFile());
|
||||||
$this->drupalPostForm('admin/config/regional/translate/import', array(
|
$this->drupalPostForm('admin/config/regional/translate/import', array(
|
||||||
'langcode' => 'fr',
|
'langcode' => 'fr',
|
||||||
|
|
|
@ -369,7 +369,7 @@ class LocaleImportFunctionalTest extends WebTestBase {
|
||||||
* (optional) Additional options to pass to the translation import form.
|
* (optional) Additional options to pass to the translation import form.
|
||||||
*/
|
*/
|
||||||
public function importPoFile($contents, array $options = array()) {
|
public function importPoFile($contents, array $options = array()) {
|
||||||
$name = tempnam('temporary://', "po_") . '.po';
|
$name = \Drupal::service('file_system')->tempnam('temporary://', "po_") . '.po';
|
||||||
file_put_contents($name, $contents);
|
file_put_contents($name, $contents);
|
||||||
$options['files[file]'] = $name;
|
$options['files[file]'] = $name;
|
||||||
$this->drupalPostForm('admin/config/regional/translate/import', $options, t('Import'));
|
$this->drupalPostForm('admin/config/regional/translate/import', $options, t('Import'));
|
||||||
|
|
|
@ -351,7 +351,7 @@ class LocalePluralFormatTest extends WebTestBase {
|
||||||
* Additional options to pass to the translation import form.
|
* Additional options to pass to the translation import form.
|
||||||
*/
|
*/
|
||||||
public function importPoFile($contents, array $options = array()) {
|
public function importPoFile($contents, array $options = array()) {
|
||||||
$name = tempnam('temporary://', "po_") . '.po';
|
$name = \Drupal::service('file_system')->tempnam('temporary://', "po_") . '.po';
|
||||||
file_put_contents($name, $contents);
|
file_put_contents($name, $contents);
|
||||||
$options['files[file]'] = $name;
|
$options['files[file]'] = $name;
|
||||||
$this->drupalPostForm('admin/config/regional/translate/import', $options, t('Import'));
|
$this->drupalPostForm('admin/config/regional/translate/import', $options, t('Import'));
|
||||||
|
|
|
@ -209,7 +209,7 @@ class TwigTransTest extends WebTestBase {
|
||||||
$this->assertRaw('"edit-languages-' . $langcode . '-weight"', 'Language code found.');
|
$this->assertRaw('"edit-languages-' . $langcode . '-weight"', 'Language code found.');
|
||||||
|
|
||||||
// Import the custom .po contents for the language.
|
// Import the custom .po contents for the language.
|
||||||
$filename = tempnam('temporary://', "po_") . '.po';
|
$filename = \Drupal::service('file_system')->tempnam('temporary://', "po_") . '.po';
|
||||||
file_put_contents($filename, $contents);
|
file_put_contents($filename, $contents);
|
||||||
$options = array(
|
$options = array(
|
||||||
'files[file]' => $filename,
|
'files[file]' => $filename,
|
||||||
|
|
Loading…
Reference in New Issue