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

Merge branch '4.4' into 5.0

Browse Source 
* 4.4:
  cs fix
This commit is contained in:
Nicolas Grekas 2020-02-04 11:22:04 +01:00
commit 6b18e7007a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Deprecation.php
View File

@ -247,7 +247,7 @@ class Deprecation
foreach (get_declared_classes() as $class) { foreach (get_declared_classes() as $class) {
if ('C' === $class[0] && 0 === strpos($class, 'ComposerAutoloaderInit')) { if ('C' === $class[0] && 0 === strpos($class, 'ComposerAutoloaderInit')) {
$r = new \ReflectionClass($class); $r = new \ReflectionClass($class);
$v = \dirname($r->getFileName(), 2); $v = \dirname(\dirname($r->getFileName()));
if (file_exists($v.'/composer/installed.json')) { if (file_exists($v.'/composer/installed.json')) {
self::$vendors[] = $v; self::$vendors[] = $v;
$loader = require $v.'/autoload.php'; $loader = require $v.'/autoload.php';

8
src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php
View File

@ -109,7 +109,7 @@ class TranslatorTest extends TestCase
public function testLoadResourcesWithoutCaching() public function testLoadResourcesWithoutCaching()
{ {
$loader = new \Symfony\Component\Translation\Loader\YamlFileLoader(); $loader = new YamlFileLoader();
$resourceFiles = [ $resourceFiles = [
'fr' => [ 'fr' => [
__DIR__.'/../Fixtures/Resources/translations/messages.fr.yml', __DIR__.'/../Fixtures/Resources/translations/messages.fr.yml',
@ -186,7 +186,7 @@ class TranslatorTest extends TestCase
public function testCatalogResourcesAreAddedForScannedDirectories() public function testCatalogResourcesAreAddedForScannedDirectories()
{ {
$loader = new \Symfony\Component\Translation\Loader\YamlFileLoader(); $loader = new YamlFileLoader();
$resourceFiles = [ $resourceFiles = [
'fr' => [ 'fr' => [
__DIR__.'/../Fixtures/Resources/translations/messages.fr.yml', __DIR__.'/../Fixtures/Resources/translations/messages.fr.yml',
@ -348,7 +348,7 @@ class TranslatorTest extends TestCase
public function testWarmup() public function testWarmup()
{ {
$loader = new \Symfony\Component\Translation\Loader\YamlFileLoader(); $loader = new YamlFileLoader();
$resourceFiles = [ $resourceFiles = [
'fr' => [ 'fr' => [
__DIR__.'/../Fixtures/Resources/translations/messages.fr.yml', __DIR__.'/../Fixtures/Resources/translations/messages.fr.yml',
@ -373,7 +373,7 @@ class TranslatorTest extends TestCase
public function testLoadingTranslationFilesWithDotsInMessageDomain() public function testLoadingTranslationFilesWithDotsInMessageDomain()
{ {
$loader = new \Symfony\Component\Translation\Loader\YamlFileLoader(); $loader = new YamlFileLoader();
$resourceFiles = [ $resourceFiles = [
'en' => [ 'en' => [
__DIR__.'/../Fixtures/Resources/translations/domain.with.dots.en.yml', __DIR__.'/../Fixtures/Resources/translations/domain.with.dots.en.yml',