mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-11-22 17:11:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3139 from Kdecherf/2502-tag-case

Browse source 
Ignore tag's case
This commit is contained in:
Jérémy Benoist 2017-09-03 20:25:15 +02:00 committed by GitHub
commit 3af5d41759
6 changed files with 111 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

103
app/DoctrineMigrations/Version20170719231144.php Normal file
View file

@ -0,0 +1,103 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Migrations\AbstractMigration;
use Doctrine\DBAL\Schema\Schema;
use Symfony\Component\DependencyInjection\ContainerAwareInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
* Changed tags to lowercase.
*/
class Version20170719231144 extends AbstractMigration implements ContainerAwareInterface
{
/**
* @var ContainerInterface
*/
private $container;
public function setContainer(ContainerInterface $container = null)
{
$this->container = $container;
}
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$this->skipIf($this->connection->getDatabasePlatform()->getName() === 'sqlite', 'Migration can only be executed safely on \'mysql\' or \'postgresql\'.');
// Find tags which need to be merged
$dupTags = $this->connection->query('
SELECT LOWER(label)
FROM ' . $this->getTable('tag') . '
GROUP BY LOWER(label)
HAVING COUNT(*) > 1'
);
$dupTags->execute();
foreach ($dupTags->fetchAll() as $duplicates) {
$label = $duplicates['LOWER(label)'];
// Retrieve all duplicate tags for a given tag
$tags = $this->connection->query('
SELECT id
FROM ' . $this->getTable('tag') . "
WHERE LOWER(label) = '" . $label . "'
ORDER BY id ASC"
);
$tags->execute();
$first = true;
$newId = null;
$ids = [];
foreach ($tags->fetchAll() as $tag) {
// Ignore the first tag as we use it as the new reference tag
if ($first) {
$first = false;
$newId = $tag['id'];
} else {
$ids[] = $tag['id'];
}
}
// Just in case...
if (count($ids) > 0) {
// Merge tags
$this->addSql('
UPDATE ' . $this->getTable('entry_tag') . '
SET tag_id = ' . $newId . '
WHERE tag_id IN (' . implode(',', $ids) . ')'
);
// Delete unused tags
$this->addSql('
DELETE FROM ' . $this->getTable('tag') . '
WHERE id IN (' . implode(',', $ids) . ')'
);
}
}
// Iterate over all tags to lowercase them
$this->addSql('
UPDATE ' . $this->getTable('tag') . '
SET label = LOWER(label)'
);
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
throw new SkipMigrationException('Too complex ...');
}
private function getTable($tableName)
{
return $this->container->getParameter('database_table_prefix') . $tableName;
}
}

2
src/Wallabag/CoreBundle/Entity/Tag.php
View file

@ -78,7 +78,7 @@ class Tag
*/
public function setLabel($label)
{
$this->label = $label;
$this->label = mb_convert_case($label, MB_CASE_LOWER);
return $this;
}

2
src/Wallabag/CoreBundle/Helper/TagsAssigner.php
View file

@ -45,7 +45,7 @@ class TagsAssigner
}
foreach ($tags as $label) {
$label = trim($label);
$label = trim(mb_convert_case($label, MB_CASE_LOWER));
// avoid empty tag
if (0 === strlen($label)) {

6
tests/Wallabag/CoreBundle/Controller/TagControllerTest.php
View file

@ -9,6 +9,7 @@ use Wallabag\CoreBundle\Entity\Tag;
class TagControllerTest extends WallabagCoreTestCase
{
public $tagName = 'opensource';
public $caseTagName = 'OpenSource';
public function testList()
{
@ -36,7 +37,7 @@ class TagControllerTest extends WallabagCoreTestCase
$form = $crawler->filter('form[name=tag]')->form();
$data = [
'tag[label]' => $this->tagName,
'tag[label]' => $this->caseTagName,
];
$client->submit($form, $data);
@ -45,6 +46,7 @@ class TagControllerTest extends WallabagCoreTestCase
// be sure to reload the entry
$entry = $this->getEntityManager()->getRepository(Entry::class)->find($entry->getId());
$this->assertCount(1, $entry->getTags());
$this->assertContains($this->tagName, $entry->getTags());
// tag already exists and already assigned
$client->submit($form, $data);
@ -80,7 +82,7 @@ class TagControllerTest extends WallabagCoreTestCase
$form = $crawler->filter('form[name=tag]')->form();
$data = [
'tag[label]' => 'foo2, bar2',
'tag[label]' => 'foo2, Bar2',
];
$client->submit($form, $data);

2
tests/Wallabag/ImportBundle/Controller/PinboardControllerTest.php
View file

@ -125,7 +125,7 @@ class PinboardControllerTest extends WallabagCoreTestCase
$tags = $content->getTags();
$this->assertContains('foot', $tags, 'It includes the "foot" tag');
$this->assertContains('varnish', $tags, 'It includes the "varnish" tag');
$this->assertContains('PHP', $tags, 'It includes the "PHP" tag');
$this->assertContains('php', $tags, 'It includes the "php" tag');
$this->assertSame(3, count($tags));
$this->assertInstanceOf(\DateTime::class, $content->getCreatedAt());

2
tests/Wallabag/ImportBundle/Controller/WallabagV1ControllerTest.php
View file

@ -125,7 +125,7 @@ class WallabagV1ControllerTest extends WallabagCoreTestCase
$tags = $content->getTags();
$this->assertContains('foot', $tags, 'It includes the "foot" tag');
$this->assertContains('Framabag', $tags, 'It includes the "Framabag" tag');
$this->assertContains('framabag', $tags, 'It includes the "framabag" tag');
$this->assertSame(2, count($tags));
$this->assertInstanceOf(\DateTime::class, $content->getCreatedAt());