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

Merge branch '2.3'

Browse Source 
* 2.3:
  Added sleep() workaround for windows php rename bug
  [HttpKernel] removed unused variable
  [Form] Fixed: Added "validation_groups" option to submit button
  [Process] Fix for #8754 (Timed-out processes are successful)

Conflicts:
	src/Symfony/Component/Form/Tests/Extension/Validator/Type/FormTypeValidatorExtensionTest.php
This commit is contained in:
Fabien Potencier 2013-08-15 19:09:02 +02:00
commit d15bb7351e
9 changed files with 116 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php
View File

@ -83,6 +83,9 @@ EOF
$this->warmup($warmupDir, $realCacheDir, !$input->getOption('no-optional-warmers'));
$filesystem->rename($realCacheDir, $oldCacheDir);
if (defined('PHP_WINDOWS_VERSION_BUILD')) {
sleep(1); // workaround for windows php rename bug
}
$filesystem->rename($warmupDir, $realCacheDir);
}

4
src/Symfony/Component/Form/Extension/Validator/Type/SubmitTypeValidatorExtension.php
View File

@ -11,12 +11,10 @@
namespace Symfony\Component\Form\Extension\Validator\Type;
use Symfony\Component\Form\AbstractTypeExtension;
/**
* @author Bernhard Schussek <bschussek@gmail.com>
*/
class SubmitTypeValidatorExtension extends AbstractTypeExtension
class SubmitTypeValidatorExtension extends BaseValidatorExtension
{
/**
* {@inheritdoc}

74
src/Symfony/Component/Form/Tests/Extension/Validator/Type/BaseValidatorExtensionTest.php Normal file
View File

@ -0,0 +1,74 @@
<?php
/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien@symfony.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\Tests\Extension\Validator\Type;
use Symfony\Component\Form\Test\FormInterface;
/**
* @author Bernhard Schussek <bschussek@gmail.com>
*/
abstract class BaseValidatorExtensionTest extends TypeTestCase
{
public function testValidationGroupNullByDefault()
{
$form = $this->createForm();
$this->assertNull($form->getConfig()->getOption('validation_groups'));
}
public function testValidationGroupsTransformedToArray()
{
$form = $this->createForm(array(
'validation_groups' => 'group',
));
$this->assertEquals(array('group'), $form->getConfig()->getOption('validation_groups'));
}
public function testValidationGroupsCanBeSetToArray()
{
$form = $this->createForm(array(
'validation_groups' => array('group1', 'group2'),
));
$this->assertEquals(array('group1', 'group2'), $form->getConfig()->getOption('validation_groups'));
}
public function testValidationGroupsCanBeSetToFalse()
{
$form = $this->createForm(array(
'validation_groups' => false,
));
$this->assertEquals(array(), $form->getConfig()->getOption('validation_groups'));
}
public function testValidationGroupsCanBeSetToCallback()
{
$form = $this->createForm(array(
'validation_groups' => array($this, 'testValidationGroupsCanBeSetToCallback'),
));
$this->assertTrue(is_callable($form->getConfig()->getOption('validation_groups')));
}
public function testValidationGroupsCanBeSetToClosure()
{
$form = $this->createForm(array(
'validation_groups' => function(FormInterface $form){ return null; },
));
$this->assertTrue(is_callable($form->getConfig()->getOption('validation_groups')));
}
abstract protected function createForm(array $options = array());
}

60
src/Symfony/Component/Form/Tests/Extension/Validator/Type/FormTypeValidatorExtensionTest.php
View File

@ -11,63 +11,10 @@
namespace Symfony\Component\Form\Tests\Extension\Validator\Type;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\Validator\ConstraintViolationList;
class FormTypeValidatorExtensionTest extends TypeTestCase
class FormTypeValidatorExtensionTest extends BaseValidatorExtensionTest
{
public function testValidationGroupNullByDefault()
{
$form = $this->factory->create('form');
$this->assertNull($form->getConfig()->getOption('validation_groups'));
}
public function testValidationGroupsTransformedToArray()
{
$form = $this->factory->create('form', null, array(
'validation_groups' => 'group',
));
$this->assertEquals(array('group'), $form->getConfig()->getOption('validation_groups'));
}
public function testValidationGroupsCanBeSetToArray()
{
$form = $this->factory->create('form', null, array(
'validation_groups' => array('group1', 'group2'),
));
$this->assertEquals(array('group1', 'group2'), $form->getConfig()->getOption('validation_groups'));
}
public function testValidationGroupsCanBeSetToFalse()
{
$form = $this->factory->create('form', null, array(
'validation_groups' => false,
));
$this->assertEquals(array(), $form->getConfig()->getOption('validation_groups'));
}
public function testValidationGroupsCanBeSetToCallback()
{
$form = $this->factory->create('form', null, array(
'validation_groups' => array($this, 'testValidationGroupsCanBeSetToCallback'),
));
$this->assertTrue(is_callable($form->getConfig()->getOption('validation_groups')));
}
public function testValidationGroupsCanBeSetToClosure()
{
$form = $this->factory->create('form', null, array(
'validation_groups' => function(FormInterface $form){ return null; },
));
$this->assertTrue(is_callable($form->getConfig()->getOption('validation_groups')));
}
public function testSubmitValidatesData()
{
$builder = $this->factory->createBuilder(
@ -88,4 +35,9 @@ class FormTypeValidatorExtensionTest extends TypeTestCase
// specific data is irrelevant
$form->submit(array());
}
protected function createForm(array $options = array())
{
return $this->factory->create('form', null, $options);
}
}

20
src/Symfony/Component/Form/Tests/Extension/Validator/Type/SubmitTypeValidatorExtensionTest.php Normal file
View File

@ -0,0 +1,20 @@
<?php
/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien@symfony.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\Tests\Extension\Validator\Type;
class SubmitTypeValidatorExtensionTest extends BaseValidatorExtensionTest
{
protected function createForm(array $options = array())
{
return $this->factory->create('submit', null, $options);
}
}

3
src/Symfony/Component/HttpKernel/Kernel.php
View File

@ -58,8 +58,8 @@ abstract class Kernel implements KernelInterface, TerminableInterface
protected $booted;
protected $name;
protected $startTime;
protected $classes;
protected $loadClassCache;
protected $errorReportingLevel;
const VERSION = '2.4.0-DEV';
const VERSION_ID = '20400';
@ -83,7 +83,6 @@ abstract class Kernel implements KernelInterface, TerminableInterface
$this->booted = false;
$this->rootDir = $this->getRootDir();
$this->name = $this->getName();
$this->classes = array();
$this->bundles = array();
if ($this->debug) {

4
src/Symfony/Component/Process/Process.php
View File

@ -651,9 +651,9 @@ class Process
$timeoutMicro = microtime(true) + $timeout;
if ($this->isRunning()) {
proc_terminate($this->process);
while ($this->isRunning() && microtime(true) < $timeoutMicro) {
do {
usleep(1000);
}
} while ($this->isRunning() && microtime(true) < $timeoutMicro);
if ($this->isRunning() && !$this->isSigchildEnabled()) {
if (null !== $signal || defined('SIGKILL')) {

1
src/Symfony/Component/Process/Tests/AbstractProcessTest.php
View File

@ -445,6 +445,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
$duration = microtime(true) - $start;
$this->assertLessThan($timeout + $precision, $duration);
$this->assertFalse($process->isSuccessful());
}
/**

8
src/Symfony/Component/Process/Tests/SigchildDisabledProcessTest.php
View File

@ -61,6 +61,14 @@ class SigchildDisabledProcessTest extends AbstractProcessTest
parent::testProcessWithoutTermSignal();
}
/**
* @expectedException \Symfony\Component\Process\Exception\RuntimeException
*/
public function testCheckTimeoutOnStartedProcess()
{
parent::testCheckTimeoutOnStartedProcess();
}
/**
* @expectedException \Symfony\Component\Process\Exception\RuntimeException
*/