ulysia/szurubooru
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Removed IDs from tags.json

Browse source
This commit is contained in:
Marcin Kurczewski 2014-10-15 15:58:48 +02:00
parent 0d50550c43
commit 850e496215
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Services/TagService.php
View file

@ -73,10 +73,12 @@ class TagService
$tags = []; $tags = [];
foreach ($this->tagDao->findAll() as $tag) foreach ($this->tagDao->findAll() as $tag)
{ {
$tags[$tag->getId()] = [ $item = [
'name' => $tag->getName(), 'name' => $tag->getName(),
'usages' => $tag->getUsages(), 'usages' => $tag->getUsages(),
'banned' => $tag->isBanned()]; 'banned' => $tag->isBanned(),
];
$tags[] = $item;
} }
$json = json_encode($tags); $json = json_encode($tags);
$this->fileDao->save('tags.json', $json); $this->fileDao->save('tags.json', $json);

4
tests/Services/TagServiceTest.php
View file

@ -78,7 +78,7 @@ final class TagServiceTest extends AbstractDatabaseTestCase
$tagService = $this->getTagService(); $tagService = $this->getTagService();
$tagService->createTags([$tag1]); $tagService->createTags([$tag1]);
$tagService->exportJson(); $tagService->exportJson();
$this->assertEquals('{"1":{"name":"test","usages":0,"banned":false}}', $fileDao->load('tags.json')); $this->assertEquals('[{"name":"test","usages":0,"banned":false}]', $fileDao->load('tags.json'));
} }
public function testExportMultiple() public function testExportMultiple()
@ -94,7 +94,7 @@ final class TagServiceTest extends AbstractDatabaseTestCase
$tagService = $this->getTagService(); $tagService = $this->getTagService();
$tagService->createTags([$tag1, $tag2]); $tagService->createTags([$tag1, $tag2]);
$tagService->exportJson(); $tagService->exportJson();
$this->assertEquals('{"1":{"name":"test1","usages":0,"banned":false},"2":{"name":"test2","usages":0,"banned":true}}', $fileDao->load('tags.json')); $this->assertEquals('[{"name":"test1","usages":0,"banned":false},{"name":"test2","usages":0,"banned":true}]', $fileDao->load('tags.json'));
} }
private function getPublicFileDao() private function getPublicFileDao()