This commit is contained in:
Fabien Potencier 2012-03-23 14:14:07 +01:00
parent 9d77078d3d
commit 30cd43c68a
4 changed files with 7 additions and 17 deletions

View File

@ -84,16 +84,9 @@ EOF
->locateResource('@FrameworkBundle/Resources/config/router.php')
;
$builder = new ProcessBuilder(array(
PHP_BINARY,
'-S',
$input->getArgument('address'),
$router
));
$builder = new ProcessBuilder(array(PHP_BINARY, '-S', $input->getArgument('address'), $router));
$builder->setWorkingDirectory($input->getOption('docroot'));
$builder->setTimeout(null);
$builder->getProcess()->run(function ($type, $buffer) use ($output) {
$output->write($buffer);
});

View File

@ -22,11 +22,8 @@
if (isset($_SERVER['SCRIPT_FILENAME'])) {
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';

View File

@ -94,7 +94,7 @@ class JsonResponse extends Response
if ($this->callback) {
// Not using application/javascript for compatibility reasons with older browsers.
$this->headers->set('Content-Type', 'text/javascript', true);
return $this->setContent(sprintf('%s(%s);', $this->callback, $this->data));
}

View File

@ -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('TESTING', ini_get('session.name'));
}
}
}