Fix #6 #7 #9 - Add callbacks feature

src/Drivers/AbstractDetector.php

@@ -96,7 +96,7 @@ public function setLanguages(array $languages)
      */
     public function setDefaultSegment($segment = 0)
     {
-        $this->segment = $segment;
+        $this->segment = (int) $segment;
     }
 
     /**

src/LanguageDetector.php

@@ -26,9 +26,9 @@ class LanguageDetector implements LanguageDetectorInterface
     protected $driver;
 
     /**
-     * @var Closure
+     * @var array
      */
-    protected $applyLocaleCallback;
+    protected $callbacks = [];
 
     /**
      * @param Translator $translator
@@ -95,26 +95,27 @@ public function apply($locale)
     {
         $this->translator->setLocale($locale);
 
-        call_user_func($this->getApplyLocaleCallback(), $locale, $this);
+        $this->applyCallbacks($locale);
     }
 
     /**
-     * Get the Closure to be called after locale was applied.
-     *
-     * @return Closure
+     * Add a callback to call after applying the detected locale.
+     * @param Closure $callback
      */
-    public function getApplyLocaleCallback()
-    {
-        return is_callable($this->applyLocaleCallback) ? $this->applyLocaleCallback : function () {};
+    public function addCallback(Closure $callback){
+        $this->callbacks[] = $callback;
     }
 
     /**
-     * Set the Closure to be called after locale was applied.
-     * @param Closure $callback
+     * Call all registered callbacks.
+     *
+     * @param $language
      */
-    public function setApplyLocaleCallback(Closure $callback)
+    protected function applyCallbacks($language)
     {
-        $this->applyLocaleCallback = $callback;
+        foreach($this->callbacks as $callback) {
+            call_user_func($callback, $language, $this);
+        }
     }
 
     /**

src/Providers/LanguageDetectorServiceProvider.php

@@ -156,7 +156,7 @@ function () use ($driver) {
                 );
 
                 if (method_exists($this->app, 'setLocale')) {
-                    $detector->setApplyLocaleCallback(function ($locale, $driver) {
+                    $detector->addCallback(function ($locale) {
                         $this->app->setLocale($locale);
                     });
                 }