Skip to content

Commit e480e7b

Browse files
committed
Merge branch '2.2' into 2.3
* 2.2: [Validator] fixed ConstraintViolation:: incorrect when nested handle Optional and Required constraints from XML or YAML sources correctly added missing comments to WebTestCase Fixed #8455: PhpExecutableFinder::find() does not always return the correct binary [DependencyInjection] Fix Container::camelize to convert beginning and ending chars [Validator] Fixed groups argument misplace for validateValue method from validator class Conflicts: src/Symfony/Component/Validator/Tests/Constraints/CollectionTest.php src/Symfony/Component/Validator/Tests/GraphWalkerTest.php
2 parents 1dc74aa + 4e3d035 commit e480e7b

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

Test/WebTestCase.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
use Symfony\Bundle\FrameworkBundle\Client;
1515
use Symfony\Component\Finder\Finder;
16-
use Symfony\Component\HttpKernel\HttpKernelInterface;
16+
use Symfony\Component\HttpKernel\KernelInterface;
1717

1818
/**
1919
* WebTestCase is the base class for functional tests.
@@ -23,6 +23,10 @@
2323
abstract class WebTestCase extends \PHPUnit_Framework_TestCase
2424
{
2525
protected static $class;
26+
27+
/**
28+
* @var KernelInterface
29+
*/
2630
protected static $kernel;
2731

2832
/**
@@ -147,7 +151,7 @@ protected static function getKernelClass()
147151
*
148152
* @param array $options An array of options
149153
*
150-
* @return HttpKernelInterface A HttpKernelInterface instance
154+
* @return KernelInterface A KernelInterface instance
151155
*/
152156
protected static function createKernel(array $options = array())
153157
{

0 commit comments

Comments
 (0)