Skip to content

Commit c08ce2d

Browse files
Merge branch '3.0' into 3.1
* 3.0: [Console] Application update PHPDoc of add and register methods [Config] Extra tests for Config component Fixed bugs in names of classes and methods. [DoctrineBridge] Fixed php doc [FrameworkBundle] Fixed parameters number mismatch declaration [BrowserKit] Added test for followRedirect method (POST method) Fix the money form type render with Bootstrap3 [BrowserKit] Uppercase the "GET" method in redirects [DomCrawler] Inherit the namespace cache in subcrawlers [WebProfilerBundle] Fixed JSDoc parameter definition [HttpFoundation] HttpCache refresh stale responses containing an ETag
2 parents e34e518 + 443ab00 commit c08ce2d

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

Command/AbstractConfigCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ protected function listBundles($output)
4747
} else {
4848
$output->writeln($title);
4949
$table = new Table($output);
50-
$table->setHeaders($headers)->setRows($rows)->render($output);
50+
$table->setHeaders($headers)->setRows($rows)->render();
5151
}
5252
}
5353

DependencyInjection/FrameworkExtension.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -822,10 +822,10 @@ private function getValidatorMappingFiles(ContainerBuilder $container)
822822

823823
if (is_dir($dir = $dirname.'/Resources/config/validation')) {
824824
foreach (Finder::create()->files()->in($dir)->name('*.xml') as $file) {
825-
$files[0][] = $file->getRealpath();
825+
$files[0][] = $file->getRealPath();
826826
}
827827
foreach (Finder::create()->files()->in($dir)->name('*.yml') as $file) {
828-
$files[1][] = $file->getRealpath();
828+
$files[1][] = $file->getRealPath();
829829
}
830830

831831
$container->addResource(new DirectoryResource($dir));
@@ -965,13 +965,13 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
965965

966966
if (is_dir($dir = $dirname.'/Resources/config/serialization')) {
967967
foreach (Finder::create()->files()->in($dir)->name('*.xml') as $file) {
968-
$definition = new Definition('Symfony\Component\Serializer\Mapping\Loader\XmlFileLoader', array($file->getRealpath()));
968+
$definition = new Definition('Symfony\Component\Serializer\Mapping\Loader\XmlFileLoader', array($file->getRealPath()));
969969
$definition->setPublic(false);
970970

971971
$serializerLoaders[] = $definition;
972972
}
973973
foreach (Finder::create()->files()->in($dir)->name('*.yml') as $file) {
974-
$definition = new Definition('Symfony\Component\Serializer\Mapping\Loader\YamlFileLoader', array($file->getRealpath()));
974+
$definition = new Definition('Symfony\Component\Serializer\Mapping\Loader\YamlFileLoader', array($file->getRealPath()));
975975
$definition->setPublic(false);
976976

977977
$serializerLoaders[] = $definition;

Tests/Templating/DelegatingEngineTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public function testGetExistingEngine()
3838

3939
$delegatingEngine = new DelegatingEngine($container, array('engine.first', 'engine.second'));
4040

41-
$this->assertSame($secondEngine, $delegatingEngine->getEngine('template.php', array('foo' => 'bar')));
41+
$this->assertSame($secondEngine, $delegatingEngine->getEngine('template.php'));
4242
}
4343

4444
/**
@@ -55,7 +55,7 @@ public function testGetInvalidEngine()
5555
));
5656

5757
$delegatingEngine = new DelegatingEngine($container, array('engine.first', 'engine.second'));
58-
$delegatingEngine->getEngine('template.php', array('foo' => 'bar'));
58+
$delegatingEngine->getEngine('template.php');
5959
}
6060

6161
public function testRenderResponseWithFrameworkEngine()

Translation/TranslationLoader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public function loadMessages($directory, MessageCatalogue $catalogue)
5858
$extension = $catalogue->getLocale().'.'.$format;
5959
$files = $finder->files()->name('*.'.$extension)->in($directory);
6060
foreach ($files as $file) {
61-
$domain = substr($file->getFileName(), 0, -1 * strlen($extension) - 1);
61+
$domain = substr($file->getFilename(), 0, -1 * strlen($extension) - 1);
6262
$catalogue->addCatalogue($loader->load($file->getPathname(), $catalogue->getLocale(), $domain));
6363
}
6464
}

0 commit comments

Comments
 (0)