Skip to content

Commit 124f5f4

Browse files
nicolas-grekasnicolas-grekas
committed
CS fixes
1 parent 4441dad commit 124f5f4

18 files changed

+39
-39
lines changed

‎File/UploadedFile.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,8 +243,8 @@ public function move($directory, $name = null)
243243
*/
244244
public static function getMaxFilesize()
245245
{
246-
$sizePostMax = self::parseFilesize(ini_get('post_max_size'));
247-
$sizeUploadMax = self::parseFilesize(ini_get('upload_max_filesize'));
246+
$sizePostMax = self::parseFilesize(\ini_get('post_max_size'));
247+
$sizeUploadMax = self::parseFilesize(\ini_get('upload_max_filesize'));
248248

249249
return min($sizePostMax ?: \PHP_INT_MAX, $sizeUploadMax ?: \PHP_INT_MAX);
250250
}

‎Request.php

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

552552
$request = ['g' => $_GET, 'p' => $_POST, 'c' => $_COOKIE];
553553

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

557557
$_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;
@@ -133,7 +133,7 @@ public function write($sessionId, $data)
133133
#[\ReturnTypeWillChange]
134134
public function destroy($sessionId)
135135
{
136-
if (!headers_sent() && filter_var(ini_get('session.use_cookies'), \FILTER_VALIDATE_BOOLEAN)) {
136+
if (!headers_sent() && filter_var(\ini_get('session.use_cookies'), \FILTER_VALIDATE_BOOLEAN)) {
137137
if (!$this->sessionName) {
138138
throw new \LogicException(sprintf('Session name cannot be empty, did you forget to call "parent::open()" in "%s"?.', static::class));
139139
}
@@ -148,7 +148,7 @@ public function destroy($sessionId)
148148
*/
149149
if (null === $cookie || isset($_COOKIE[$this->sessionName])) {
150150
if (\PHP_VERSION_ID < 70300) {
151-
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));
151+
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));
152152
} else {
153153
$params = session_get_cookie_params();
154154
unset($params['lifetime']);

‎Session/Storage/Handler/MongoDbSessionHandler.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public function gc($maxlifetime)
116116
*/
117117
protected function doWrite($sessionId, $data)
118118
{
119-
$expiry = new \MongoDB\BSON\UTCDateTime((time() + (int) ini_get('session.gc_maxlifetime')) * 1000);
119+
$expiry = new \MongoDB\BSON\UTCDateTime((time() + (int) \ini_get('session.gc_maxlifetime')) * 1000);
120120

121121
$fields = [
122122
$this->options['time_field'] => new \MongoDB\BSON\UTCDateTime(),
@@ -139,7 +139,7 @@ protected function doWrite($sessionId, $data)
139139
#[\ReturnTypeWillChange]
140140
public function updateTimestamp($sessionId, $data)
141141
{
142-
$expiry = new \MongoDB\BSON\UTCDateTime((time() + (int) ini_get('session.gc_maxlifetime')) * 1000);
142+
$expiry = new \MongoDB\BSON\UTCDateTime((time() + (int) \ini_get('session.gc_maxlifetime')) * 1000);
143143

144144
$this->getCollection()->updateOne(
145145
[$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
@@ -328,7 +328,7 @@ protected function doDestroy($sessionId)
328328
*/
329329
protected function doWrite($sessionId, $data)
330330
{
331-
$maxlifetime = (int) ini_get('session.gc_maxlifetime');
331+
$maxlifetime = (int) \ini_get('session.gc_maxlifetime');
332332

333333
try {
334334
// We use a single MERGE SQL query when supported by the database.
@@ -375,7 +375,7 @@ protected function doWrite($sessionId, $data)
375375
#[\ReturnTypeWillChange]
376376
public function updateTimestamp($sessionId, $data)
377377
{
378-
$expiry = time() + (int) ini_get('session.gc_maxlifetime');
378+
$expiry = time() + (int) \ini_get('session.gc_maxlifetime');
379379

380380
try {
381381
$updateStmt = $this->pdo->prepare(
@@ -650,7 +650,7 @@ protected function doRead($sessionId)
650650
throw new \RuntimeException('Failed to read session: INSERT reported a duplicate id but next SELECT did not return any data.');
651651
}
652652

653-
if (!filter_var(ini_get('session.use_strict_mode'), \FILTER_VALIDATE_BOOLEAN) && self::LOCK_TRANSACTIONAL === $this->lockMode && 'sqlite' !== $this->driver) {
653+
if (!filter_var(\ini_get('session.use_strict_mode'), \FILTER_VALIDATE_BOOLEAN) && self::LOCK_TRANSACTIONAL === $this->lockMode && 'sqlite' !== $this->driver) {
654654
// In strict mode, session fixation is not possible: new sessions always start with a unique
655655
// random id, so that concurrency is not possible and this code path can be skipped.
656656
// Exclusive-reading of non-existent rows does not block, so we need to do an insert to block
@@ -898,7 +898,7 @@ private function getMergeStatement(string $sessionId, string $data, int $maxlife
898898
protected function getConnection()
899899
{
900900
if (null === $this->pdo) {
901-
$this->connect($this->dsn ?: ini_get('session.save_path'));
901+
$this->connect($this->dsn ?: \ini_get('session.save_path'));
902902
}
903903

904904
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($sessionId): string
7979
*/
8080
protected function doWrite($sessionId, $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
}
@@ -120,6 +120,6 @@ public function gc($maxlifetime)
120120
#[\ReturnTypeWillChange]
121121
public function updateTimestamp($sessionId, $data)
122122
{
123-
return (bool) $this->redis->expire($this->prefix.$sessionId, (int) ($this->ttl ?? ini_get('session.gc_maxlifetime')));
123+
return (bool) $this->redis->expire($this->prefix.$sessionId, (int) ($this->ttl ?? \ini_get('session.gc_maxlifetime')));
124124
}
125125
}

‎Session/Storage/MetadataBag.php

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

‎Session/Storage/NativeSessionStorage.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ public function start()
148148
throw new \RuntimeException('Failed to start the session: already started by PHP.');
149149
}
150150

151-
if (filter_var(ini_get('session.use_cookies'), \FILTER_VALIDATE_BOOLEAN) && headers_sent($file, $line)) {
151+
if (filter_var(\ini_get('session.use_cookies'), \FILTER_VALIDATE_BOOLEAN) && headers_sent($file, $line)) {
152152
throw new \RuntimeException(sprintf('Failed to start the session because headers have already been sent by "%s" at line %d.', $file, $line));
153153
}
154154

@@ -221,7 +221,7 @@ public function regenerate($destroy = false, $lifetime = null)
221221
return false;
222222
}
223223

224-
if (null !== $lifetime && $lifetime != ini_get('session.cookie_lifetime')) {
224+
if (null !== $lifetime && $lifetime != \ini_get('session.cookie_lifetime')) {
225225
$this->save();
226226
ini_set('session.cookie_lifetime', $lifetime);
227227
$this->start();

‎Session/Storage/Proxy/SessionHandlerProxy.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public function __construct(\SessionHandlerInterface $handler)
2222
{
2323
$this->handler = $handler;
2424
$this->wrapper = $handler instanceof \SessionHandler;
25-
$this->saveHandlerName = $this->wrapper ? ini_get('session.save_handler') : 'user';
25+
$this->saveHandlerName = $this->wrapper ? \ini_get('session.save_handler') : 'user';
2626
}
2727

2828
/**

0 commit comments

Comments
 (0)