Merge branch '3.3' into 3.4
* 3.3: [Cache] fix doctrine deprecation fix cs
This commit is contained in:
commit
17b5a2ca65
@ -101,7 +101,7 @@ trait PdoTrait
|
||||
$table->addColumn($this->idCol, $types[$this->driver], array('length' => 255));
|
||||
$table->addColumn($this->dataCol, 'blob', array('length' => 16777215));
|
||||
$table->addColumn($this->lifetimeCol, 'integer', array('unsigned' => true, 'notnull' => false));
|
||||
$table->addColumn($this->timeCol, 'integer', array('unsigned' => true, 'foo' => 'bar'));
|
||||
$table->addColumn($this->timeCol, 'integer', array('unsigned' => true));
|
||||
$table->setPrimaryKey(array($this->idCol));
|
||||
|
||||
foreach ($schema->toSql($conn->getDatabasePlatform()) as $sql) {
|
||||
|
@ -1886,7 +1886,7 @@ class Request
|
||||
|
||||
// Does the baseUrl have anything in common with the request_uri?
|
||||
$requestUri = $this->getRequestUri();
|
||||
if ($requestUri !== '' && $requestUri[0] !== '/') {
|
||||
if ('' !== $requestUri && '/' !== $requestUri[0]) {
|
||||
$requestUri = '/'.$requestUri;
|
||||
}
|
||||
|
||||
@ -1962,7 +1962,7 @@ class Request
|
||||
if (false !== $pos = strpos($requestUri, '?')) {
|
||||
$requestUri = substr($requestUri, 0, $pos);
|
||||
}
|
||||
if ($requestUri !== '' && $requestUri[0] !== '/') {
|
||||
if ('' !== $requestUri && '/' !== $requestUri[0]) {
|
||||
$requestUri = '/'.$requestUri;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user