CS fixes

nicolas-grekas · nicolas-grekas · commit 124f5f4fd772 · 2022-06-27T15:16:42.000+02:00
diff --git a/File/UploadedFile.php b/File/UploadedFile.php
@@ -243,8 +243,8 @@ public function move($directory, $name = null)
      */
     public static function getMaxFilesize()
     {
-        $sizePostMax = self::parseFilesize(ini_get('post_max_size'));
-        $sizeUploadMax = self::parseFilesize(ini_get('upload_max_filesize'));
+        $sizePostMax = self::parseFilesize(\ini_get('post_max_size'));
+        $sizeUploadMax = self::parseFilesize(\ini_get('upload_max_filesize'));
 
         return min($sizePostMax ?: \PHP_INT_MAX, $sizeUploadMax ?: \PHP_INT_MAX);
     }
diff --git a/Request.php b/Request.php
@@ -551,7 +551,7 @@ public function overrideGlobals()
 
         $request = ['g' => $_GET, 'p' => $_POST, 'c' => $_COOKIE];
 
-        $requestOrder = ini_get('request_order') ?: ini_get('variables_order');
+        $requestOrder = \ini_get('request_order') ?: \ini_get('variables_order');
         $requestOrder = preg_replace('#[^cgp]#', '', strtolower($requestOrder)) ?: 'gp';
 
         $_REQUEST = [[]];
