Infra-Mirrors/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-10-01 01:36:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Prevented mulitple hypens incorrectly in slug

Browse Source 
Added test to check slug format.
Fixes #589
This commit is contained in:
Dan Brown 2017-11-11 16:27:29 +00:00
parent df4d4f30f1
commit 711ba258f1
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Repos/EntityRepo.php
View File

@ -553,8 +553,9 @@ class EntityRepo
*/ */
protected function nameToSlug($name) protected function nameToSlug($name)
{ {
$slug = str_replace(' ', '-', mb_strtolower($name)); $slug = preg_replace('/[\+\/\\\?\@\}\{\.\,\=\[\]\#\&\!\*\'\;\:\$\%]/', '', mb_strtolower($name));
$slug = preg_replace('/[\+\/\\\?\@\}\{\.\,\=\[\]\#\&\!\*\'\;\:\$\%]/', '', $slug); $slug = preg_replace('/\s{2,}/', ' ', $slug);
$slug = str_replace(' ', '-', $slug);
if ($slug === "") $slug = substr(md5(rand(1, 500)), 0, 5); if ($slug === "") $slug = substr(md5(rand(1, 500)), 0, 5);
return $slug; return $slug;
} }

11
tests/Entity/EntityTest.php
View File

@ -11,7 +11,6 @@ class EntityTest extends BrowserKitTest
public function test_entity_creation() public function test_entity_creation()
{ {
// Test Creation // Test Creation
$book = $this->bookCreation(); $book = $this->bookCreation();
$chapter = $this->chapterCreation($book); $chapter = $this->chapterCreation($book);
@ -268,4 +267,14 @@ class EntityTest extends BrowserKitTest
} }
public function test_slug_format()
{
$entityRepo = app(EntityRepo::class);
$book = $entityRepo->createFromInput('book', [
'name' => 'PartA / PartB / PartC'
]);
$this->assertEquals('parta-partb-partc', $book->slug);
}
} }