merged branch drm/master (PR #1615)

fabpot · fabpot · commit 29460becde71 · 2011-07-10T15:34:36.000+02:00
Commits ------- 9714cfc Fixes fatal error when intl module is not installed. Discussion ---------- Session instantiation breaks with Fatal error if intl module is not installed. A check for class_exists in setPhpDefaultLocale() fixes this, though I got the feeling it should be resolved with a proxy or subscriber object; setPhpDefaultLocale feels like a hack now. --------------------------------------------------------------------------- by stealth35 at 2011/07/10 06:32:43 -0700 Locale::setDefault don't throw any exception Maybe just : ```php if (class_exists('Locale', false)) { return \Locale::setDefault($this->locale); } else { return false; } ```
diff --git a/src/Symfony/Component/HttpFoundation/Session.php b/src/Symfony/Component/HttpFoundation/Session.php
@@ -355,10 +355,14 @@ public function unserialize($serialized)
 
     private function setPhpDefaultLocale($locale)
     {
+        // if either the class Locale doesn't exist, or an exception is thrown when
+        // setting the default locale, the intl module is not installed, and
+        // the call can be ignored:
         try {
-            \Locale::setDefault($this->locale);
+            if (class_exists('Locale', false)) {
+                \Locale::setDefault($locale);
+            }
         } catch (\Exception $e) {
-            // means that intl is not installed.
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -355,10 +355,14 @@ public function unserialize($serialized)`
`355`	`355`
`356`	`356`	`private function setPhpDefaultLocale($locale)`
`357`	`357`	`{`
	`358`	`+ // if either the class Locale doesn't exist, or an exception is thrown when`
	`359`	`+ // setting the default locale, the intl module is not installed, and`
	`360`	`+ // the call can be ignored:`
`358`	`361`	`try {`
`359`		`- \Locale::setDefault($this->locale);`
	`362`	`+ if (class_exists('Locale', false)) {`
	`363`	`+ \Locale::setDefault($locale);`
	`364`	`+ }`
`360`	`365`	`} catch (\Exception $e) {`
`361`		`- // means that intl is not installed.`
`362`	`366`	`}`
`363`	`367`	`}`
`364`	`368`	`}`