Skip to content

Commit c351789

Browse files
Merge branch '4.3' into 4.4
* 4.3: [HttpFoundation] fix docblock Fix MySQL column type definition. Link the right file depending on the new version [Config] fix id-generation for GlobResource [Finder] Allow ssh2 stream wrapper for sftp [DI] Use reproducible entropy to generate env placeholders [WebProfilerBundle] Require symfony/twig-bundle bumped Symfony version to 4.3.9 updated VERSION for 4.3.8 updated CHANGELOG for 4.3.8 bumped Symfony version to 3.4.36 updated VERSION for 3.4.35 updated CHANGELOG for 3.4.35
2 parents e6e2b4e + c8f4571 commit c351789

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Session/Storage/Handler/PdoSessionHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ public function createTable()
219219
// - trailing space removal
220220
// - case-insensitivity
221221
// - language processing like é == e
222-
$sql = "CREATE TABLE $this->table ($this->idCol VARBINARY(128) NOT NULL PRIMARY KEY, $this->dataCol BLOB NOT NULL, $this->lifetimeCol MEDIUMINT NOT NULL, $this->timeCol INTEGER UNSIGNED NOT NULL) COLLATE utf8_bin, ENGINE = InnoDB";
222+
$sql = "CREATE TABLE $this->table ($this->idCol VARBINARY(128) NOT NULL PRIMARY KEY, $this->dataCol BLOB NOT NULL, $this->lifetimeCol INTEGER UNSIGNED NOT NULL, $this->timeCol INTEGER UNSIGNED NOT NULL) COLLATE utf8_bin, ENGINE = InnoDB";
223223
break;
224224
case 'sqlite':
225225
$sql = "CREATE TABLE $this->table ($this->idCol TEXT NOT NULL PRIMARY KEY, $this->dataCol BLOB NOT NULL, $this->lifetimeCol INTEGER NOT NULL, $this->timeCol INTEGER NOT NULL)";

Session/Storage/Handler/RedisSessionHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class RedisSessionHandler extends AbstractSessionHandler
3434
* List of available options:
3535
* * prefix: The prefix to use for the keys in order to avoid collision on the Redis server.
3636
*
37-
* @param \Redis|\RedisArray|\RedisCluster|\Predis\ClientInterface|RedisProxy $redis
37+
* @param \Redis|\RedisArray|\RedisCluster|\Predis\ClientInterface|RedisProxy|RedisClusterProxy $redis
3838
*
3939
* @throws \InvalidArgumentException When unsupported client or options are passed
4040
*/

0 commit comments

Comments
 (0)