Skip to content

Commit 1d3d261

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '4.4' into 5.4
* 4.4: CS fixes Bump Symfony version to 4.4.44 Update VERSION for 4.4.43 Update CONTRIBUTORS for 4.4.43 Update CHANGELOG for 4.4.43
2 parents e7793b7 + 124f5f4 commit 1d3d261

21 files changed

+47
-47
lines changed

‎File/UploadedFile.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,8 +223,8 @@ public function move(string $directory, string $name = null)
223223
*/
224224
public static function getMaxFilesize()
225225
{
226-
$sizePostMax = self::parseFilesize(ini_get('post_max_size'));
227-
$sizeUploadMax = self::parseFilesize(ini_get('upload_max_filesize'));
226+
$sizePostMax = self::parseFilesize(\ini_get('post_max_size'));
227+
$sizeUploadMax = self::parseFilesize(\ini_get('upload_max_filesize'));
228228

229229
return min($sizePostMax ?: \PHP_INT_MAX, $sizeUploadMax ?: \PHP_INT_MAX);
230230
}

‎InputBag.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ final class InputBag extends ParameterBag
2929
*/
3030
public function get(string $key, $default = null)
3131
{
32-
if (null !== $default && !is_scalar($default) && !(\is_object($default) && method_exists($default, '__toString'))) {
32+
if (null !== $default && !\is_scalar($default) && !(\is_object($default) && method_exists($default, '__toString'))) {
3333
trigger_deprecation('symfony/http-foundation', '5.1', 'Passing a non-scalar value as 2nd argument to "%s()" is deprecated, pass a scalar or null instead.', __METHOD__);
3434
}
3535

3636
$value = parent::get($key, $this);
3737

38-
if (null !== $value && $this !== $value && !is_scalar($value) && !(\is_object($value) && method_exists($value, '__toString'))) {
38+
if (null !== $value && $this !== $value && !\is_scalar($value) && !(\is_object($value) && method_exists($value, '__toString'))) {
3939
trigger_deprecation('symfony/http-foundation', '5.1', 'Retrieving a non-string value from "%s()" is deprecated, and will throw a "%s" exception in Symfony 6.0, use "%s::all($key)" instead.', __METHOD__, BadRequestException::class, __CLASS__);
4040
}
4141

@@ -76,7 +76,7 @@ public function add(array $inputs = [])
7676
*/
7777
public function set(string $key, $value)
7878
{
79-
if (null !== $value && !is_scalar($value) && !\is_array($value) && !method_exists($value, '__toString')) {
79+
if (null !== $value && !\is_scalar($value) && !\is_array($value) && !method_exists($value, '__toString')) {
8080
trigger_deprecation('symfony/http-foundation', '5.1', 'Passing "%s" as a 2nd Argument to "%s()" is deprecated, pass a scalar, array, or null instead.', get_debug_type($value), __METHOD__);
8181
}
8282

‎Request.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ public function overrideGlobals()
562562

563563
$request = ['g' => $_GET, 'p' => $_POST, 'c' => $_COOKIE];
564564

565-
$requestOrder = ini_get('request_order') ?: ini_get('variables_order');
565+
$requestOrder = \ini_get('request_order') ?: \ini_get('variables_order');
566566
$requestOrder = preg_replace('#[^cgp]#', '', strtolower($requestOrder)) ?: 'gp';
567567

568568
$_REQUEST = [[]];

‎Session/Storage/Handler/AbstractSessionHandler.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ abstract class AbstractSessionHandler implements \SessionHandlerInterface, \Sess
3535
public function open($savePath, $sessionName)
3636
{
3737
$this->sessionName = $sessionName;
38-
if (!headers_sent() && !ini_get('session.cache_limiter') && '0' !== ini_get('session.cache_limiter')) {
39-
header(sprintf('Cache-Control: max-age=%d, private, must-revalidate', 60 * (int) ini_get('session.cache_expire')));
38+
if (!headers_sent() && !\ini_get('session.cache_limiter') && '0' !== \ini_get('session.cache_limiter')) {
39+
header(sprintf('Cache-Control: max-age=%d, private, must-revalidate', 60 * (int) \ini_get('session.cache_expire')));
4040
}
4141

4242
return true;
@@ -126,7 +126,7 @@ public function write($sessionId, $data)
126126
#[\ReturnTypeWillChange]
127127
public function destroy($sessionId)
128128
{
129-
if (!headers_sent() && filter_var(ini_get('session.use_cookies'), \FILTER_VALIDATE_BOOLEAN)) {
129+
if (!headers_sent() && filter_var(\ini_get('session.use_cookies'), \FILTER_VALIDATE_BOOLEAN)) {
130130
if (!$this->sessionName) {
131131
throw new \LogicException(sprintf('Session name cannot be empty, did you forget to call "parent::open()" in "%s"?.', static::class));
132132
}
@@ -141,7 +141,7 @@ public function destroy($sessionId)
141141
*/
142142
if (null === $cookie || isset($_COOKIE[$this->sessionName])) {
143143
if (\PHP_VERSION_ID < 70300) {
144-
setcookie($this->sessionName, '', 0, ini_get('session.cookie_path'), ini_get('session.cookie_domain'), filter_var(ini_get('session.cookie_secure'), \FILTER_VALIDATE_BOOLEAN), filter_var(ini_get('session.cookie_httponly'), \FILTER_VALIDATE_BOOLEAN));
144+
setcookie($this->sessionName, '', 0, \ini_get('session.cookie_path'), \ini_get('session.cookie_domain'), filter_var(\ini_get('session.cookie_secure'), \FILTER_VALIDATE_BOOLEAN), filter_var(\ini_get('session.cookie_httponly'), \FILTER_VALIDATE_BOOLEAN));
145145
} else {
146146
$params = session_get_cookie_params();
147147
unset($params['lifetime']);

‎Session/Storage/Handler/MemcachedSessionHandler.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ protected function doRead(string $sessionId)
7777
#[\ReturnTypeWillChange]
7878
public function updateTimestamp($sessionId, $data)
7979
{
80-
$this->memcached->touch($this->prefix.$sessionId, time() + (int) ($this->ttl ?? ini_get('session.gc_maxlifetime')));
80+
$this->memcached->touch($this->prefix.$sessionId, time() + (int) ($this->ttl ?? \ini_get('session.gc_maxlifetime')));
8181

8282
return true;
8383
}
@@ -87,7 +87,7 @@ public function updateTimestamp($sessionId, $data)
8787
*/
8888
protected function doWrite(string $sessionId, string $data)
8989
{
90-
return $this->memcached->set($this->prefix.$sessionId, $data, time() + (int) ($this->ttl ?? ini_get('session.gc_maxlifetime')));
90+
return $this->memcached->set($this->prefix.$sessionId, $data, time() + (int) ($this->ttl ?? \ini_get('session.gc_maxlifetime')));
9191
}
9292

9393
/**

‎Session/Storage/Handler/MongoDbSessionHandler.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public function gc($maxlifetime)
121121
*/
122122
protected function doWrite(string $sessionId, string $data)
123123
{
124-
$expiry = new UTCDateTime((time() + (int) ini_get('session.gc_maxlifetime')) * 1000);
124+
$expiry = new UTCDateTime((time() + (int) \ini_get('session.gc_maxlifetime')) * 1000);
125125

126126
$fields = [
127127
$this->options['time_field'] => new UTCDateTime(),
@@ -144,7 +144,7 @@ protected function doWrite(string $sessionId, string $data)
144144
#[\ReturnTypeWillChange]
145145
public function updateTimestamp($sessionId, $data)
146146
{
147-
$expiry = new UTCDateTime((time() + (int) ini_get('session.gc_maxlifetime')) * 1000);
147+
$expiry = new UTCDateTime((time() + (int) \ini_get('session.gc_maxlifetime')) * 1000);
148148

149149
$this->getCollection()->updateOne(
150150
[$this->options['id_field'] => $sessionId],

‎Session/Storage/Handler/NativeFileSessionHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class NativeFileSessionHandler extends \SessionHandler
3131
public function __construct(string $savePath = null)
3232
{
3333
if (null === $savePath) {
34-
$savePath = ini_get('session.save_path');
34+
$savePath = \ini_get('session.save_path');
3535
}
3636

3737
$baseDir = $savePath;

‎Session/Storage/Handler/PdoSessionHandler.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ protected function doDestroy(string $sessionId)
344344
*/
345345
protected function doWrite(string $sessionId, string $data)
346346
{
347-
$maxlifetime = (int) ini_get('session.gc_maxlifetime');
347+
$maxlifetime = (int) \ini_get('session.gc_maxlifetime');
348348

349349
try {
350350
// We use a single MERGE SQL query when supported by the database.
@@ -391,7 +391,7 @@ protected function doWrite(string $sessionId, string $data)
391391
#[\ReturnTypeWillChange]
392392
public function updateTimestamp($sessionId, $data)
393393
{
394-
$expiry = time() + (int) ini_get('session.gc_maxlifetime');
394+
$expiry = time() + (int) \ini_get('session.gc_maxlifetime');
395395

396396
try {
397397
$updateStmt = $this->pdo->prepare(
@@ -687,7 +687,7 @@ protected function doRead(string $sessionId)
687687
throw new \RuntimeException('Failed to read session: INSERT reported a duplicate id but next SELECT did not return any data.');
688688
}
689689

690-
if (!filter_var(ini_get('session.use_strict_mode'), \FILTER_VALIDATE_BOOLEAN) && self::LOCK_TRANSACTIONAL === $this->lockMode && 'sqlite' !== $this->driver) {
690+
if (!filter_var(\ini_get('session.use_strict_mode'), \FILTER_VALIDATE_BOOLEAN) && self::LOCK_TRANSACTIONAL === $this->lockMode && 'sqlite' !== $this->driver) {
691691
// In strict mode, session fixation is not possible: new sessions always start with a unique
692692
// random id, so that concurrency is not possible and this code path can be skipped.
693693
// Exclusive-reading of non-existent rows does not block, so we need to do an insert to block
@@ -935,7 +935,7 @@ private function getMergeStatement(string $sessionId, string $data, int $maxlife
935935
protected function getConnection()
936936
{
937937
if (null === $this->pdo) {
938-
$this->connect($this->dsn ?: ini_get('session.save_path'));
938+
$this->connect($this->dsn ?: \ini_get('session.save_path'));
939939
}
940940

941941
return $this->pdo;

‎Session/Storage/Handler/RedisSessionHandler.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ protected function doRead(string $sessionId): string
7979
*/
8080
protected function doWrite(string $sessionId, string $data): bool
8181
{
82-
$result = $this->redis->setEx($this->prefix.$sessionId, (int) ($this->ttl ?? ini_get('session.gc_maxlifetime')), $data);
82+
$result = $this->redis->setEx($this->prefix.$sessionId, (int) ($this->ttl ?? \ini_get('session.gc_maxlifetime')), $data);
8383

8484
return $result && !$result instanceof ErrorInterface;
8585
}
@@ -132,6 +132,6 @@ public function gc($maxlifetime)
132132
#[\ReturnTypeWillChange]
133133
public function updateTimestamp($sessionId, $data)
134134
{
135-
return (bool) $this->redis->expire($this->prefix.$sessionId, (int) ($this->ttl ?? ini_get('session.gc_maxlifetime')));
135+
return (bool) $this->redis->expire($this->prefix.$sessionId, (int) ($this->ttl ?? \ini_get('session.gc_maxlifetime')));
136136
}
137137
}

‎Session/Storage/MetadataBag.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,6 @@ private function stampCreated(int $lifetime = null): void
162162
{
163163
$timeStamp = time();
164164
$this->meta[self::CREATED] = $this->meta[self::UPDATED] = $this->lastUsed = $timeStamp;
165-
$this->meta[self::LIFETIME] = $lifetime ?? (int) ini_get('session.cookie_lifetime');
165+
$this->meta[self::LIFETIME] = $lifetime ?? (int) \ini_get('session.cookie_lifetime');
166166
}
167167
}

0 commit comments

Comments
 (0)