bug #42753 Cast ini_get to an integer to match expected type (natewiebe13)

fabpot · fabpot · commit ecf55abce0b0 · 2021-08-26T17:51:27.000+02:00
This PR was squashed before being merged into the 4.4 branch. Discussion ---------- Cast ini_get to an integer to match expected type | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | n/a | License | MIT | Doc PR | n/a The lifetime value is expected to be an integer, but this is set as a string when using the ini value from `session.cookie_lifetime`. This makes `getLifetime()` return a string instead of an int as the ``@return`` states. Commits ------- c56470d Cast ini_get to an integer to match expected type
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/MetadataBag.php b/src/Symfony/Component/HttpFoundation/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 ?? ini_get('session.cookie_lifetime');
+        $this->meta[self::LIFETIME] = $lifetime ?? (int) ini_get('session.cookie_lifetime');
     }
 }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/MetadataBagTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/MetadataBagTest.php
@@ -136,4 +136,14 @@ public function testDoesNotSkipLastUsedUpdate()
 
         $this->assertEquals($timeStamp, $sessionMetadata[MetadataBag::UPDATED]);
     }
+
+    public function testLifetimeIsInt()
+    {
+        $sessionMetadata = [];
+
+        $bag = new MetadataBag();
+        $bag->initialize($sessionMetadata);
+
+        $this->assertIsInt($bag->getLifetime());
+    }
 }

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 ?? 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
`@@ -136,4 +136,14 @@ public function testDoesNotSkipLastUsedUpdate()`
`136`	`136`
`137`	`137`	`$this->assertEquals($timeStamp, $sessionMetadata[MetadataBag::UPDATED]);`
`138`	`138`	`}`
	`139`	`+`
	`140`	`+ public function testLifetimeIsInt()`
	`141`	`+ {`
	`142`	`+ $sessionMetadata = [];`
	`143`	`+`
	`144`	`+ $bag = new MetadataBag();`
	`145`	`+ $bag->initialize($sessionMetadata);`
	`146`	`+`
	`147`	`+ $this->assertIsInt($bag->getLifetime());`
	`148`	`+ }`
`139`	`149`	`}`