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

Merge branch '2.3' into 2.5 

* 2.3:
  [Routing] add tests for RequestContext
  [Routing] fix inconsistencies in RequestContext
  don't raise warnings when exception is thrown
This commit is contained in:
Fabien Potencier 2014-10-09 18:00:03 +02:00
parent d2c6c34067 4dad67e104
commit b4ed800529
3 changed files with 77 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Symfony/Component/CssSelector/XPath/Translator.php
View File

@ -123,17 +123,15 @@ class Translator implements TranslatorInterface
$selectors = $this->parseSelectors($cssExpr);
/** @var SelectorNode $selector */
foreach ($selectors as $selector) {
foreach ($selectors as $index => $selector) {
if (null !== $selector->getPseudoElement()) {
throw new ExpressionErrorException('Pseudo-elements are not supported.');
}
$selectors[$index] = $this->selectorToXPath($selector, $prefix);
}
$translator = $this;
return implode(' | ', array_map(function (SelectorNode $selector) use ($translator, $prefix) {
return $translator->selectorToXPath($selector, $prefix);
}, $selectors));
return implode(' | ', $selectors);
}
/**

55
src/Symfony/Component/Routing/RequestContext.php
View File

@ -17,6 +17,7 @@ use Symfony\Component\HttpFoundation\Request;
* Holds information about the current request.
*
* @author Fabien Potencier <fabien@symfony.com>
* @author Tobias Schultze <http://tobion.de>
*
* @api
*/
@ -52,16 +53,21 @@ class RequestContext
*/
public function __construct($baseUrl = '', $method = 'GET', $host = 'localhost', $scheme = 'http', $httpPort = 80, $httpsPort = 443, $path = '/', $queryString = '')
{
$this->baseUrl = $baseUrl;
$this->method = strtoupper($method);
$this->host = $host;
$this->scheme = strtolower($scheme);
$this->httpPort = $httpPort;
$this->httpsPort = $httpsPort;
$this->pathInfo = $path;
$this->queryString = $queryString;
$this->setBaseUrl($baseUrl);
$this->setMethod($method);
$this->setHost($host);
$this->setScheme($scheme);
$this->setHttpPort($httpPort);
$this->setHttpsPort($httpsPort);
$this->setPathInfo($path);
$this->setQueryString($queryString);
}
/**
* Updates the RequestContext information based on a HttpFoundation Request.
*
* @param Request $request A Request instance
*/
public function fromRequest(Request $request)
{
$this->setBaseUrl($request->getBaseUrl());
@ -71,7 +77,7 @@ class RequestContext
$this->setScheme($request->getScheme());
$this->setHttpPort($request->isSecure() ? $this->httpPort : $request->getPort());
$this->setHttpsPort($request->isSecure() ? $request->getPort() : $this->httpsPort);
$this->setQueryString($request->server->get('QUERY_STRING'));
$this->setQueryString($request->server->get('QUERY_STRING', ''));
}
/**
@ -143,6 +149,8 @@ class RequestContext
/**
* Gets the HTTP host.
*
* The host is always lowercased because it must be treated case-insensitive.
*
* @return string The HTTP host
*/
public function getHost()
@ -159,7 +167,7 @@ class RequestContext
*/
public function setHost($host)
{
$this->host = $host;
$this->host = strtolower($host);
}
/**
@ -187,7 +195,7 @@ class RequestContext
/**
* Gets the HTTP port.
*
* @return string The HTTP port
* @return int The HTTP port
*/
public function getHttpPort()
{
@ -197,19 +205,19 @@ class RequestContext
/**
* Sets the HTTP port.
*
* @param string $httpPort The HTTP port
* @param int $httpPort The HTTP port
*
* @api
*/
public function setHttpPort($httpPort)
{
$this->httpPort = $httpPort;
$this->httpPort = (int) $httpPort;
}
/**
* Gets the HTTPS port.
*
* @return string The HTTPS port
* @return int The HTTPS port
*/
public function getHttpsPort()
{
@ -219,19 +227,19 @@ class RequestContext
/**
* Sets the HTTPS port.
*
* @param string $httpsPort The HTTPS port
* @param int $httpsPort The HTTPS port
*
* @api
*/
public function setHttpsPort($httpsPort)
{
$this->httpsPort = $httpsPort;
$this->httpsPort = (int) $httpsPort;
}
/**
* Gets the query string.
*
* @return string The query string
* @return string The query string without the "?"
*/
public function getQueryString()
{
@ -241,13 +249,14 @@ class RequestContext
/**
* Sets the query string.
*
* @param string $queryString The query string
* @param string $queryString The query string (after "?")
*
* @api
*/
public function setQueryString($queryString)
{
$this->queryString = $queryString;
// string cast to be fault-tolerant, accepting null
$this->queryString = (string) $queryString;
}
/**
@ -263,11 +272,9 @@ class RequestContext
/**
* Sets the parameters.
*
* This method implements a fluent interface.
*
* @param array $parameters The parameters
*
* @return Route The current Route instance
* @return RequestContext The current instance, implementing a fluent interface
*/
public function setParameters(array $parameters)
{
@ -281,7 +288,7 @@ class RequestContext
*
* @param string $name A parameter name
*
* @return mixed The parameter value
* @return mixed The parameter value or null if nonexistent
*/
public function getParameter($name)
{
@ -293,7 +300,7 @@ class RequestContext
*
* @param string $name A parameter name
*
* @return bool true if the parameter value is set, false otherwise
* @return bool True if the parameter value is set, false otherwise
*/
public function hasParameter($name)
{

42
src/Symfony/Component/Routing/Tests/RequestContextTest.php
View File

@ -98,4 +98,46 @@ class RequestContextTest extends \PHPUnit_Framework_TestCase
$this->assertEquals('bar', $requestContext->getParameter('foo'));
}
public function testMethod()
{
$requestContext = new RequestContext();
$requestContext->setMethod('post');
$this->assertSame('POST', $requestContext->getMethod());
}
public function testScheme()
{
$requestContext = new RequestContext();
$requestContext->setScheme('HTTPS');
$this->assertSame('https', $requestContext->getScheme());
}
public function testHost()
{
$requestContext = new RequestContext();
$requestContext->setHost('eXampLe.com');
$this->assertSame('example.com', $requestContext->getHost());
}
public function testQueryString()
{
$requestContext = new RequestContext();
$requestContext->setQueryString(null);
$this->assertSame('', $requestContext->getQueryString());
}
public function testPort()
{
$requestContext = new RequestContext();
$requestContext->setHttpPort('123');
$requestContext->setHttpsPort('456');
$this->assertSame(123, $requestContext->getHttpPort());
$this->assertSame(456, $requestContext->getHttpsPort());
}
}