Reduce number of namespace definitions

BenConstable · Jun 7, 2016 · 24a681a · 24a681a
1 parent 14ec8e3
commit 24a681a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 27 deletions.
diff --git a/src/Localize/DeterminerManager.php b/src/Localize/DeterminerManager.php
@@ -4,12 +4,7 @@
 
 use Illuminate\Support\Manager;
 use Illuminate\Support\Collection;
-use BenConstable\Localize\Determiners\Cookie as CookieDeterminer;
-use BenConstable\Localize\Determiners\Host as HostDeterminer;
-use BenConstable\Localize\Determiners\Parameter as ParameterDeterminer;
-use BenConstable\Localize\Determiners\Header as HeaderDeterminer;
-use BenConstable\Localize\Determiners\Session as SessionDeterminer;
-use BenConstable\Localize\Determiners\Stack as StackDeterminer;
+use BenConstable\Localize\Determiners;
 
 /**
  * Manager class for the different locale determiners.
@@ -23,7 +18,7 @@ class DeterminerManager extends Manager
      */
     protected function createCookieDriver()
     {
-        $determiner = new CookieDeterminer(
+        $determiner = new Determiners\Cookie(
             $this->app['config']['localize-middleware']['cookie']
         );
 
@@ -39,7 +34,7 @@ protected function createCookieDriver()
      */
     protected function createHostDriver()
     {
-        $determiner = new HostDeterminer(
+        $determiner = new Determiners\Host(
             new Collection($this->app['config']['localize-middleware']['hosts'])
         );
 
@@ -55,7 +50,7 @@ protected function createHostDriver()
      */
     protected function createParameterDriver()
     {
-        $determiner = new ParameterDeterminer(
+        $determiner = new Determiners\Parameter(
             $this->app['config']['localize-middleware']['parameter']
         );
 
@@ -71,7 +66,7 @@ protected function createParameterDriver()
      */
     protected function createHeaderDriver()
     {
-        $determiner = new HeaderDeterminer(
+        $determiner = new Determiners\Header(
             $this->app['config']['localize-middleware']['header']
         );
 
@@ -87,7 +82,7 @@ protected function createHeaderDriver()
      */
     protected function createSessionDriver()
     {
-        $determiner = new SessionDeterminer(
+        $determiner = new Determiners\Session(
             $this->app['config']['localize-middleware']['session']
         );
 
@@ -111,7 +106,7 @@ protected function createStackDriver()
                 return $this->driver($driver)->setFallback(null);
             });
 
-        return (new StackDeterminer($determiners))
+        return (new Determiners\Stack($determiners))
             ->setFallback($this->app['config']['app']['fallback_locale']);
     }
 

diff --git a/tests/Localize/DeterminerManagerTest.php b/tests/Localize/DeterminerManagerTest.php
@@ -5,13 +5,7 @@
 use Mockery;
 use PHPUnit_Framework_TestCase;
 use BenConstable\Localize\DeterminerManager;
-use BenConstable\Localize\Determiners\DeterminerInterface;
-use BenConstable\Localize\Determiners\Cookie as CookieDeterminer;
-use BenConstable\Localize\Determiners\Host as HostDeterminer;
-use BenConstable\Localize\Determiners\Parameter as ParameterDeterminer;
-use BenConstable\Localize\Determiners\Header as HeaderDeterminer;
-use BenConstable\Localize\Determiners\Session as SessionDeterminer;
-use BenConstable\Localize\Determiners\Stack as StackDeterminer;
+use BenConstable\Localize\Determiners;
 
 class DeterminerManagerTest extends PHPUnit_Framework_TestCase
 {
@@ -38,35 +32,35 @@ public function testThatItCreatesACookieDeterminer()
     {
         $manager = new DeterminerManager($this->app);
 
-        $this->assertInstanceOf(CookieDeterminer::class, $manager->driver('cookie'));
+        $this->assertInstanceOf(Determiners\Cookie::class, $manager->driver('cookie'));
     }
 
     public function testThatItCreatesAHostDeterminer()
     {
         $manager = new DeterminerManager($this->app);
 
-        $this->assertInstanceOf(HostDeterminer::class, $manager->driver('host'));
+        $this->assertInstanceOf(Determiners\Host::class, $manager->driver('host'));
     }
 
     public function testThatItCreatesAParameterDeterminer()
     {
         $manager = new DeterminerManager($this->app);
 
-        $this->assertInstanceOf(ParameterDeterminer::class, $manager->driver('parameter'));
+        $this->assertInstanceOf(Determiners\Parameter::class, $manager->driver('parameter'));
     }
 
     public function testThatItCreatesASessionDeterminer()
     {
         $manager = new DeterminerManager($this->app);
 
-        $this->assertInstanceOf(SessionDeterminer::class, $manager->driver('session'));
+        $this->assertInstanceOf(Determiners\Session::class, $manager->driver('session'));
     }
 
     public function testThatItCreatesAHeaderDeterminer()
     {
         $manager = new DeterminerManager($this->app);
 
-        $this->assertInstanceOf(HeaderDeterminer::class, $manager->driver('header'));
+        $this->assertInstanceOf(Determiners\Header::class, $manager->driver('header'));
     }
 
     public function testThatItCreatesAStackDeterminer()
@@ -75,17 +69,17 @@ public function testThatItCreatesAStackDeterminer()
 
         $determiner = $manager->driver('stack');
 
-        $this->assertInstanceOf(StackDeterminer::class, $determiner);
+        $this->assertInstanceOf(Determiners\Stack::class, $determiner);
 
         $this->assertCount(1, $determiner->getDeterminers());
 
-        $this->assertInstanceOf(ParameterDeterminer::class, $determiner->getDeterminers()->first());
+        $this->assertInstanceOf(Determiners\Parameter::class, $determiner->getDeterminers()->first());
     }
 
     public function testThatItReturnsADefaultDeterminer()
     {
         $manager = new DeterminerManager($this->app);
 
-        $this->assertInstanceOf(DeterminerInterface::class, $manager->driver());
+        $this->assertInstanceOf(Determiners\DeterminerInterface::class, $manager->driver());
     }
 }