bug #31881 [FramworkBundle][HttpKernel] fix KernelBrowser BC layer (nicolas-grekas)
This PR was merged into the 4.3 branch.
Discussion
----------
[FramworkBundle][HttpKernel] fix KernelBrowser BC layer
| Q | A
| ------------- | ---
| Branch? | 4.3
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #31762
| License | MIT
| Doc PR | -
Swap the order of inheritance to preserve BC with legacy `Client` type hints.
From #30541
Commits
-------
1a4c2548d5
[FramworkBundle][HttpKernel] fix KernelBrowser BC layer
This commit is contained in:
commit
92f333b848
@ -11,8 +11,196 @@
|
|||||||
|
|
||||||
namespace Symfony\Bundle\FrameworkBundle;
|
namespace Symfony\Bundle\FrameworkBundle;
|
||||||
|
|
||||||
@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.3, use "%s" instead.', Client::class, KernelBrowser::class), E_USER_DEPRECATED);
|
use Symfony\Component\BrowserKit\CookieJar;
|
||||||
|
use Symfony\Component\BrowserKit\History;
|
||||||
|
use Symfony\Component\DependencyInjection\ContainerInterface;
|
||||||
|
use Symfony\Component\HttpFoundation\Request;
|
||||||
|
use Symfony\Component\HttpFoundation\Response;
|
||||||
|
use Symfony\Component\HttpKernel\HttpKernelBrowser;
|
||||||
|
use Symfony\Component\HttpKernel\KernelInterface;
|
||||||
|
use Symfony\Component\HttpKernel\Profiler\Profile as HttpProfile;
|
||||||
|
|
||||||
class Client extends KernelBrowser
|
/**
|
||||||
|
* Client simulates a browser and makes requests to a Kernel object.
|
||||||
|
*
|
||||||
|
* @deprecated since Symfony 4.3, use KernelBrowser instead.
|
||||||
|
*/
|
||||||
|
class Client extends HttpKernelBrowser
|
||||||
{
|
{
|
||||||
|
private $hasPerformedRequest = false;
|
||||||
|
private $profiler = false;
|
||||||
|
private $reboot = true;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* {@inheritdoc}
|
||||||
|
*/
|
||||||
|
public function __construct(KernelInterface $kernel, array $server = [], History $history = null, CookieJar $cookieJar = null)
|
||||||
|
{
|
||||||
|
parent::__construct($kernel, $server, $history, $cookieJar);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the container.
|
||||||
|
*
|
||||||
|
* @return ContainerInterface|null Returns null when the Kernel has been shutdown or not started yet
|
||||||
|
*/
|
||||||
|
public function getContainer()
|
||||||
|
{
|
||||||
|
return $this->kernel->getContainer();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the kernel.
|
||||||
|
*
|
||||||
|
* @return KernelInterface
|
||||||
|
*/
|
||||||
|
public function getKernel()
|
||||||
|
{
|
||||||
|
return $this->kernel;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the profile associated with the current Response.
|
||||||
|
*
|
||||||
|
* @return HttpProfile|false A Profile instance
|
||||||
|
*/
|
||||||
|
public function getProfile()
|
||||||
|
{
|
||||||
|
if (!$this->kernel->getContainer()->has('profiler')) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this->kernel->getContainer()->get('profiler')->loadProfileFromResponse($this->response);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enables the profiler for the very next request.
|
||||||
|
*
|
||||||
|
* If the profiler is not enabled, the call to this method does nothing.
|
||||||
|
*/
|
||||||
|
public function enableProfiler()
|
||||||
|
{
|
||||||
|
if ($this->kernel->getContainer()->has('profiler')) {
|
||||||
|
$this->profiler = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Disables kernel reboot between requests.
|
||||||
|
*
|
||||||
|
* By default, the Client reboots the Kernel for each request. This method
|
||||||
|
* allows to keep the same kernel across requests.
|
||||||
|
*/
|
||||||
|
public function disableReboot()
|
||||||
|
{
|
||||||
|
$this->reboot = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enables kernel reboot between requests.
|
||||||
|
*/
|
||||||
|
public function enableReboot()
|
||||||
|
{
|
||||||
|
$this->reboot = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* {@inheritdoc}
|
||||||
|
*
|
||||||
|
* @param Request $request A Request instance
|
||||||
|
*
|
||||||
|
* @return Response A Response instance
|
||||||
|
*/
|
||||||
|
protected function doRequest($request)
|
||||||
|
{
|
||||||
|
// avoid shutting down the Kernel if no request has been performed yet
|
||||||
|
// WebTestCase::createClient() boots the Kernel but do not handle a request
|
||||||
|
if ($this->hasPerformedRequest && $this->reboot) {
|
||||||
|
$this->kernel->shutdown();
|
||||||
|
} else {
|
||||||
|
$this->hasPerformedRequest = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($this->profiler) {
|
||||||
|
$this->profiler = false;
|
||||||
|
|
||||||
|
$this->kernel->boot();
|
||||||
|
$this->kernel->getContainer()->get('profiler')->enable();
|
||||||
|
}
|
||||||
|
|
||||||
|
return parent::doRequest($request);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* {@inheritdoc}
|
||||||
|
*
|
||||||
|
* @param Request $request A Request instance
|
||||||
|
*
|
||||||
|
* @return Response A Response instance
|
||||||
|
*/
|
||||||
|
protected function doRequestInProcess($request)
|
||||||
|
{
|
||||||
|
$response = parent::doRequestInProcess($request);
|
||||||
|
|
||||||
|
$this->profiler = false;
|
||||||
|
|
||||||
|
return $response;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the script to execute when the request must be insulated.
|
||||||
|
*
|
||||||
|
* It assumes that the autoloader is named 'autoload.php' and that it is
|
||||||
|
* stored in the same directory as the kernel (this is the case for the
|
||||||
|
* Symfony Standard Edition). If this is not your case, create your own
|
||||||
|
* client and override this method.
|
||||||
|
*
|
||||||
|
* @param Request $request A Request instance
|
||||||
|
*
|
||||||
|
* @return string The script content
|
||||||
|
*/
|
||||||
|
protected function getScript($request)
|
||||||
|
{
|
||||||
|
$kernel = var_export(serialize($this->kernel), true);
|
||||||
|
$request = var_export(serialize($request), true);
|
||||||
|
$errorReporting = error_reporting();
|
||||||
|
|
||||||
|
$requires = '';
|
||||||
|
foreach (get_declared_classes() as $class) {
|
||||||
|
if (0 === strpos($class, 'ComposerAutoloaderInit')) {
|
||||||
|
$r = new \ReflectionClass($class);
|
||||||
|
$file = \dirname(\dirname($r->getFileName())).'/autoload.php';
|
||||||
|
if (file_exists($file)) {
|
||||||
|
$requires .= 'require_once '.var_export($file, true).";\n";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!$requires) {
|
||||||
|
throw new \RuntimeException('Composer autoloader not found.');
|
||||||
|
}
|
||||||
|
|
||||||
|
$requires .= 'require_once '.var_export((new \ReflectionObject($this->kernel))->getFileName(), true).";\n";
|
||||||
|
|
||||||
|
$profilerCode = '';
|
||||||
|
if ($this->profiler) {
|
||||||
|
$profilerCode = '$kernel->getContainer()->get(\'profiler\')->enable();';
|
||||||
|
}
|
||||||
|
|
||||||
|
$code = <<<EOF
|
||||||
|
<?php
|
||||||
|
|
||||||
|
error_reporting($errorReporting);
|
||||||
|
|
||||||
|
$requires
|
||||||
|
|
||||||
|
\$kernel = unserialize($kernel);
|
||||||
|
\$kernel->boot();
|
||||||
|
$profilerCode
|
||||||
|
|
||||||
|
\$request = unserialize($request);
|
||||||
|
EOF;
|
||||||
|
|
||||||
|
return $code.$this->getHandleScript();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -11,196 +11,11 @@
|
|||||||
|
|
||||||
namespace Symfony\Bundle\FrameworkBundle;
|
namespace Symfony\Bundle\FrameworkBundle;
|
||||||
|
|
||||||
use Symfony\Component\BrowserKit\CookieJar;
|
|
||||||
use Symfony\Component\BrowserKit\History;
|
|
||||||
use Symfony\Component\DependencyInjection\ContainerInterface;
|
|
||||||
use Symfony\Component\HttpFoundation\Request;
|
|
||||||
use Symfony\Component\HttpFoundation\Response;
|
|
||||||
use Symfony\Component\HttpKernel\HttpKernelBrowser;
|
|
||||||
use Symfony\Component\HttpKernel\KernelInterface;
|
|
||||||
use Symfony\Component\HttpKernel\Profiler\Profile as HttpProfile;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Client simulates a browser and makes requests to a Kernel object.
|
* Client simulates a browser and makes requests to a Kernel object.
|
||||||
*
|
*
|
||||||
* @author Fabien Potencier <fabien@symfony.com>
|
* @author Fabien Potencier <fabien@symfony.com>
|
||||||
*/
|
*/
|
||||||
class KernelBrowser extends HttpKernelBrowser
|
class KernelBrowser extends Client
|
||||||
{
|
{
|
||||||
private $hasPerformedRequest = false;
|
|
||||||
private $profiler = false;
|
|
||||||
private $reboot = true;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* {@inheritdoc}
|
|
||||||
*/
|
|
||||||
public function __construct(KernelInterface $kernel, array $server = [], History $history = null, CookieJar $cookieJar = null)
|
|
||||||
{
|
|
||||||
parent::__construct($kernel, $server, $history, $cookieJar);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the container.
|
|
||||||
*
|
|
||||||
* @return ContainerInterface|null Returns null when the Kernel has been shutdown or not started yet
|
|
||||||
*/
|
|
||||||
public function getContainer()
|
|
||||||
{
|
|
||||||
return $this->kernel->getContainer();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the kernel.
|
|
||||||
*
|
|
||||||
* @return KernelInterface
|
|
||||||
*/
|
|
||||||
public function getKernel()
|
|
||||||
{
|
|
||||||
return $this->kernel;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the profile associated with the current Response.
|
|
||||||
*
|
|
||||||
* @return HttpProfile|false A Profile instance
|
|
||||||
*/
|
|
||||||
public function getProfile()
|
|
||||||
{
|
|
||||||
if (!$this->kernel->getContainer()->has('profiler')) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return $this->kernel->getContainer()->get('profiler')->loadProfileFromResponse($this->response);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Enables the profiler for the very next request.
|
|
||||||
*
|
|
||||||
* If the profiler is not enabled, the call to this method does nothing.
|
|
||||||
*/
|
|
||||||
public function enableProfiler()
|
|
||||||
{
|
|
||||||
if ($this->kernel->getContainer()->has('profiler')) {
|
|
||||||
$this->profiler = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Disables kernel reboot between requests.
|
|
||||||
*
|
|
||||||
* By default, the Client reboots the Kernel for each request. This method
|
|
||||||
* allows to keep the same kernel across requests.
|
|
||||||
*/
|
|
||||||
public function disableReboot()
|
|
||||||
{
|
|
||||||
$this->reboot = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Enables kernel reboot between requests.
|
|
||||||
*/
|
|
||||||
public function enableReboot()
|
|
||||||
{
|
|
||||||
$this->reboot = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* {@inheritdoc}
|
|
||||||
*
|
|
||||||
* @param Request $request A Request instance
|
|
||||||
*
|
|
||||||
* @return Response A Response instance
|
|
||||||
*/
|
|
||||||
protected function doRequest($request)
|
|
||||||
{
|
|
||||||
// avoid shutting down the Kernel if no request has been performed yet
|
|
||||||
// WebTestCase::createClient() boots the Kernel but do not handle a request
|
|
||||||
if ($this->hasPerformedRequest && $this->reboot) {
|
|
||||||
$this->kernel->shutdown();
|
|
||||||
} else {
|
|
||||||
$this->hasPerformedRequest = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($this->profiler) {
|
|
||||||
$this->profiler = false;
|
|
||||||
|
|
||||||
$this->kernel->boot();
|
|
||||||
$this->kernel->getContainer()->get('profiler')->enable();
|
|
||||||
}
|
|
||||||
|
|
||||||
return parent::doRequest($request);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* {@inheritdoc}
|
|
||||||
*
|
|
||||||
* @param Request $request A Request instance
|
|
||||||
*
|
|
||||||
* @return Response A Response instance
|
|
||||||
*/
|
|
||||||
protected function doRequestInProcess($request)
|
|
||||||
{
|
|
||||||
$response = parent::doRequestInProcess($request);
|
|
||||||
|
|
||||||
$this->profiler = false;
|
|
||||||
|
|
||||||
return $response;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the script to execute when the request must be insulated.
|
|
||||||
*
|
|
||||||
* It assumes that the autoloader is named 'autoload.php' and that it is
|
|
||||||
* stored in the same directory as the kernel (this is the case for the
|
|
||||||
* Symfony Standard Edition). If this is not your case, create your own
|
|
||||||
* client and override this method.
|
|
||||||
*
|
|
||||||
* @param Request $request A Request instance
|
|
||||||
*
|
|
||||||
* @return string The script content
|
|
||||||
*/
|
|
||||||
protected function getScript($request)
|
|
||||||
{
|
|
||||||
$kernel = var_export(serialize($this->kernel), true);
|
|
||||||
$request = var_export(serialize($request), true);
|
|
||||||
$errorReporting = error_reporting();
|
|
||||||
|
|
||||||
$requires = '';
|
|
||||||
foreach (get_declared_classes() as $class) {
|
|
||||||
if (0 === strpos($class, 'ComposerAutoloaderInit')) {
|
|
||||||
$r = new \ReflectionClass($class);
|
|
||||||
$file = \dirname(\dirname($r->getFileName())).'/autoload.php';
|
|
||||||
if (file_exists($file)) {
|
|
||||||
$requires .= 'require_once '.var_export($file, true).";\n";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!$requires) {
|
|
||||||
throw new \RuntimeException('Composer autoloader not found.');
|
|
||||||
}
|
|
||||||
|
|
||||||
$requires .= 'require_once '.var_export((new \ReflectionObject($this->kernel))->getFileName(), true).";\n";
|
|
||||||
|
|
||||||
$profilerCode = '';
|
|
||||||
if ($this->profiler) {
|
|
||||||
$profilerCode = '$kernel->getContainer()->get(\'profiler\')->enable();';
|
|
||||||
}
|
|
||||||
|
|
||||||
$code = <<<EOF
|
|
||||||
<?php
|
|
||||||
|
|
||||||
error_reporting($errorReporting);
|
|
||||||
|
|
||||||
$requires
|
|
||||||
|
|
||||||
\$kernel = unserialize($kernel);
|
|
||||||
\$kernel->boot();
|
|
||||||
$profilerCode
|
|
||||||
|
|
||||||
\$request = unserialize($request);
|
|
||||||
EOF;
|
|
||||||
|
|
||||||
return $code.$this->getHandleScript();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -11,8 +11,191 @@
|
|||||||
|
|
||||||
namespace Symfony\Component\HttpKernel;
|
namespace Symfony\Component\HttpKernel;
|
||||||
|
|
||||||
@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.3, use "%s" instead.', Client::class, HttpKernelBrowser::class), E_USER_DEPRECATED);
|
use Symfony\Component\BrowserKit\AbstractBrowser;
|
||||||
|
use Symfony\Component\BrowserKit\CookieJar;
|
||||||
|
use Symfony\Component\BrowserKit\History;
|
||||||
|
use Symfony\Component\BrowserKit\Request as DomRequest;
|
||||||
|
use Symfony\Component\BrowserKit\Response as DomResponse;
|
||||||
|
use Symfony\Component\HttpFoundation\File\UploadedFile;
|
||||||
|
use Symfony\Component\HttpFoundation\Request;
|
||||||
|
use Symfony\Component\HttpFoundation\Response;
|
||||||
|
|
||||||
class Client extends HttpKernelBrowser
|
/**
|
||||||
|
* Client simulates a browser and makes requests to an HttpKernel instance.
|
||||||
|
*
|
||||||
|
* @deprecated since Symfony 4.3, use HttpKernelBrowser instead.
|
||||||
|
*/
|
||||||
|
class Client extends AbstractBrowser
|
||||||
{
|
{
|
||||||
|
protected $kernel;
|
||||||
|
private $catchExceptions = true;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param HttpKernelInterface $kernel An HttpKernel instance
|
||||||
|
* @param array $server The server parameters (equivalent of $_SERVER)
|
||||||
|
* @param History $history A History instance to store the browser history
|
||||||
|
* @param CookieJar $cookieJar A CookieJar instance to store the cookies
|
||||||
|
*/
|
||||||
|
public function __construct(HttpKernelInterface $kernel, array $server = [], History $history = null, CookieJar $cookieJar = null)
|
||||||
|
{
|
||||||
|
// These class properties must be set before calling the parent constructor, as it may depend on it.
|
||||||
|
$this->kernel = $kernel;
|
||||||
|
$this->followRedirects = false;
|
||||||
|
|
||||||
|
parent::__construct($server, $history, $cookieJar);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets whether to catch exceptions when the kernel is handling a request.
|
||||||
|
*
|
||||||
|
* @param bool $catchExceptions Whether to catch exceptions
|
||||||
|
*/
|
||||||
|
public function catchExceptions($catchExceptions)
|
||||||
|
{
|
||||||
|
$this->catchExceptions = $catchExceptions;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Makes a request.
|
||||||
|
*
|
||||||
|
* @return Response A Response instance
|
||||||
|
*/
|
||||||
|
protected function doRequest($request)
|
||||||
|
{
|
||||||
|
$response = $this->kernel->handle($request, HttpKernelInterface::MASTER_REQUEST, $this->catchExceptions);
|
||||||
|
|
||||||
|
if ($this->kernel instanceof TerminableInterface) {
|
||||||
|
$this->kernel->terminate($request, $response);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $response;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the script to execute when the request must be insulated.
|
||||||
|
*
|
||||||
|
* @return string
|
||||||
|
*/
|
||||||
|
protected function getScript($request)
|
||||||
|
{
|
||||||
|
$kernel = var_export(serialize($this->kernel), true);
|
||||||
|
$request = var_export(serialize($request), true);
|
||||||
|
|
||||||
|
$errorReporting = error_reporting();
|
||||||
|
|
||||||
|
$requires = '';
|
||||||
|
foreach (get_declared_classes() as $class) {
|
||||||
|
if (0 === strpos($class, 'ComposerAutoloaderInit')) {
|
||||||
|
$r = new \ReflectionClass($class);
|
||||||
|
$file = \dirname(\dirname($r->getFileName())).'/autoload.php';
|
||||||
|
if (file_exists($file)) {
|
||||||
|
$requires .= 'require_once '.var_export($file, true).";\n";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!$requires) {
|
||||||
|
throw new \RuntimeException('Composer autoloader not found.');
|
||||||
|
}
|
||||||
|
|
||||||
|
$code = <<<EOF
|
||||||
|
<?php
|
||||||
|
|
||||||
|
error_reporting($errorReporting);
|
||||||
|
|
||||||
|
$requires
|
||||||
|
|
||||||
|
\$kernel = unserialize($kernel);
|
||||||
|
\$request = unserialize($request);
|
||||||
|
EOF;
|
||||||
|
|
||||||
|
return $code.$this->getHandleScript();
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function getHandleScript()
|
||||||
|
{
|
||||||
|
return <<<'EOF'
|
||||||
|
$response = $kernel->handle($request);
|
||||||
|
|
||||||
|
if ($kernel instanceof Symfony\Component\HttpKernel\TerminableInterface) {
|
||||||
|
$kernel->terminate($request, $response);
|
||||||
|
}
|
||||||
|
|
||||||
|
echo serialize($response);
|
||||||
|
EOF;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Converts the BrowserKit request to a HttpKernel request.
|
||||||
|
*
|
||||||
|
* @return Request A Request instance
|
||||||
|
*/
|
||||||
|
protected function filterRequest(DomRequest $request)
|
||||||
|
{
|
||||||
|
$httpRequest = Request::create($request->getUri(), $request->getMethod(), $request->getParameters(), $request->getCookies(), $request->getFiles(), $request->getServer(), $request->getContent());
|
||||||
|
|
||||||
|
foreach ($this->filterFiles($httpRequest->files->all()) as $key => $value) {
|
||||||
|
$httpRequest->files->set($key, $value);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $httpRequest;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Filters an array of files.
|
||||||
|
*
|
||||||
|
* This method created test instances of UploadedFile so that the move()
|
||||||
|
* method can be called on those instances.
|
||||||
|
*
|
||||||
|
* If the size of a file is greater than the allowed size (from php.ini) then
|
||||||
|
* an invalid UploadedFile is returned with an error set to UPLOAD_ERR_INI_SIZE.
|
||||||
|
*
|
||||||
|
* @see UploadedFile
|
||||||
|
*
|
||||||
|
* @return array An array with all uploaded files marked as already moved
|
||||||
|
*/
|
||||||
|
protected function filterFiles(array $files)
|
||||||
|
{
|
||||||
|
$filtered = [];
|
||||||
|
foreach ($files as $key => $value) {
|
||||||
|
if (\is_array($value)) {
|
||||||
|
$filtered[$key] = $this->filterFiles($value);
|
||||||
|
} elseif ($value instanceof UploadedFile) {
|
||||||
|
if ($value->isValid() && $value->getSize() > UploadedFile::getMaxFilesize()) {
|
||||||
|
$filtered[$key] = new UploadedFile(
|
||||||
|
'',
|
||||||
|
$value->getClientOriginalName(),
|
||||||
|
$value->getClientMimeType(),
|
||||||
|
UPLOAD_ERR_INI_SIZE,
|
||||||
|
true
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
$filtered[$key] = new UploadedFile(
|
||||||
|
$value->getPathname(),
|
||||||
|
$value->getClientOriginalName(),
|
||||||
|
$value->getClientMimeType(),
|
||||||
|
$value->getError(),
|
||||||
|
true
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $filtered;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Converts the HttpKernel response to a BrowserKit response.
|
||||||
|
*
|
||||||
|
* @return DomResponse A DomResponse instance
|
||||||
|
*/
|
||||||
|
protected function filterResponse($response)
|
||||||
|
{
|
||||||
|
// this is needed to support StreamedResponse
|
||||||
|
ob_start();
|
||||||
|
$response->sendContent();
|
||||||
|
$content = ob_get_clean();
|
||||||
|
|
||||||
|
return new DomResponse($content, $response->getStatusCode(), $response->headers->all());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -11,15 +11,6 @@
|
|||||||
|
|
||||||
namespace Symfony\Component\HttpKernel;
|
namespace Symfony\Component\HttpKernel;
|
||||||
|
|
||||||
use Symfony\Component\BrowserKit\AbstractBrowser;
|
|
||||||
use Symfony\Component\BrowserKit\CookieJar;
|
|
||||||
use Symfony\Component\BrowserKit\History;
|
|
||||||
use Symfony\Component\BrowserKit\Request as DomRequest;
|
|
||||||
use Symfony\Component\BrowserKit\Response as DomResponse;
|
|
||||||
use Symfony\Component\HttpFoundation\File\UploadedFile;
|
|
||||||
use Symfony\Component\HttpFoundation\Request;
|
|
||||||
use Symfony\Component\HttpFoundation\Response;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Client simulates a browser and makes requests to an HttpKernel instance.
|
* Client simulates a browser and makes requests to an HttpKernel instance.
|
||||||
*
|
*
|
||||||
@ -28,177 +19,6 @@ use Symfony\Component\HttpFoundation\Response;
|
|||||||
* @method Request getRequest() A Request instance
|
* @method Request getRequest() A Request instance
|
||||||
* @method Response getResponse() A Response instance
|
* @method Response getResponse() A Response instance
|
||||||
*/
|
*/
|
||||||
class HttpKernelBrowser extends AbstractBrowser
|
class HttpKernelBrowser extends Client
|
||||||
{
|
{
|
||||||
protected $kernel;
|
|
||||||
private $catchExceptions = true;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param HttpKernelInterface $kernel An HttpKernel instance
|
|
||||||
* @param array $server The server parameters (equivalent of $_SERVER)
|
|
||||||
* @param History $history A History instance to store the browser history
|
|
||||||
* @param CookieJar $cookieJar A CookieJar instance to store the cookies
|
|
||||||
*/
|
|
||||||
public function __construct(HttpKernelInterface $kernel, array $server = [], History $history = null, CookieJar $cookieJar = null)
|
|
||||||
{
|
|
||||||
// These class properties must be set before calling the parent constructor, as it may depend on it.
|
|
||||||
$this->kernel = $kernel;
|
|
||||||
$this->followRedirects = false;
|
|
||||||
|
|
||||||
parent::__construct($server, $history, $cookieJar);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sets whether to catch exceptions when the kernel is handling a request.
|
|
||||||
*
|
|
||||||
* @param bool $catchExceptions Whether to catch exceptions
|
|
||||||
*/
|
|
||||||
public function catchExceptions($catchExceptions)
|
|
||||||
{
|
|
||||||
$this->catchExceptions = $catchExceptions;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Makes a request.
|
|
||||||
*
|
|
||||||
* @return Response A Response instance
|
|
||||||
*/
|
|
||||||
protected function doRequest($request)
|
|
||||||
{
|
|
||||||
$response = $this->kernel->handle($request, HttpKernelInterface::MASTER_REQUEST, $this->catchExceptions);
|
|
||||||
|
|
||||||
if ($this->kernel instanceof TerminableInterface) {
|
|
||||||
$this->kernel->terminate($request, $response);
|
|
||||||
}
|
|
||||||
|
|
||||||
return $response;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the script to execute when the request must be insulated.
|
|
||||||
*
|
|
||||||
* @return string
|
|
||||||
*/
|
|
||||||
protected function getScript($request)
|
|
||||||
{
|
|
||||||
$kernel = var_export(serialize($this->kernel), true);
|
|
||||||
$request = var_export(serialize($request), true);
|
|
||||||
|
|
||||||
$errorReporting = error_reporting();
|
|
||||||
|
|
||||||
$requires = '';
|
|
||||||
foreach (get_declared_classes() as $class) {
|
|
||||||
if (0 === strpos($class, 'ComposerAutoloaderInit')) {
|
|
||||||
$r = new \ReflectionClass($class);
|
|
||||||
$file = \dirname(\dirname($r->getFileName())).'/autoload.php';
|
|
||||||
if (file_exists($file)) {
|
|
||||||
$requires .= 'require_once '.var_export($file, true).";\n";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!$requires) {
|
|
||||||
throw new \RuntimeException('Composer autoloader not found.');
|
|
||||||
}
|
|
||||||
|
|
||||||
$code = <<<EOF
|
|
||||||
<?php
|
|
||||||
|
|
||||||
error_reporting($errorReporting);
|
|
||||||
|
|
||||||
$requires
|
|
||||||
|
|
||||||
\$kernel = unserialize($kernel);
|
|
||||||
\$request = unserialize($request);
|
|
||||||
EOF;
|
|
||||||
|
|
||||||
return $code.$this->getHandleScript();
|
|
||||||
}
|
|
||||||
|
|
||||||
protected function getHandleScript()
|
|
||||||
{
|
|
||||||
return <<<'EOF'
|
|
||||||
$response = $kernel->handle($request);
|
|
||||||
|
|
||||||
if ($kernel instanceof Symfony\Component\HttpKernel\TerminableInterface) {
|
|
||||||
$kernel->terminate($request, $response);
|
|
||||||
}
|
|
||||||
|
|
||||||
echo serialize($response);
|
|
||||||
EOF;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Converts the BrowserKit request to a HttpKernel request.
|
|
||||||
*
|
|
||||||
* @return Request A Request instance
|
|
||||||
*/
|
|
||||||
protected function filterRequest(DomRequest $request)
|
|
||||||
{
|
|
||||||
$httpRequest = Request::create($request->getUri(), $request->getMethod(), $request->getParameters(), $request->getCookies(), $request->getFiles(), $request->getServer(), $request->getContent());
|
|
||||||
|
|
||||||
foreach ($this->filterFiles($httpRequest->files->all()) as $key => $value) {
|
|
||||||
$httpRequest->files->set($key, $value);
|
|
||||||
}
|
|
||||||
|
|
||||||
return $httpRequest;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Filters an array of files.
|
|
||||||
*
|
|
||||||
* This method created test instances of UploadedFile so that the move()
|
|
||||||
* method can be called on those instances.
|
|
||||||
*
|
|
||||||
* If the size of a file is greater than the allowed size (from php.ini) then
|
|
||||||
* an invalid UploadedFile is returned with an error set to UPLOAD_ERR_INI_SIZE.
|
|
||||||
*
|
|
||||||
* @see UploadedFile
|
|
||||||
*
|
|
||||||
* @return array An array with all uploaded files marked as already moved
|
|
||||||
*/
|
|
||||||
protected function filterFiles(array $files)
|
|
||||||
{
|
|
||||||
$filtered = [];
|
|
||||||
foreach ($files as $key => $value) {
|
|
||||||
if (\is_array($value)) {
|
|
||||||
$filtered[$key] = $this->filterFiles($value);
|
|
||||||
} elseif ($value instanceof UploadedFile) {
|
|
||||||
if ($value->isValid() && $value->getSize() > UploadedFile::getMaxFilesize()) {
|
|
||||||
$filtered[$key] = new UploadedFile(
|
|
||||||
'',
|
|
||||||
$value->getClientOriginalName(),
|
|
||||||
$value->getClientMimeType(),
|
|
||||||
UPLOAD_ERR_INI_SIZE,
|
|
||||||
true
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
$filtered[$key] = new UploadedFile(
|
|
||||||
$value->getPathname(),
|
|
||||||
$value->getClientOriginalName(),
|
|
||||||
$value->getClientMimeType(),
|
|
||||||
$value->getError(),
|
|
||||||
true
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return $filtered;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Converts the HttpKernel response to a BrowserKit response.
|
|
||||||
*
|
|
||||||
* @return DomResponse A DomResponse instance
|
|
||||||
*/
|
|
||||||
protected function filterResponse($response)
|
|
||||||
{
|
|
||||||
// this is needed to support StreamedResponse
|
|
||||||
ob_start();
|
|
||||||
$response->sendContent();
|
|
||||||
$content = ob_get_clean();
|
|
||||||
|
|
||||||
return new DomResponse($content, $response->getStatusCode(), $response->headers->all());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user