Merge branch '2.3' into 2.7
* 2.3: fixed CS [FrameworkBundle] Fix precedence of xdebug.file_link_format
This commit is contained in:
commit
ce93f61437
@ -471,14 +471,17 @@ class FrameworkExtension extends Extension
|
|||||||
{
|
{
|
||||||
$loader->load('templating.xml');
|
$loader->load('templating.xml');
|
||||||
|
|
||||||
$links = array(
|
if (!$container->hasParameter('templating.helper.code.file_link_format')) {
|
||||||
'textmate' => 'txmt://open?url=file://%%f&line=%%l',
|
$links = array(
|
||||||
'macvim' => 'mvim://open?url=file://%%f&line=%%l',
|
'textmate' => 'txmt://open?url=file://%%f&line=%%l',
|
||||||
'emacs' => 'emacs://open?url=file://%%f&line=%%l',
|
'macvim' => 'mvim://open?url=file://%%f&line=%%l',
|
||||||
'sublime' => 'subl://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']);
|
$container->setParameter('fragment.renderer.hinclude.global_template', $config['hinclude_default_template']);
|
||||||
|
|
||||||
if ($container->getParameter('kernel.debug')) {
|
if ($container->getParameter('kernel.debug')) {
|
||||||
|
@ -133,7 +133,7 @@ class CommandTest extends \PHPUnit_Framework_TestCase
|
|||||||
public function testErrorHandler()
|
public function testErrorHandler()
|
||||||
{
|
{
|
||||||
$cmd = Command::create();
|
$cmd = Command::create();
|
||||||
$handler = function() { return 'error-handler'; };
|
$handler = function () { return 'error-handler'; };
|
||||||
$cmd->setErrorHandler($handler);
|
$cmd->setErrorHandler($handler);
|
||||||
|
|
||||||
$this->assertSame($handler, $cmd->getErrorHandler());
|
$this->assertSame($handler, $cmd->getErrorHandler());
|
||||||
|
@ -1577,7 +1577,7 @@ class Request
|
|||||||
|
|
||||||
// Content passed in parameter (test)
|
// Content passed in parameter (test)
|
||||||
if (is_string($this->content)) {
|
if (is_string($this->content)) {
|
||||||
$resource = fopen('php://temp','r+');
|
$resource = fopen('php://temp', 'r+');
|
||||||
fwrite($resource, $this->content);
|
fwrite($resource, $this->content);
|
||||||
rewind($resource);
|
rewind($resource);
|
||||||
|
|
||||||
|
@ -980,7 +980,7 @@ class RequestTest extends \PHPUnit_Framework_TestCase
|
|||||||
|
|
||||||
public function testContentAsResource()
|
public function testContentAsResource()
|
||||||
{
|
{
|
||||||
$resource = fopen('php://memory','r+');
|
$resource = fopen('php://memory', 'r+');
|
||||||
fwrite($resource, 'My other content');
|
fwrite($resource, 'My other content');
|
||||||
rewind($resource);
|
rewind($resource);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user