Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 17b5a2c

Browse filesBrowse files
Merge branch '3.3' into 3.4
* 3.3: [Cache] fix doctrine deprecation fix cs
2 parents 8621bd2 + 50644d0 commit 17b5a2c
Copy full SHA for 17b5a2c

File tree

2 files changed

+3
-3
lines changed
Filter options

2 files changed

+3
-3
lines changed

‎src/Symfony/Component/Cache/Traits/PdoTrait.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/Traits/PdoTrait.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public function createTable()
101101
$table->addColumn($this->idCol, $types[$this->driver], array('length' => 255));
102102
$table->addColumn($this->dataCol, 'blob', array('length' => 16777215));
103103
$table->addColumn($this->lifetimeCol, 'integer', array('unsigned' => true, 'notnull' => false));
104-
$table->addColumn($this->timeCol, 'integer', array('unsigned' => true, 'foo' => 'bar'));
104+
$table->addColumn($this->timeCol, 'integer', array('unsigned' => true));
105105
$table->setPrimaryKey(array($this->idCol));
106106

107107
foreach ($schema->toSql($conn->getDatabasePlatform()) as $sql) {

‎src/Symfony/Component/HttpFoundation/Request.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Request.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1886,7 +1886,7 @@ protected function prepareBaseUrl()
18861886

18871887
// Does the baseUrl have anything in common with the request_uri?
18881888
$requestUri = $this->getRequestUri();
1889-
if ($requestUri !== '' && $requestUri[0] !== '/') {
1889+
if ('' !== $requestUri && '/' !== $requestUri[0]) {
18901890
$requestUri = '/'.$requestUri;
18911891
}
18921892

@@ -1962,7 +1962,7 @@ protected function preparePathInfo()
19621962
if (false !== $pos = strpos($requestUri, '?')) {
19631963
$requestUri = substr($requestUri, 0, $pos);
19641964
}
1965-
if ($requestUri !== '' && $requestUri[0] !== '/') {
1965+
if ('' !== $requestUri && '/' !== $requestUri[0]) {
19661966
$requestUri = '/'.$requestUri;
19671967
}
19681968

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.