Merge branch '4.3' into 4.4
* 4.3: [Form] fix return type on FormDataCollector [Cache][DI] cleanup
This commit is contained in:
commit
1aa41ed918
@ -13,7 +13,6 @@ namespace Symfony\Component\Cache\Tests\Adapter;
|
|||||||
|
|
||||||
use Cache\IntegrationTests\CachePoolTest;
|
use Cache\IntegrationTests\CachePoolTest;
|
||||||
use PHPUnit\Framework\Assert;
|
use PHPUnit\Framework\Assert;
|
||||||
use PHPUnit\Framework\Warning;
|
|
||||||
use Psr\Cache\CacheItemInterface;
|
use Psr\Cache\CacheItemInterface;
|
||||||
use Psr\Cache\CacheItemPoolInterface;
|
use Psr\Cache\CacheItemPoolInterface;
|
||||||
use Symfony\Component\Cache\CacheItem;
|
use Symfony\Component\Cache\CacheItem;
|
||||||
|
@ -12,7 +12,6 @@
|
|||||||
namespace Symfony\Component\DependencyInjection\Tests\Compiler;
|
namespace Symfony\Component\DependencyInjection\Tests\Compiler;
|
||||||
|
|
||||||
use PHPUnit\Framework\TestCase;
|
use PHPUnit\Framework\TestCase;
|
||||||
use PHPUnit\Framework\Warning;
|
|
||||||
use Symfony\Component\DependencyInjection\Argument\BoundArgument;
|
use Symfony\Component\DependencyInjection\Argument\BoundArgument;
|
||||||
use Symfony\Component\DependencyInjection\Compiler\AutowireRequiredMethodsPass;
|
use Symfony\Component\DependencyInjection\Compiler\AutowireRequiredMethodsPass;
|
||||||
use Symfony\Component\DependencyInjection\Compiler\ResolveBindingsPass;
|
use Symfony\Component\DependencyInjection\Compiler\ResolveBindingsPass;
|
||||||
|
@ -14,6 +14,7 @@ namespace Symfony\Component\Form\Extension\DataCollector;
|
|||||||
use Symfony\Component\Form\FormInterface;
|
use Symfony\Component\Form\FormInterface;
|
||||||
use Symfony\Component\Form\FormView;
|
use Symfony\Component\Form\FormView;
|
||||||
use Symfony\Component\HttpKernel\DataCollector\DataCollectorInterface;
|
use Symfony\Component\HttpKernel\DataCollector\DataCollectorInterface;
|
||||||
|
use Symfony\Component\VarDumper\Cloner\Data;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Collects and structures information about forms.
|
* Collects and structures information about forms.
|
||||||
@ -78,7 +79,7 @@ interface FormDataCollectorInterface extends DataCollectorInterface
|
|||||||
/**
|
/**
|
||||||
* Returns all collected data.
|
* Returns all collected data.
|
||||||
*
|
*
|
||||||
* @return array
|
* @return array|Data
|
||||||
*/
|
*/
|
||||||
public function getData();
|
public function getData();
|
||||||
}
|
}
|
||||||
|
@ -28,6 +28,9 @@ use Symfony\Component\VarDumper\Cloner\VarCloner;
|
|||||||
*/
|
*/
|
||||||
abstract class DataCollector implements DataCollectorInterface
|
abstract class DataCollector implements DataCollectorInterface
|
||||||
{
|
{
|
||||||
|
/**
|
||||||
|
* @var array|Data
|
||||||
|
*/
|
||||||
protected $data = [];
|
protected $data = [];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Reference in New Issue
Block a user