refactor

laravolt · Jun 2, 2017 · 7ab8f07 · 7ab8f07
1 parent a94a1f0
commit 7ab8f07
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/src/Avatar.php b/src/Avatar.php
@@ -77,7 +77,10 @@ public function __construct(array $config, Repository $cache, InitialGenerator $
         $this->borderColor = $config['border']['color'];
 
         $this->cache = $cache;
-        $this->initialGenerator = $initialGenerator->setUppercase($config['uppercase']);
+        $this->initialGenerator = $initialGenerator;
+
+        $this->initialGenerator->setUppercase($config['uppercase']);
+        $this->initialGenerator->setAscii($config['ascii']);
     }
 
     /**

diff --git a/src/InitialGenerator.php b/src/InitialGenerator.php
@@ -51,15 +51,11 @@ public function setName($name)
         }
 
         $this->name = $name;
-
-        return $this;
     }
 
     public function setLength($length = 2)
     {
         $this->length = $length;
-
-        return $this;
     }
 
     public function setAscii($ascii)
@@ -69,15 +65,11 @@ public function setAscii($ascii)
         if ($this->ascii) {
             $this->name = $this->name->toAscii();
         }
-
-        return $this;
     }
 
     public function setUppercase($uppercase)
     {
         $this->uppercase = $uppercase;
-
-        return $this;
     }
 
     public function getInitial()

diff --git a/tests/AvatarTest.php b/tests/AvatarTest.php
@@ -12,7 +12,8 @@ public function it_can_instantiated()
 
         $generator = Mockery::mock('Laravolt\Avatar\InitialGenerator');
         $generator->shouldReceive('getInitial')->andReturn('AB');
-        $generator->shouldReceive('setUppercase')->andReturnSelf();
+        $generator->shouldReceive('setUppercase');
+        $generator->shouldReceive('setAscii');
 
         new \Laravolt\Avatar\Avatar([], $cache, $generator);
     }
@@ -40,6 +41,7 @@ public function it_can_override_attributes_when_instantiated()
         $generator = Mockery::mock('Laravolt\Avatar\InitialGenerator');
         $generator->shouldReceive('getInitial')->andReturn('AB');
         $generator->shouldReceive('setUppercase');
+        $generator->shouldReceive('setAscii');
 
         $avatar = new \Laravolt\Avatar\Avatar($config, $cache, $generator);
 
@@ -66,7 +68,8 @@ public function it_can_override_attributes_after_set_name()
         $generator->shouldReceive('setName')->andReturnSelf();
         $generator->shouldReceive('setLength');
         $generator->shouldReceive('getInitial')->andReturn('A');
-        $generator->shouldReceive('setUppercase')->andReturnSelf();
+        $generator->shouldReceive('setUppercase');
+        $generator->shouldReceive('setAscii');
         $generator->shouldReceive('base_path');
         $config = ['backgrounds' => ['#000000', '#111111'], 'foregrounds' => ['#EEEEEE', '#FFFFFF']];
 
@@ -90,7 +93,8 @@ public function it_has_correct_random_background()
         $cache = Mockery::mock('Illuminate\Contracts\Cache\Repository');
 
         $generator = Mockery::mock('Laravolt\Avatar\InitialGenerator');
-        $generator->shouldReceive('setUppercase')->andReturnSelf();
+        $generator->shouldReceive('setUppercase');
+        $generator->shouldReceive('setAscii');
 
         $avatar = new \Laravolt\Avatar\Avatar($config, $cache, $generator);
         $avatar->setFontFolder(['fonts/']);
@@ -119,7 +123,8 @@ public function it_has_different_random_background()
         $cache = Mockery::mock('Illuminate\Contracts\Cache\Repository');
 
         $generator = Mockery::mock('Laravolt\Avatar\InitialGenerator');
-        $generator->shouldReceive('setUppercase')->andReturnSelf();
+        $generator->shouldReceive('setUppercase');
+        $generator->shouldReceive('setAscii');
 
         $name1 = 'AA';
         $name2 = 'AAA';