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

Merge branch '2.3' into 2.7

Browse Source 
* 2.3:
  fixed CS
  [FrameworkBundle] Fix precedence of xdebug.file_link_format
This commit is contained in:
Fabien Potencier 2015-08-24 08:37:42 +02:00
commit ce93f61437
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
View File

@ -471,14 +471,17 @@ class FrameworkExtension extends Extension
{
$loader->load('templating.xml');
$links = array(
'textmate' => 'txmt://open?url=file://%%f&line=%%l',
'macvim' => 'mvim://open?url=file://%%f&line=%%l',
'emacs' => 'emacs://open?url=file://%%f&line=%%l',
'sublime' => 'subl://open?url=file://%%f&line=%%l',
);
if (!$container->hasParameter('templating.helper.code.file_link_format')) {
$links = array(
'textmate' => 'txmt://open?url=file://%%f&line=%%l',
'macvim' => 'mvim://open?url=file://%%f&line=%%l',
'emacs' => 'emacs://open?url=file://%%f&line=%%l',
'sublime' => 'subl://open?url=file://%%f&line=%%l',
);
$container->setParameter('templating.helper.code.file_link_format', ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format') ?: (isset($links[$ide]) ? $links[$ide] : $ide));
}
$container->setParameter('templating.helper.code.file_link_format', isset($links[$ide]) ? $links[$ide] : $ide);
$container->setParameter('fragment.renderer.hinclude.global_template', $config['hinclude_default_template']);
if ($container->getParameter('kernel.debug')) {

2
src/Symfony/Component/Finder/Tests/Shell/CommandTest.php
View File

@ -133,7 +133,7 @@ class CommandTest extends \PHPUnit_Framework_TestCase
public function testErrorHandler()
{
$cmd = Command::create();
$handler = function() { return 'error-handler'; };
$handler = function () { return 'error-handler'; };
$cmd->setErrorHandler($handler);
$this->assertSame($handler, $cmd->getErrorHandler());

2
src/Symfony/Component/HttpFoundation/Request.php
View File

@ -1577,7 +1577,7 @@ class Request
// Content passed in parameter (test)
if (is_string($this->content)) {
$resource = fopen('php://temp','r+');
$resource = fopen('php://temp', 'r+');
fwrite($resource, $this->content);
rewind($resource);

2
src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
View File

@ -980,7 +980,7 @@ class RequestTest extends \PHPUnit_Framework_TestCase
public function testContentAsResource()
{
$resource = fopen('php://memory','r+');
$resource = fopen('php://memory', 'r+');
fwrite($resource, 'My other content');
rewind($resource);