Skip to content

Commit 6c78cad

Browse files
committed
Merge branch '2.8'
* 2.8: added the new Composer exclude-from-classmap option added the new Composer exclude-from-classmap option fix docblock description for the build() method fix expected argument type docblock Set back libxml settings after testings. fixed Twig deprecation notices
2 parents bb83274 + 98b89a9 commit 6c78cad

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

Tests/Loader/XliffFileLoaderTest.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public function testLoad()
3030

3131
public function testLoadWithInternalErrorsEnabled()
3232
{
33-
libxml_use_internal_errors(true);
33+
$internalErrors = libxml_use_internal_errors(true);
3434

3535
$this->assertSame(array(), libxml_get_errors());
3636

@@ -41,6 +41,9 @@ public function testLoadWithInternalErrorsEnabled()
4141
$this->assertEquals('en', $catalogue->getLocale());
4242
$this->assertEquals(array(new FileResource($resource)), $catalogue->getResources());
4343
$this->assertSame(array(), libxml_get_errors());
44+
45+
libxml_clear_errors();
46+
libxml_use_internal_errors($internalErrors);
4447
}
4548

4649
public function testLoadWithResname()

composer.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,10 @@
3434
"psr/log": "To use logging capability in translator"
3535
},
3636
"autoload": {
37-
"psr-4": { "Symfony\\Component\\Translation\\": "" }
37+
"psr-4": { "Symfony\\Component\\Translation\\": "" },
38+
"exclude-from-classmap": [
39+
"/Tests/"
40+
]
3841
},
3942
"minimum-stability": "dev",
4043
"extra": {

0 commit comments

Comments
 (0)