Skip to content

Commit 3ab66e3

Browse files
committed
Revert "fix #126"
This reverts commit 66d0330.
1 parent 66d0330 commit 3ab66e3

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

src/Avatar.php

+2-4
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,7 @@ public function create($name)
116116
{
117117
$this->name = $name;
118118

119-
$this->setForeground($this->getRandomForeground());
120-
$this->setBackground($this->getRandomBackground());
121-
$this->setFont($this->getRandomFont());
119+
$this->initTheme();
122120

123121
return $this;
124122
}
@@ -420,7 +418,7 @@ protected function getRandomElement($array, $default)
420418

421419
$name = $this->name;
422420
if (strlen($name) === 0) {
423-
$name = 'laravolt';
421+
$name = chr(rand(65, 90));
424422
}
425423

426424
if (count($array) == 0) {

tests/AvatarPhpTest.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,12 @@ public function it_can_resolve_random_themes_and_then_overrides()
9898
'theme' => '*',
9999
'themes' => [
100100
'dark' => [
101-
'backgrounds' => ['#000000'],
102-
'foregrounds' => ['#EEEEEE'],
101+
'backgrounds' => ['#000000', '#111111'],
102+
'foregrounds' => ['#EEEEEE', '#FFFFFF'],
103103
],
104104
'light' => [
105-
'backgrounds' => ['#FFFFFF'],
106-
'foregrounds' => ['#000000'],
105+
'backgrounds' => ['#FFFFFF', '#EEEEEE'],
106+
'foregrounds' => ['#000000', '#111111'],
107107
],
108108
]
109109
];
@@ -113,8 +113,8 @@ public function it_can_resolve_random_themes_and_then_overrides()
113113
$avatar1 = new \Laravolt\Avatar\Avatar($config);
114114
$avatar1->create($name1)->buildAvatar();
115115

116-
$this->assertEquals('#FFFFFF', $avatar1->getAttribute('background'));
117-
$this->assertEquals('#000000', $avatar1->getAttribute('foreground'));
116+
$this->assertEquals('#000000', $avatar1->getAttribute('background'));
117+
$this->assertEquals('#EEEEEE', $avatar1->getAttribute('foreground'));
118118

119119
$avatar1->setTheme('light')->buildAvatar();
120120
$this->assertEquals('#FFFFFF', $avatar1->getAttribute('background'));

0 commit comments

Comments
 (0)