Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2421133 by penyaskito: Undefined variables in core/modules/locale/src/StringBase.php

8.0.x
Alex Pott 2015-02-10 15:58:11 +00:00
parent 29c7efa1df
commit 2524d8d5ba
2 changed files with 45 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/modules/locale/src/StringBase.php
View File

@ -7,6 +7,8 @@
namespace Drupal\locale;
use Drupal\Component\Utility\String;
/**
* Defines the locale string base class.
*
@ -188,8 +190,8 @@ abstract class StringBase implements StringInterface {
$storage->save($this);
}
else {
throw new StringStorageException(format_string('The string cannot be saved because its not bound to a storage: @string', array(
'@string' => $string->getString(),
throw new StringStorageException(String::format('The string cannot be saved because its not bound to a storage: @string', array(
'@string' => $this->getString(),
)));
}
return $this;
@ -204,8 +206,8 @@ abstract class StringBase implements StringInterface {
$storage->delete($this);
}
else {
throw new StringStorageException(format_string('The string cannot be deleted because its not bound to a storage: @string', array(
'@string' => $string->getString(),
throw new StringStorageException(String::format('The string cannot be deleted because its not bound to a storage: @string', array(
'@string' => $this->getString(),
)));
}
}

39
core/modules/locale/tests/src/Unit/StringBaseTest.php Normal file
View File

@ -0,0 +1,39 @@
<?php
/**
* @file
* Contains \Drupal\Tests\locale\Unit\StringBaseTest.
*/
namespace Drupal\Tests\locale\Unit;
use Drupal\locale\SourceString;
use Drupal\Tests\UnitTestCase;
/**
* @coversDefaultClass \Drupal\locale\StringBase
* @group locale
*/
class StringBaseTest extends UnitTestCase {
/**
* @covers ::save
* @expectedException \Drupal\locale\StringStorageException
* @expectedExceptionMessage The string cannot be saved because its not bound to a storage: test
*/
public function testSaveWithoutStorage() {
$string = new SourceString(['source' => 'test']);
$string->save();
}
/**
* @covers ::delete
* @expectedException \Drupal\locale\StringStorageException
* @expectedExceptionMessage The string cannot be deleted because its not bound to a storage: test
*/
public function testDeleteWithoutStorage() {
$string = new SourceString(['lid' => 1, 'source' => 'test']);
$string->delete();
}
}