Merge pull request #5 from nguyenk/3.0

Add SessionManager && fix wrong session initialisation in setLanguage

Author: nguyenk

src/Mouf/Utils/I18n/Fine/Language/SessionLanguageDetection.php

@@ -5,6 +5,7 @@
  * See the file LICENSE.txt for copying permission.
  */
 namespace Mouf\Utils\I18n\Fine\Language;
+use Mouf\Utils\Session\SessionManager\SessionManagerInterface;
 
 /**
  * Use fixed language detection if you want to always use the same language in your application.
@@ -16,16 +17,33 @@
  * @Component
  */
 class SessionLanguageDetection implements LanguageDetectionInterface {
-	
-	/**
+
+    /**
+     * @var SessionManagerInterface
+     */
+    private $sessionManager;
+
+    /**
+     * SessionLanguageDetection constructor.
+     * @param SessionManagerInterface $sessionManager
+     */
+    public function __construct(SessionManagerInterface $sessionManager)
+    {
+        $this->sessionManager = $sessionManager;
+    }
+
+
+    /**
 	 * Returns the language to use.
 	 * 
 	 * @see plugins/utils/i18n/fine/2.1/language/LanguageDetectionInterface::getLanguage()
 	 * @return string
 	 */
 	public function getLanguage() {
-        if (!session_id()){
-            session_start();
+        if (!session_id()) {
+            if ($this->sessionManager) {
+                $this->sessionManager->start();
+            }
         }
 		if (!isset($_SESSION['_fine_I18n_language'])){
 			$this->setLanguage('default');
@@ -39,6 +57,11 @@ public function getLanguage() {
 	 * @param string $language
 	 */
 	public function setLanguage($language) {
+        if (!session_id()) {
+            if ($this->sessionManager) {
+                $this->sessionManager->start();
+            }
+        }
 		$_SESSION['_fine_I18n_language'] = $language;
 	}
 }