diff --git a/Session/Storage/Handler/AbstractSessionHandler.php b/Session/Storage/Handler/AbstractSessionHandler.php
@@ -35,8 +35,8 @@ abstract class AbstractSessionHandler implements \SessionHandlerInterface, \Sess
     public function open($savePath, $sessionName)
     {
         $this->sessionName = $sessionName;
-        if (!headers_sent() && !ini_get('session.cache_limiter') && '0' !== ini_get('session.cache_limiter')) {
-            header(sprintf('Cache-Control: max-age=%d, private, must-revalidate', 60 * (int) ini_get('session.cache_expire')));
+        if (!headers_sent() && !\ini_get('session.cache_limiter') && '0' !== \ini_get('session.cache_limiter')) {
+            header(sprintf('Cache-Control: max-age=%d, private, must-revalidate', 60 * (int) \ini_get('session.cache_expire')));
         }
 
         return true;
@@ -133,7 +133,7 @@ public function write($sessionId, $data)
     #[\ReturnTypeWillChange]
     public function destroy($sessionId)
     {
-        if (!headers_sent() && filter_var(ini_get('session.use_cookies'), \FILTER_VALIDATE_BOOLEAN)) {
+        if (!headers_sent() && filter_var(\ini_get('session.use_cookies'), \FILTER_VALIDATE_BOOLEAN)) {
             if (!$this->sessionName) {
                 throw new \LogicException(sprintf('Session name cannot be empty, did you forget to call "parent::open()" in "%s"?.', static::class));
             }
@@ -148,7 +148,7 @@ public function destroy($sessionId)
              */
             if (null === $cookie || isset($_COOKIE[$this->sessionName])) {
                 if (\PHP_VERSION_ID < 70300) {
-                    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));
+                    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));
                 } else {
                     $params = session_get_cookie_params();
                     unset($params['lifetime']);
diff --git a/Session/Storage/Handler/MongoDbSessionHandler.php b/Session/Storage/Handler/MongoDbSessionHandler.php
@@ -116,7 +116,7 @@ public function gc($maxlifetime)
      */
     protected function doWrite($sessionId, $data)
     {
-        $expiry = new \MongoDB\BSON\UTCDateTime((time() + (int) ini_get('session.gc_maxlifetime')) * 1000);
+        $expiry = new \MongoDB\BSON\UTCDateTime((time() + (int) \ini_get('session.gc_maxlifetime')) * 1000);
 
         $fields = [
             $this->options['time_field'] => new \MongoDB\BSON\UTCDateTime(),
@@ -139,7 +139,7 @@ protected function doWrite($sessionId, $data)
     #[\ReturnTypeWillChange]
     public function updateTimestamp($sessionId, $data)
     {
-        $expiry = new \MongoDB\BSON\UTCDateTime((time() + (int) ini_get('session.gc_maxlifetime')) * 1000);
+        $expiry = new \MongoDB\BSON\UTCDateTime((time() + (int) \ini_get('session.gc_maxlifetime')) * 1000);
 
         $this->getCollection()->updateOne(
             [$this->options['id_field'] => $sessionId],
diff --git a/Session/Storage/Handler/NativeFileSessionHandler.php b/Session/Storage/Handler/NativeFileSessionHandler.php
@@ -31,7 +31,7 @@ class NativeFileSessionHandler extends \SessionHandler
     public function __construct(string $savePath = null)
     {
         if (null === $savePath) {
-            $savePath = ini_get('session.save_path');
+            $savePath = \ini_get('session.save_path');
         }
 
         $baseDir = $savePath;
diff --git a/Session/Storage/Handler/PdoSessionHandler.php b/Session/Storage/Handler/PdoSessionHandler.php
@@ -328,7 +328,7 @@ protected function doDestroy($sessionId)
      */
     protected function doWrite($sessionId, $data)
     {
-        $maxlifetime = (int) ini_get('session.gc_maxlifetime');
+        $maxlifetime = (int) \ini_get('session.gc_maxlifetime');
 
         try {
             // We use a single MERGE SQL query when supported by the database.
@@ -375,7 +375,7 @@ protected function doWrite($sessionId, $data)
     #[\ReturnTypeWillChange]
     public function updateTimestamp($sessionId, $data)
     {
-        $expiry = time() + (int) ini_get('session.gc_maxlifetime');
+        $expiry = time() + (int) \ini_get('session.gc_maxlifetime');
 
         try {
             $updateStmt = $this->pdo->prepare(
@@ -650,7 +650,7 @@ protected function doRead($sessionId)
                 throw new \RuntimeException('Failed to read session: INSERT reported a duplicate id but next SELECT did not return any data.');
             }
 
-            if (!filter_var(ini_get('session.use_strict_mode'), \FILTER_VALIDATE_BOOLEAN) && self::LOCK_TRANSACTIONAL === $this->lockMode && 'sqlite' !== $this->driver) {
+            if (!filter_var(\ini_get('session.use_strict_mode'), \FILTER_VALIDATE_BOOLEAN) && self::LOCK_TRANSACTIONAL === $this->lockMode && 'sqlite' !== $this->driver) {
                 // In strict mode, session fixation is not possible: new sessions always start with a unique
                 // random id, so that concurrency is not possible and this code path can be skipped.
                 // 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
     protected function getConnection()
     {
         if (null === $this->pdo) {
-            $this->connect($this->dsn ?: ini_get('session.save_path'));
+            $this->connect($this->dsn ?: \ini_get('session.save_path'));
         }
 
         return $this->pdo;
diff --git a/Session/Storage/Handler/RedisSessionHandler.php b/Session/Storage/Handler/RedisSessionHandler.php
@@ -79,7 +79,7 @@ protected function doRead($sessionId): string
      */
     protected function doWrite($sessionId, $data): bool
     {
-        $result = $this->redis->setEx($this->prefix.$sessionId, (int) ($this->ttl ?? ini_get('session.gc_maxlifetime')), $data);
+        $result = $this->redis->setEx($this->prefix.$sessionId, (int) ($this->ttl ?? \ini_get('session.gc_maxlifetime')), $data);
 
         return $result && !$result instanceof ErrorInterface;
     }
@@ -120,6 +120,6 @@ public function gc($maxlifetime)
     #[\ReturnTypeWillChange]
     public function updateTimestamp($sessionId, $data)
     {
-        return (bool) $this->redis->expire($this->prefix.$sessionId, (int) ($this->ttl ?? ini_get('session.gc_maxlifetime')));
+        return (bool) $this->redis->expire($this->prefix.$sessionId, (int) ($this->ttl ?? \ini_get('session.gc_maxlifetime')));
     }
 }
diff --git a/Session/Storage/MetadataBag.php b/Session/Storage/MetadataBag.php
@@ -163,6 +163,6 @@ private function stampCreated(int $lifetime = null): void
     {
         $timeStamp = time();
         $this->meta[self::CREATED] = $this->meta[self::UPDATED] = $this->lastUsed = $timeStamp;
-        $this->meta[self::LIFETIME] = $lifetime ?? (int) ini_get('session.cookie_lifetime');
+        $this->meta[self::LIFETIME] = $lifetime ?? (int) \ini_get('session.cookie_lifetime');
     }
 }
diff --git a/Session/Storage/NativeSessionStorage.php b/Session/Storage/NativeSessionStorage.php
@@ -148,7 +148,7 @@ public function start()
             throw new \RuntimeException('Failed to start the session: already started by PHP.');
         }
 
-        if (filter_var(ini_get('session.use_cookies'), \FILTER_VALIDATE_BOOLEAN) && headers_sent($file, $line)) {
+        if (filter_var(\ini_get('session.use_cookies'), \FILTER_VALIDATE_BOOLEAN) && headers_sent($file, $line)) {
             throw new \RuntimeException(sprintf('Failed to start the session because headers have already been sent by "%s" at line %d.', $file, $line));
         }
 
@@ -221,7 +221,7 @@ public function regenerate($destroy = false, $lifetime = null)
             return false;
         }
 
-        if (null !== $lifetime && $lifetime != ini_get('session.cookie_lifetime')) {
+        if (null !== $lifetime && $lifetime != \ini_get('session.cookie_lifetime')) {
             $this->save();
             ini_set('session.cookie_lifetime', $lifetime);
             $this->start();
diff --git a/Session/Storage/Proxy/SessionHandlerProxy.php b/Session/Storage/Proxy/SessionHandlerProxy.php
@@ -22,7 +22,7 @@ public function __construct(\SessionHandlerInterface $handler)
     {
         $this->handler = $handler;
         $this->wrapper = $handler instanceof \SessionHandler;
-        $this->saveHandlerName = $this->wrapper ? ini_get('session.save_handler') : 'user';
+        $this->saveHandlerName = $this->wrapper ? \ini_get('session.save_handler') : 'user';
     }
 
     /**
diff --git a/Tests/File/UploadedFileTest.php b/Tests/File/UploadedFileTest.php
@@ -27,7 +27,7 @@ class UploadedFileTest extends TestCase
 {
     protected function setUp(): void
     {
-        if (!ini_get('file_uploads')) {
+        if (!\ini_get('file_uploads')) {
             $this->markTestSkipped('file_uploads is disabled in php.ini');
         }
     }
@@ -367,7 +367,7 @@ public function testGetMaxFilesize()
 
         $this->assertGreaterThan(0, $size);
 
-        if (0 === (int) ini_get('post_max_size') && 0 === (int) ini_get('upload_max_filesize')) {
+        if (0 === (int) \ini_get('post_max_size') && 0 === (int) \ini_get('upload_max_filesize')) {
             $this->assertSame(\PHP_INT_MAX, $size);
         }
     }
diff --git a/Tests/Session/Storage/Handler/AbstractRedisSessionHandlerTestCase.php b/Tests/Session/Storage/Handler/AbstractRedisSessionHandlerTestCase.php
@@ -99,7 +99,7 @@ public function testUseSessionGcMaxLifetimeAsTimeToLive()
         $this->storage->write('id', 'data');
         $ttl = $this->redisClient->ttl(self::PREFIX.'id');
 
-        $this->assertLessThanOrEqual(ini_get('session.gc_maxlifetime'), $ttl);
+        $this->assertLessThanOrEqual(\ini_get('session.gc_maxlifetime'), $ttl);
         $this->assertGreaterThanOrEqual(0, $ttl);
     }
 
diff --git a/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php b/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
@@ -121,7 +121,7 @@ public function testWrite()
                 $this->assertEquals(['upsert' => true], $options);
 
                 $data = $updateData['$set'];
-                $expectedExpiry = time() + (int) ini_get('session.gc_maxlifetime');
+                $expectedExpiry = time() + (int) \ini_get('session.gc_maxlifetime');
                 $this->assertInstanceOf(\MongoDB\BSON\Binary::class, $data[$this->options['data_field']]);
                 $this->assertEquals('bar', $data[$this->options['data_field']]->getData());
                 $this->assertInstanceOf(\MongoDB\BSON\UTCDateTime::class, $data[$this->options['time_field']]);
diff --git a/Tests/Session/Storage/Handler/NativeFileSessionHandlerTest.php b/Tests/Session/Storage/Handler/NativeFileSessionHandlerTest.php
@@ -29,10 +29,10 @@ public function testConstruct()
     {
         new NativeSessionStorage(['name' => 'TESTING'], new NativeFileSessionHandler(sys_get_temp_dir()));
 
-        $this->assertEquals('user', ini_get('session.save_handler'));
+        $this->assertEquals('user', \ini_get('session.save_handler'));
 
-        $this->assertEquals(sys_get_temp_dir(), ini_get('session.save_path'));
-        $this->assertEquals('TESTING', ini_get('session.name'));
+        $this->assertEquals(sys_get_temp_dir(), \ini_get('session.save_path'));
+        $this->assertEquals('TESTING', \ini_get('session.name'));
     }
 
     /**
@@ -41,7 +41,7 @@ public function testConstruct()
     public function testConstructSavePath($savePath, $expectedSavePath, $path)
     {
         new NativeFileSessionHandler($savePath);
-        $this->assertEquals($expectedSavePath, ini_get('session.save_path'));
+        $this->assertEquals($expectedSavePath, \ini_get('session.save_path'));
         $this->assertDirectoryExists(realpath($path));
 
         rmdir($path);
@@ -66,9 +66,9 @@ public function testConstructException()
 
     public function testConstructDefault()
     {
-        $path = ini_get('session.save_path');
+        $path = \ini_get('session.save_path');
         new NativeSessionStorage(['name' => 'TESTING'], new NativeFileSessionHandler());
 
-        $this->assertEquals($path, ini_get('session.save_path'));
+        $this->assertEquals($path, \ini_get('session.save_path'));
     }
 }
diff --git a/Tests/Session/Storage/Handler/NullSessionHandlerTest.php b/Tests/Session/Storage/Handler/NullSessionHandlerTest.php
@@ -29,7 +29,7 @@ class NullSessionHandlerTest extends TestCase
     public function testSaveHandlers()
     {
         $this->getStorage();
-        $this->assertEquals('user', ini_get('session.save_handler'));
+        $this->assertEquals('user', \ini_get('session.save_handler'));
     }
 
     public function testSession()
diff --git a/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php b/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
@@ -147,7 +147,7 @@ public function testReadConvertsStreamToString()
 
     public function testReadLockedConvertsStreamToString()
     {
-        if (filter_var(ini_get('session.use_strict_mode'), \FILTER_VALIDATE_BOOLEAN)) {
+        if (filter_var(\ini_get('session.use_strict_mode'), \FILTER_VALIDATE_BOOLEAN)) {
             $this->markTestSkipped('Strict mode needs no locking for new sessions.');
         }
 
diff --git a/Tests/Session/Storage/Handler/SessionHandlerFactoryTest.php b/Tests/Session/Storage/Handler/SessionHandlerFactoryTest.php
@@ -33,15 +33,15 @@ public function testCreateHandler(string $connectionDSN, string $expectedPath, s
         $handler = SessionHandlerFactory::createHandler($connectionDSN);
 
         $this->assertInstanceOf($expectedHandlerType, $handler);
-        $this->assertEquals($expectedPath, ini_get('session.save_path'));
+        $this->assertEquals($expectedPath, \ini_get('session.save_path'));
     }
 
     public function provideConnectionDSN(): array
     {
         $base = sys_get_temp_dir();
 
         return [
-            'native file handler using save_path from php.ini' => ['connectionDSN' => 'file://', 'expectedPath' => ini_get('session.save_path'), 'expectedHandlerType' => StrictSessionHandler::class],
+            'native file handler using save_path from php.ini' => ['connectionDSN' => 'file://', 'expectedPath' => \ini_get('session.save_path'), 'expectedHandlerType' => StrictSessionHandler::class],
             'native file handler using provided save_path' => ['connectionDSN' => 'file://'.$base.'/session/storage', 'expectedPath' => $base.'/session/storage', 'expectedHandlerType' => StrictSessionHandler::class],
         ];
     }
diff --git a/Tests/Session/Storage/NativeSessionStorageTest.php b/Tests/Session/Storage/NativeSessionStorageTest.php
@@ -130,7 +130,7 @@ public function testRegenerateWithCustomLifetime()
         $storage->regenerate(false, $lifetime);
         $this->assertNotEquals($id, $storage->getId());
         $this->assertEquals(11, $storage->getBag('attributes')->get('legs'));
-        $this->assertEquals($lifetime, ini_get('session.cookie_lifetime'));
+        $this->assertEquals($lifetime, \ini_get('session.cookie_lifetime'));
     }
 
     public function testSessionGlobalIsUpToDateAfterIdRegeneration()
@@ -156,15 +156,15 @@ public function testDefaultSessionCacheLimiter()
         $this->iniSet('session.cache_limiter', 'nocache');
 
         new NativeSessionStorage();
-        $this->assertEquals('', ini_get('session.cache_limiter'));
+        $this->assertEquals('', \ini_get('session.cache_limiter'));
     }
 
     public function testExplicitSessionCacheLimiter()
     {
         $this->iniSet('session.cache_limiter', 'nocache');
 
         new NativeSessionStorage(['cache_limiter' => 'public']);
-        $this->assertEquals('public', ini_get('session.cache_limiter'));
+        $this->assertEquals('public', \ini_get('session.cache_limiter'));
     }
 
     public function testCookieOptions()
@@ -201,8 +201,8 @@ public function testSessionOptions()
 
         $this->getStorage($options);
 
-        $this->assertSame('a=href', ini_get('url_rewriter.tags'));
-        $this->assertSame('200', ini_get('session.cache_expire'));
+        $this->assertSame('a=href', \ini_get('url_rewriter.tags'));
+        $this->assertSame('200', \ini_get('session.cache_expire'));
     }
 
     public function testSetSaveHandlerException()

Original file line number	Diff line number	Diff line change
`@@ -243,8 +243,8 @@ public function move($directory, $name = null)`
`243`	`243`	`*/`
`244`	`244`	`public static function getMaxFilesize()`
`245`	`245`	`{`
`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'));`
`248`	`248`
`249`	`249`	`return min($sizePostMax ?: \PHP_INT_MAX, $sizeUploadMax ?: \PHP_INT_MAX);`
`250`	`250`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ class NativeFileSessionHandler extends \SessionHandler`
`31`	`31`	`public function __construct(string $savePath = null)`
`32`	`32`	`{`
`33`	`33`	`if (null === $savePath) {`
`34`		`- $savePath = ini_get('session.save_path');`
	`34`	`+ $savePath = \ini_get('session.save_path');`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`$baseDir = $savePath;`
Original file line number	Diff line number	Diff line change
`@@ -328,7 +328,7 @@ protected function doDestroy($sessionId)`
`328`	`328`	`*/`
`329`	`329`	`protected function doWrite($sessionId, $data)`
`330`	`330`	`{`
`331`		`- $maxlifetime = (int) ini_get('session.gc_maxlifetime');`
	`331`	`+ $maxlifetime = (int) \ini_get('session.gc_maxlifetime');`
`332`	`332`
`333`	`333`	`try {`
`334`	`334`	`// We use a single MERGE SQL query when supported by the database.`
`@@ -375,7 +375,7 @@ protected function doWrite($sessionId, $data)`
`375`	`375`	`#[\ReturnTypeWillChange]`
`376`	`376`	`public function updateTimestamp($sessionId, $data)`
`377`	`377`	`{`
`378`		`- $expiry = time() + (int) ini_get('session.gc_maxlifetime');`
	`378`	`+ $expiry = time() + (int) \ini_get('session.gc_maxlifetime');`
`379`	`379`
`380`	`380`	`try {`
`381`	`381`	`$updateStmt = $this->pdo->prepare(`
`@@ -650,7 +650,7 @@ protected function doRead($sessionId)`
`650`	`650`	`throw new \RuntimeException('Failed to read session: INSERT reported a duplicate id but next SELECT did not return any data.');`
`651`	`651`	`}`
`652`	`652`
`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) {`
`654`	`654`	`// In strict mode, session fixation is not possible: new sessions always start with a unique`
`655`	`655`	`// random id, so that concurrency is not possible and this code path can be skipped.`
`656`	`656`	`// 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`
`898`	`898`	`protected function getConnection()`
`899`	`899`	`{`
`900`	`900`	`if (null === $this->pdo) {`
`901`		`- $this->connect($this->dsn ?: ini_get('session.save_path'));`
	`901`	`+ $this->connect($this->dsn ?: \ini_get('session.save_path'));`
`902`	`902`	`}`
`903`	`903`
`904`	`904`	`return $this->pdo;`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ protected function doRead($sessionId): string`
`79`	`79`	`*/`
`80`	`80`	`protected function doWrite($sessionId, $data): bool`
`81`	`81`	`{`
`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);`
`83`	`83`
`84`	`84`	`return $result && !$result instanceof ErrorInterface;`
`85`	`85`	`}`
`@@ -120,6 +120,6 @@ public function gc($maxlifetime)`
`120`	`120`	`#[\ReturnTypeWillChange]`
`121`	`121`	`public function updateTimestamp($sessionId, $data)`
`122`	`122`	`{`
`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')));`
`124`	`124`	`}`
`125`	`125`	`}`
Original file line number	Diff line number	Diff line change
`@@ -163,6 +163,6 @@ private function stampCreated(int $lifetime = null): void`
`163`	`163`	`{`
`164`	`164`	`$timeStamp = time();`
`165`	`165`	`$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');`
`167`	`167`	`}`
`168`	`168`	`}`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ public function start()`
`148`	`148`	`throw new \RuntimeException('Failed to start the session: already started by PHP.');`
`149`	`149`	`}`
`150`	`150`
`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)) {`
`152`	`152`	`throw new \RuntimeException(sprintf('Failed to start the session because headers have already been sent by "%s" at line %d.', $file, $line));`
`153`	`153`	`}`
`154`	`154`
`@@ -221,7 +221,7 @@ public function regenerate($destroy = false, $lifetime = null)`
`221`	`221`	`return false;`
`222`	`222`	`}`
`223`	`223`
`224`		`- if (null !== $lifetime && $lifetime != ini_get('session.cookie_lifetime')) {`
	`224`	`+ if (null !== $lifetime && $lifetime != \ini_get('session.cookie_lifetime')) {`
`225`	`225`	`$this->save();`
`226`	`226`	`ini_set('session.cookie_lifetime', $lifetime);`
`227`	`227`	`$this->start();`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public function __construct(\SessionHandlerInterface $handler)`
`22`	`22`	`{`
`23`	`23`	`$this->handler = $handler;`
`24`	`24`	`$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';`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`/**`