minor symfony#32215 [HttpFoundation] Throw exception when the "session" extension is not loaded (vudaltsov)

nicolas-grekas · nicolas-grekas · commit b6e8b17dc490 · 2019-06-28T14:47:57.000+02:00
This PR was squashed before being merged into the 3.4 branch (closes symfony#32215). Discussion ---------- [HttpFoundation] Throw exception when the "session" extension is not loaded | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | symfony#31305 | License | MIT Should I target `3.4` or `master` instead? This change does not alter behavior, but makes the failure more clear. Commits ------- b0c6630 [HttpFoundation] Throw exception when the \"session\" extension is not loaded
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -233,6 +233,10 @@ public function load(array $configs, ContainerBuilder $container)
         }
 
         if ($this->isConfigEnabled($container, $config['session'])) {
+            if (!\extension_loaded('session')) {
+                throw new \LogicException('PHP extension "session" is required.');
+            }
+
             $this->sessionConfigEnabled = true;
             $this->registerSessionConfiguration($config['session'], $container, $loader);
         }
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
@@ -100,6 +100,10 @@ class NativeSessionStorage implements SessionStorageInterface
      */
     public function __construct(array $options = [], $handler = null, MetadataBag $metaBag = null)
     {
+        if (!\extension_loaded('session')) {
+            throw new \LogicException('PHP extension "session" is required.');
+        }
+
         $options += [
             'cache_limiter' => '',
             'cache_expire' => 0,
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/PhpBridgeSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/PhpBridgeSessionStorage.php
@@ -24,6 +24,10 @@ class PhpBridgeSessionStorage extends NativeSessionStorage
      */
     public function __construct($handler = null, MetadataBag $metaBag = null)
     {
+        if (!\extension_loaded('session')) {
+            throw new \LogicException('PHP extension "session" is required.');
+        }
+
         $this->setMetadataBag($metaBag);
         $this->setSaveHandler($handler);
     }

Original file line number	Diff line number	Diff line change
`@@ -233,6 +233,10 @@ public function load(array $configs, ContainerBuilder $container)`
`233`	`233`	`}`
`234`	`234`
`235`	`235`	`if ($this->isConfigEnabled($container, $config['session'])) {`
	`236`	`+ if (!\extension_loaded('session')) {`
	`237`	`+ throw new \LogicException('PHP extension "session" is required.');`
	`238`	`+ }`
	`239`	`+`
`236`	`240`	`$this->sessionConfigEnabled = true;`
`237`	`241`	`$this->registerSessionConfiguration($config['session'], $container, $loader);`
`238`	`242`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,10 @@ class PhpBridgeSessionStorage extends NativeSessionStorage`
`24`	`24`	`*/`
`25`	`25`	`public function __construct($handler = null, MetadataBag $metaBag = null)`
`26`	`26`	`{`
	`27`	`+ if (!\extension_loaded('session')) {`
	`28`	`+ throw new \LogicException('PHP extension "session" is required.');`
	`29`	`+ }`
	`30`	`+`
`27`	`31`	`$this->setMetadataBag($metaBag);`
`28`	`32`	`$this->setSaveHandler($handler);`
`29`	`33`	`}`