fixed CS
This commit is contained in:
parent
9d77078d3d
commit
30cd43c68a
@ -84,16 +84,9 @@ EOF
|
|||||||
->locateResource('@FrameworkBundle/Resources/config/router.php')
|
->locateResource('@FrameworkBundle/Resources/config/router.php')
|
||||||
;
|
;
|
||||||
|
|
||||||
$builder = new ProcessBuilder(array(
|
$builder = new ProcessBuilder(array(PHP_BINARY, '-S', $input->getArgument('address'), $router));
|
||||||
PHP_BINARY,
|
|
||||||
'-S',
|
|
||||||
$input->getArgument('address'),
|
|
||||||
$router
|
|
||||||
));
|
|
||||||
|
|
||||||
$builder->setWorkingDirectory($input->getOption('docroot'));
|
$builder->setWorkingDirectory($input->getOption('docroot'));
|
||||||
$builder->setTimeout(null);
|
$builder->setTimeout(null);
|
||||||
|
|
||||||
$builder->getProcess()->run(function ($type, $buffer) use ($output) {
|
$builder->getProcess()->run(function ($type, $buffer) use ($output) {
|
||||||
$output->write($buffer);
|
$output->write($buffer);
|
||||||
});
|
});
|
||||||
|
@ -22,11 +22,8 @@
|
|||||||
|
|
||||||
if (isset($_SERVER['SCRIPT_FILENAME'])) {
|
if (isset($_SERVER['SCRIPT_FILENAME'])) {
|
||||||
return false;
|
return false;
|
||||||
} else {
|
|
||||||
$_SERVER['SCRIPT_FILENAME'] = $_SERVER['DOCUMENT_ROOT']
|
|
||||||
. DIRECTORY_SEPARATOR
|
|
||||||
. 'app.php'
|
|
||||||
;
|
|
||||||
|
|
||||||
require 'app.php';
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$_SERVER['SCRIPT_FILENAME'] = $_SERVER['DOCUMENT_ROOT'].DIRECTORY_SEPARATOR.'app.php';
|
||||||
|
|
||||||
|
require 'app.php';
|
||||||
|
@ -94,7 +94,7 @@ class JsonResponse extends Response
|
|||||||
if ($this->callback) {
|
if ($this->callback) {
|
||||||
// Not using application/javascript for compatibility reasons with older browsers.
|
// Not using application/javascript for compatibility reasons with older browsers.
|
||||||
$this->headers->set('Content-Type', 'text/javascript', true);
|
$this->headers->set('Content-Type', 'text/javascript', true);
|
||||||
|
|
||||||
return $this->setContent(sprintf('%s(%s);', $this->callback, $this->data));
|
return $this->setContent(sprintf('%s(%s);', $this->callback, $this->data));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -31,4 +31,4 @@ class NativeRedisSessionHandlerTest extends \PHPUnit_Framework_TestCase
|
|||||||
$this->assertEquals('tcp://127.0.0.1:6379?persistent=0', ini_get('session.save_path'));
|
$this->assertEquals('tcp://127.0.0.1:6379?persistent=0', ini_get('session.save_path'));
|
||||||
$this->assertEquals('TESTING', ini_get('session.name'));
|
$this->assertEquals('TESTING', ini_get('session.name'));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user