Merge branch '2.3' into 2.7
* 2.3: [Process] Fix potential race condition typo [FrameworkBundle] Set the kernel.name properly after a cache warmup Removed spaces before semicolon
This commit is contained in:
commit
6cd79e92f6
@ -158,9 +158,18 @@ EOF
|
|||||||
}
|
}
|
||||||
|
|
||||||
// fix references to kernel/container related classes
|
// fix references to kernel/container related classes
|
||||||
$search = $tempKernel->getName().ucfirst($tempKernel->getEnvironment());
|
$fileSearch = $tempKernel->getName().ucfirst($tempKernel->getEnvironment()).'*';
|
||||||
$replace = $realKernel->getName().ucfirst($realKernel->getEnvironment());
|
$search = array(
|
||||||
foreach (Finder::create()->files()->name($search.'*')->in($warmupDir) as $file) {
|
$tempKernel->getName().ucfirst($tempKernel->getEnvironment()),
|
||||||
|
sprintf('\'kernel.name\' => \'%s\'', $tempKernel->getName()),
|
||||||
|
sprintf('key="kernel.name">%s<', $tempKernel->getName()),
|
||||||
|
);
|
||||||
|
$replace = array(
|
||||||
|
$realKernel->getName().ucfirst($realKernel->getEnvironment()),
|
||||||
|
sprintf('\'kernel.name\' => \'%s\'', $realKernel->getName()),
|
||||||
|
sprintf('key="kernel.name">%s<', $realKernel->getName()),
|
||||||
|
);
|
||||||
|
foreach (Finder::create()->files()->name($fileSearch)->in($warmupDir) as $file) {
|
||||||
$content = str_replace($search, $replace, file_get_contents($file));
|
$content = str_replace($search, $replace, file_get_contents($file));
|
||||||
file_put_contents(str_replace($search, $replace, $file), $content);
|
file_put_contents(str_replace($search, $replace, $file), $content);
|
||||||
unlink($file);
|
unlink($file);
|
||||||
|
@ -83,5 +83,6 @@ class CacheClearCommandTest extends TestCase
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
$this->assertTrue($found, 'Kernel file should present as resource');
|
$this->assertTrue($found, 'Kernel file should present as resource');
|
||||||
|
$this->assertRegExp(sprintf('/\'kernel.name\'\s*=>\s*\'%s\'/', $this->kernel->getName()), file_get_contents($containerFile), 'kernel.name is properly set on the dumped container');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -98,7 +98,7 @@
|
|||||||
|
|
||||||
if (clazz) {
|
if (clazz) {
|
||||||
var tags = document.getElementsByTagName('*');
|
var tags = document.getElementsByTagName('*');
|
||||||
for (i = tags.length - 1; i >= 0 ; i--) {
|
for (i = tags.length - 1; i >= 0; i--) {
|
||||||
if (tags[i].className === clazz) {
|
if (tags[i].className === clazz) {
|
||||||
tags[i].style.display = 'none';
|
tags[i].style.display = 'none';
|
||||||
}
|
}
|
||||||
|
@ -458,7 +458,7 @@ class DialogHelper extends InputAwareHelper
|
|||||||
* @param callable $interviewer A callable that will ask for a question and return the result
|
* @param callable $interviewer A callable that will ask for a question and return the result
|
||||||
* @param OutputInterface $output An Output instance
|
* @param OutputInterface $output An Output instance
|
||||||
* @param callable $validator A PHP callback
|
* @param callable $validator A PHP callback
|
||||||
* @param int|false $attempts Max number of times to ask before giving up ; false will ask infinitely
|
* @param int|false $attempts Max number of times to ask before giving up; false will ask infinitely
|
||||||
*
|
*
|
||||||
* @return string The validated response
|
* @return string The validated response
|
||||||
*
|
*
|
||||||
|
@ -215,7 +215,7 @@ class RequestTest extends \PHPUnit_Framework_TestCase
|
|||||||
$this->assertEquals('/?foo', $request->getRequestUri());
|
$this->assertEquals('/?foo', $request->getRequestUri());
|
||||||
$this->assertEquals(array('foo' => ''), $request->query->all());
|
$this->assertEquals(array('foo' => ''), $request->query->all());
|
||||||
|
|
||||||
// assume rewrite rule: (.*) --> app/app.php ; app/ is a symlink to a symfony web/ directory
|
// assume rewrite rule: (.*) --> app/app.php; app/ is a symlink to a symfony web/ directory
|
||||||
$request = Request::create('http://test.com/apparthotel-1234', 'GET', array(), array(), array(),
|
$request = Request::create('http://test.com/apparthotel-1234', 'GET', array(), array(), array(),
|
||||||
array(
|
array(
|
||||||
'DOCUMENT_ROOT' => '/var/www/www.test.com',
|
'DOCUMENT_ROOT' => '/var/www/www.test.com',
|
||||||
|
@ -306,7 +306,7 @@ class Locale
|
|||||||
*
|
*
|
||||||
* @return bool true on success or false on failure
|
* @return bool true on success or false on failure
|
||||||
*
|
*
|
||||||
* @see http://www.php.net/manual/en/locale.parselocale.php
|
* @see http://www.php.net/manual/en/locale.setdefault.php
|
||||||
*
|
*
|
||||||
* @throws MethodNotImplementedException
|
* @throws MethodNotImplementedException
|
||||||
*/
|
*/
|
||||||
|
@ -780,8 +780,12 @@ class Process
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->updateStatus(false);
|
if ($this->isRunning()) {
|
||||||
if ($this->processInformation['running']) {
|
if (isset($this->fallbackStatus['pid'])) {
|
||||||
|
unset($this->fallbackStatus['pid']);
|
||||||
|
|
||||||
|
return $this->stop(0, $signal);
|
||||||
|
}
|
||||||
$this->close();
|
$this->close();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1412,7 +1416,7 @@ class Process
|
|||||||
*/
|
*/
|
||||||
private function doSignal($signal, $throwException)
|
private function doSignal($signal, $throwException)
|
||||||
{
|
{
|
||||||
if (!$this->isRunning()) {
|
if (null === $pid = $this->getPid()) {
|
||||||
if ($throwException) {
|
if ($throwException) {
|
||||||
throw new LogicException('Can not send signal on a non running process.');
|
throw new LogicException('Can not send signal on a non running process.');
|
||||||
}
|
}
|
||||||
@ -1421,7 +1425,7 @@ class Process
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ('\\' === DIRECTORY_SEPARATOR) {
|
if ('\\' === DIRECTORY_SEPARATOR) {
|
||||||
exec(sprintf('taskkill /F /T /PID %d 2>&1', $this->getPid()), $output, $exitCode);
|
exec(sprintf('taskkill /F /T /PID %d 2>&1', $pid), $output, $exitCode);
|
||||||
if ($exitCode && $this->isRunning()) {
|
if ($exitCode && $this->isRunning()) {
|
||||||
if ($throwException) {
|
if ($throwException) {
|
||||||
throw new RuntimeException(sprintf('Unable to kill the process (%s).', implode(' ', $output)));
|
throw new RuntimeException(sprintf('Unable to kill the process (%s).', implode(' ', $output)));
|
||||||
@ -1433,8 +1437,8 @@ class Process
|
|||||||
if (!$this->enhanceSigchildCompatibility || !$this->isSigchildEnabled()) {
|
if (!$this->enhanceSigchildCompatibility || !$this->isSigchildEnabled()) {
|
||||||
$ok = @proc_terminate($this->process, $signal);
|
$ok = @proc_terminate($this->process, $signal);
|
||||||
} elseif (function_exists('posix_kill')) {
|
} elseif (function_exists('posix_kill')) {
|
||||||
$ok = @posix_kill($this->getPid(), $signal);
|
$ok = @posix_kill($pid, $signal);
|
||||||
} elseif ($ok = proc_open(sprintf('kill -%d %d', $signal, $this->getPid()), array(2 => array('pipe', 'w')), $pipes)) {
|
} elseif ($ok = proc_open(sprintf('kill -%d %d', $signal, $pid), array(2 => array('pipe', 'w')), $pipes)) {
|
||||||
$ok = false === fgets($pipes[2]);
|
$ok = false === fgets($pipes[2]);
|
||||||
}
|
}
|
||||||
if (!$ok) {
|
if (!$ok) {
|
||||||
|
@ -787,22 +787,16 @@ class ProcessTest extends \PHPUnit_Framework_TestCase
|
|||||||
*/
|
*/
|
||||||
public function testRunProcessWithTimeout()
|
public function testRunProcessWithTimeout()
|
||||||
{
|
{
|
||||||
$timeout = 0.1;
|
$process = $this->getProcess(self::$phpBin.' -r "sleep(30);"');
|
||||||
$process = $this->getProcess(self::$phpBin.' -r "sleep(1);"');
|
$process->setTimeout(0.1);
|
||||||
$process->setTimeout($timeout);
|
|
||||||
$start = microtime(true);
|
$start = microtime(true);
|
||||||
try {
|
try {
|
||||||
$process->run();
|
$process->run();
|
||||||
$this->fail('A RuntimeException should have been raised');
|
$this->fail('A RuntimeException should have been raised');
|
||||||
} catch (RuntimeException $e) {
|
} catch (RuntimeException $e) {
|
||||||
}
|
}
|
||||||
$duration = microtime(true) - $start;
|
|
||||||
|
|
||||||
if ('\\' !== DIRECTORY_SEPARATOR) {
|
$this->assertLessThan(15, microtime(true) - $start);
|
||||||
// On Windows, timers are too transient
|
|
||||||
$maxDuration = $timeout + 2 * Process::TIMEOUT_PRECISION;
|
|
||||||
$this->assertLessThan($maxDuration, $duration);
|
|
||||||
}
|
|
||||||
|
|
||||||
throw $e;
|
throw $e;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user