diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Translation] Loader should only load local files

Browse Source
This commit is contained in:
stealth35 2011-10-07 18:30:56 +02:00
parent 50c47aa687
commit ae0685a314
6 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Component/Translation/Loader/CsvFileLoader.php
View File

@ -35,6 +35,10 @@ class CsvFileLoader extends ArrayLoader implements LoaderInterface
{
$messages = array();
if (!stream_is_local($resource)) {
throw new \InvalidArgumentException(sprintf('This is not a local file "%s".', $resource));
}
try {
$file = new \SplFileObject($resource, 'rb');
} catch(\RuntimeException $e) {

4
src/Symfony/Component/Translation/Loader/PhpFileLoader.php
View File

@ -29,6 +29,10 @@ class PhpFileLoader extends ArrayLoader implements LoaderInterface
*/
public function load($resource, $locale, $domain = 'messages')
{
if (!stream_is_local($resource)) {
throw new \InvalidArgumentException(sprintf('This is not a local file "%s".', $resource));
}
$messages = require($resource);
$catalogue = parent::load($messages, $locale, $domain);

4
src/Symfony/Component/Translation/Loader/XliffFileLoader.php
View File

@ -30,6 +30,10 @@ class XliffFileLoader implements LoaderInterface
*/
public function load($resource, $locale, $domain = 'messages')
{
if (!stream_is_local($resource)) {
throw new \InvalidArgumentException(sprintf('This is not a local file "%s".', $resource));
}
$xml = $this->parseFile($resource);
$xml->registerXPathNamespace('xliff', 'urn:oasis:names:tc:xliff:document:1.2');

10
tests/Symfony/Tests/Component/Translation/Loader/CsvFileLoaderTest.php
View File

@ -47,4 +47,14 @@ class CsvFileLoaderTest extends \PHPUnit_Framework_TestCase
$resource = __DIR__.'/../fixtures/not-exists.csv';
$loader->load($resource, 'en', 'domain1');
}
/**
* @expectedException \InvalidArgumentException
*/
public function testLoadThrowsAnExceptionIfFileNotLocal()
{
$loader = new CsvFileLoader();
$resource = 'http://example.com/resources.csv';
$loader->load($resource, 'en', 'domain1');
}
}

10
tests/Symfony/Tests/Component/Translation/Loader/PhpFileLoaderTest.php
View File

@ -26,4 +26,14 @@ class PhpFileLoaderTest extends \PHPUnit_Framework_TestCase
$this->assertEquals('en', $catalogue->getLocale());
$this->assertEquals(array(new FileResource($resource)), $catalogue->getResources());
}
/**
* @expectedException \InvalidArgumentException
*/
public function testLoadThrowsAnExceptionIfFileNotLocal()
{
$loader = new PhpFileLoader();
$resource = 'http://example.com/resources.php';
$loader->load($resource, 'en', 'domain1');
}
}

10
tests/Symfony/Tests/Component/Translation/Loader/XliffFileLoaderTest.php
View File

@ -44,4 +44,14 @@ class XliffFileLoaderTest extends \PHPUnit_Framework_TestCase
$loader = new XliffFileLoader();
$catalogue = $loader->load(__DIR__.'/../fixtures/non-valid.xliff', 'en', 'domain1');
}
/**
* @expectedException \InvalidArgumentException
*/
public function testLoadThrowsAnExceptionIfFileNotLocal()
{
$loader = new XliffFileLoader();
$resource = 'http://example.com/resources.xliff';
$loader->load($resource, 'en', 'domain1');
}
}