mirror of
https://github.com/wallabag/wallabag.git
synced 2024-11-26 11:01:04 +00:00
Added headers field in Entry
This commit is contained in:
parent
7987816d1e
commit
dda6a6addc
4 changed files with 90 additions and 1 deletions
55
app/DoctrineMigrations/Version20170511115400.php
Normal file
55
app/DoctrineMigrations/Version20170511115400.php
Normal file
|
@ -0,0 +1,55 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Application\Migrations;
|
||||||
|
|
||||||
|
use Doctrine\DBAL\Migrations\AbstractMigration;
|
||||||
|
use Doctrine\DBAL\Schema\Schema;
|
||||||
|
use Symfony\Component\DependencyInjection\ContainerAwareInterface;
|
||||||
|
use Symfony\Component\DependencyInjection\ContainerInterface;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Added `headers` field in entry table.
|
||||||
|
*/
|
||||||
|
class Version20170511115400 extends AbstractMigration implements ContainerAwareInterface
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @var ContainerInterface
|
||||||
|
*/
|
||||||
|
private $container;
|
||||||
|
|
||||||
|
public function setContainer(ContainerInterface $container = null)
|
||||||
|
{
|
||||||
|
$this->container = $container;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function getTable($tableName)
|
||||||
|
{
|
||||||
|
return $this->container->getParameter('database_table_prefix').$tableName;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param Schema $schema
|
||||||
|
*/
|
||||||
|
public function up(Schema $schema)
|
||||||
|
{
|
||||||
|
$entryTable = $schema->getTable($this->getTable('entry'));
|
||||||
|
|
||||||
|
$this->skipIf($entryTable->hasColumn('headers'), 'It seems that you already played this migration.');
|
||||||
|
|
||||||
|
$entryTable->addColumn('headers', 'text', [
|
||||||
|
'notnull' => false,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param Schema $schema
|
||||||
|
*/
|
||||||
|
public function down(Schema $schema)
|
||||||
|
{
|
||||||
|
$entryTable = $schema->getTable($this->getTable('entry'));
|
||||||
|
|
||||||
|
$this->skipIf(!$entryTable->hasColumn('headers'), 'It seems that you already played this migration.');
|
||||||
|
|
||||||
|
$entryTable->dropColumn('headers');
|
||||||
|
}
|
||||||
|
}
|
|
@ -201,6 +201,15 @@ class Entry
|
||||||
*/
|
*/
|
||||||
private $httpStatus;
|
private $httpStatus;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var array
|
||||||
|
*
|
||||||
|
* @ORM\Column(name="headers", type="json_array", nullable=true)
|
||||||
|
*
|
||||||
|
* @Groups({"entries_for_user", "export_all"})
|
||||||
|
*/
|
||||||
|
private $headers;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @Exclude
|
* @Exclude
|
||||||
*
|
*
|
||||||
|
@ -716,7 +725,7 @@ class Entry
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return string
|
* @return array
|
||||||
*/
|
*/
|
||||||
public function getPublishedBy()
|
public function getPublishedBy()
|
||||||
{
|
{
|
||||||
|
@ -734,4 +743,24 @@ class Entry
|
||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array
|
||||||
|
*/
|
||||||
|
public function getHeaders()
|
||||||
|
{
|
||||||
|
return $this->headers;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param string $headers
|
||||||
|
*
|
||||||
|
* @return Entry
|
||||||
|
*/
|
||||||
|
public function setHeaders($headers)
|
||||||
|
{
|
||||||
|
$this->headers = $headers;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -87,6 +87,10 @@ class ContentProxy
|
||||||
$entry->setPublishedBy($content['authors']);
|
$entry->setPublishedBy($content['authors']);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!empty($content['all_headers'])) {
|
||||||
|
$entry->setHeaders($content['all_headers']);
|
||||||
|
}
|
||||||
|
|
||||||
$entry->setLanguage(isset($content['language']) ? $content['language'] : '');
|
$entry->setLanguage(isset($content['language']) ? $content['language'] : '');
|
||||||
$entry->setMimetype(isset($content['content_type']) ? $content['content_type'] : '');
|
$entry->setMimetype(isset($content['content_type']) ? $content['content_type'] : '');
|
||||||
$entry->setReadingTime(Utils::getReadingTime($html));
|
$entry->setReadingTime(Utils::getReadingTime($html));
|
||||||
|
|
|
@ -142,6 +142,7 @@ class EntryControllerTest extends WallabagCoreTestCase
|
||||||
$this->assertContains('Google', $content->getTitle());
|
$this->assertContains('Google', $content->getTitle());
|
||||||
$this->assertEquals('2015-03-28 15:37:39', $content->getPublishedAt()->format('Y-m-d H:i:s'));
|
$this->assertEquals('2015-03-28 15:37:39', $content->getPublishedAt()->format('Y-m-d H:i:s'));
|
||||||
$this->assertEquals('Morgane Tual', $author[0]);
|
$this->assertEquals('Morgane Tual', $author[0]);
|
||||||
|
$this->assertArrayHasKey('x-varnish1', $content->getHeaders());
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testPostWithMultipleAuthors()
|
public function testPostWithMultipleAuthors()
|
||||||
|
|
Loading…
Reference in a new issue