mirror of
https://github.com/wallabag/wallabag.git
synced 2024-11-26 02:51:04 +00:00
Update deps
Also CS (because cs-fixer got an update) Package operations: 0 installs, 26 updates, 0 removals - Updating twig/twig (v2.12.1 => v2.12.2) - Updating symfony/symfony (v3.4.33 => v3.4.34) - Updating doctrine/event-manager (v1.0.0 => 1.1.0) - Updating doctrine/collections (v1.6.2 => 1.6.3) - Updating doctrine/cache (v1.8.1 => 1.9.0) - Updating doctrine/persistence (1.1.1 => 1.2.0) - Updating doctrine/inflector (v1.3.0 => 1.3.1) - Updating symfony/mime (v4.3.5 => v4.3.7) - Updating swiftmailer/swiftmailer (v6.2.1 => v6.2.3) - Updating symfony/swiftmailer-bundle (v3.3.0 => v3.3.1) - Updating doctrine/dbal (v2.9.2 => v2.9.3) - Updating doctrine/instantiator (1.2.0 => 1.3.0) - Updating j0k3r/graby-site-config (1.0.93 => 1.0.94) - Updating phpoption/phpoption (1.5.0 => 1.5.2) - Updating symfony/http-client-contracts (v1.1.7 => v1.1.8) - Updating symfony/http-client (v4.3.5 => v4.3.7) - Updating sensiolabs/security-checker (v6.0.2 => v6.0.3) - Updating paragonie/constant_time_encoding (v2.2.3 => v2.3.0) - Updating scheb/two-factor-bundle (v4.7.1 => v4.8.0) - Updating symfony/phpunit-bridge (v4.3.6 => v4.3.7) - Updating composer/xdebug-handler (1.3.3 => 1.4.0) - Updating friendsofphp/php-cs-fixer (v2.15.3 => v2.16.0) - Updating doctrine/data-fixtures (v1.3.2 => 1.3.3) - Updating nette/schema (v1.0.0 => v1.0.1) - Updating nikic/php-parser (v4.2.4 => v4.3.0) - Updating sentry/sentry (2.2.2 => 2.2.4)
This commit is contained in:
parent
76fe5dfb71
commit
8d4ed0df06
84 changed files with 250 additions and 698 deletions
|
@ -10,9 +10,6 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
|
|||
*/
|
||||
class Version20160401000000 extends WallabagMigration
|
||||
{
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function up(Schema $schema)
|
||||
{
|
||||
$this->skipIf($schema->hasTable($this->getTable('entry')), 'Database already initialized');
|
||||
|
@ -167,9 +164,6 @@ SQL
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function down(Schema $schema)
|
||||
{
|
||||
$this->addSql("DROP TABLE {$this->getTable('craue_config_setting')}");
|
||||
|
|
|
@ -10,9 +10,6 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
|
|||
*/
|
||||
class Version20160410190541 extends WallabagMigration
|
||||
{
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function up(Schema $schema)
|
||||
{
|
||||
$entryTable = $schema->getTable($this->getTable('entry'));
|
||||
|
@ -34,9 +31,6 @@ class Version20160410190541 extends WallabagMigration
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function down(Schema $schema)
|
||||
{
|
||||
$entryTable = $schema->getTable($this->getTable('entry'));
|
||||
|
|
|
@ -10,9 +10,6 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
|
|||
*/
|
||||
class Version20160812120952 extends WallabagMigration
|
||||
{
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function up(Schema $schema)
|
||||
{
|
||||
$clientsTable = $schema->getTable($this->getTable('oauth2_clients'));
|
||||
|
@ -34,9 +31,6 @@ class Version20160812120952 extends WallabagMigration
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function down(Schema $schema)
|
||||
{
|
||||
$clientsTable = $schema->getTable($this->getTable('oauth2_clients'));
|
||||
|
|
|
@ -10,9 +10,6 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
|
|||
*/
|
||||
class Version20160911214952 extends WallabagMigration
|
||||
{
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function up(Schema $schema)
|
||||
{
|
||||
$redis = $this->container
|
||||
|
@ -36,9 +33,6 @@ class Version20160911214952 extends WallabagMigration
|
|||
$this->skipIf(false !== $rabbitmq && false !== $redis, 'It seems that you already played this migration.');
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function down(Schema $schema)
|
||||
{
|
||||
$this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'import_with_redis';");
|
||||
|
|
|
@ -10,9 +10,6 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
|
|||
*/
|
||||
class Version20160916201049 extends WallabagMigration
|
||||
{
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function up(Schema $schema)
|
||||
{
|
||||
$configTable = $schema->getTable($this->getTable('config'));
|
||||
|
@ -23,9 +20,6 @@ class Version20160916201049 extends WallabagMigration
|
|||
$this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'pocket_consumer_key';");
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function down(Schema $schema)
|
||||
{
|
||||
$configTable = $schema->getTable($this->getTable('config'));
|
||||
|
|
|
@ -11,9 +11,6 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
|
|||
*/
|
||||
class Version20161001072726 extends WallabagMigration
|
||||
{
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function up(Schema $schema)
|
||||
{
|
||||
$this->skipIf('sqlite' === $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'mysql\' or \'postgresql\'.');
|
||||
|
@ -98,9 +95,6 @@ class Version20161001072726 extends WallabagMigration
|
|||
$this->addSql('ALTER TABLE ' . $this->getTable('annotation') . ' ADD CONSTRAINT FK_annotation_entry FOREIGN KEY (entry_id) REFERENCES ' . $this->getTable('entry') . ' (id) ON DELETE CASCADE');
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function down(Schema $schema)
|
||||
{
|
||||
throw new SkipMigrationException('Too complex ...');
|
||||
|
|
|
@ -10,9 +10,6 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
|
|||
*/
|
||||
class Version20161022134138 extends WallabagMigration
|
||||
{
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function up(Schema $schema)
|
||||
{
|
||||
$this->skipIf('mysql' !== $this->connection->getDatabasePlatform()->getName(), 'This migration only apply to MySQL');
|
||||
|
@ -41,9 +38,6 @@ class Version20161022134138 extends WallabagMigration
|
|||
$this->addSql('ALTER TABLE ' . $this->getTable('user') . ' CHANGE `name` `name` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;');
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function down(Schema $schema)
|
||||
{
|
||||
$this->skipIf('mysql' !== $this->connection->getDatabasePlatform()->getName(), 'This migration only apply to MySQL');
|
||||
|
|
|
@ -12,9 +12,6 @@ class Version20161024212538 extends WallabagMigration
|
|||
{
|
||||
private $constraintName = 'IDX_user_oauth_client';
|
||||
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function up(Schema $schema)
|
||||
{
|
||||
$clientsTable = $schema->getTable($this->getTable('oauth2_clients'));
|
||||
|
@ -32,9 +29,6 @@ class Version20161024212538 extends WallabagMigration
|
|||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function down(Schema $schema)
|
||||
{
|
||||
$clientsTable = $schema->getTable($this->getTable('oauth2_clients'));
|
||||
|
|
|
@ -10,9 +10,6 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
|
|||
*/
|
||||
class Version20161031132655 extends WallabagMigration
|
||||
{
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function up(Schema $schema)
|
||||
{
|
||||
$images = $this->container
|
||||
|
@ -25,9 +22,6 @@ class Version20161031132655 extends WallabagMigration
|
|||
$this->addSql('INSERT INTO ' . $this->getTable('craue_config_setting') . " (name, value, section) VALUES ('download_images_enabled', 0, 'misc')");
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function down(Schema $schema)
|
||||
{
|
||||
$this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'download_images_enabled';");
|
||||
|
|
|
@ -12,9 +12,6 @@ class Version20161104073720 extends WallabagMigration
|
|||
{
|
||||
private $indexName = 'IDX_entry_created_at';
|
||||
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function up(Schema $schema)
|
||||
{
|
||||
$entryTable = $schema->getTable($this->getTable('entry'));
|
||||
|
@ -23,9 +20,6 @@ class Version20161104073720 extends WallabagMigration
|
|||
$entryTable->addIndex(['created_at'], $this->indexName);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function down(Schema $schema)
|
||||
{
|
||||
$entryTable = $schema->getTable($this->getTable('entry'));
|
||||
|
|
|
@ -10,9 +10,6 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
|
|||
*/
|
||||
class Version20161106113822 extends WallabagMigration
|
||||
{
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function up(Schema $schema)
|
||||
{
|
||||
$configTable = $schema->getTable($this->getTable('config'));
|
||||
|
@ -25,9 +22,6 @@ class Version20161106113822 extends WallabagMigration
|
|||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function down(Schema $schema)
|
||||
{
|
||||
$configTable = $schema->getTable($this->getTable('config'));
|
||||
|
|
|
@ -10,9 +10,6 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
|
|||
*/
|
||||
class Version20161117071626 extends WallabagMigration
|
||||
{
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function up(Schema $schema)
|
||||
{
|
||||
$share = $this->container
|
||||
|
@ -36,9 +33,6 @@ class Version20161117071626 extends WallabagMigration
|
|||
$this->skipIf(false !== $share && false !== $unmark, 'It seems that you already played this migration.');
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function down(Schema $schema)
|
||||
{
|
||||
$this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'share_unmark';");
|
||||
|
|
|
@ -10,9 +10,6 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
|
|||
*/
|
||||
class Version20161118134328 extends WallabagMigration
|
||||
{
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function up(Schema $schema)
|
||||
{
|
||||
$entryTable = $schema->getTable($this->getTable('entry'));
|
||||
|
@ -25,9 +22,6 @@ class Version20161118134328 extends WallabagMigration
|
|||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function down(Schema $schema)
|
||||
{
|
||||
$entryTable = $schema->getTable($this->getTable('entry'));
|
||||
|
|
|
@ -10,9 +10,6 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
|
|||
*/
|
||||
class Version20161122144743 extends WallabagMigration
|
||||
{
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function up(Schema $schema)
|
||||
{
|
||||
$access = $this->container
|
||||
|
@ -25,9 +22,6 @@ class Version20161122144743 extends WallabagMigration
|
|||
$this->addSql('INSERT INTO ' . $this->getTable('craue_config_setting') . " (name, value, section) VALUES ('restricted_access', 0, 'entry')");
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function down(Schema $schema)
|
||||
{
|
||||
$this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'restricted_access';");
|
||||
|
|
|
@ -18,9 +18,6 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
|
|||
*/
|
||||
class Version20161122203647 extends WallabagMigration
|
||||
{
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function up(Schema $schema)
|
||||
{
|
||||
$userTable = $schema->getTable($this->getTable('user'));
|
||||
|
@ -31,9 +28,6 @@ class Version20161122203647 extends WallabagMigration
|
|||
$userTable->dropColumn('credentials_expired');
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function down(Schema $schema)
|
||||
{
|
||||
$userTable = $schema->getTable($this->getTable('user'));
|
||||
|
|
|
@ -10,9 +10,6 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
|
|||
*/
|
||||
class Version20161128084725 extends WallabagMigration
|
||||
{
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function up(Schema $schema)
|
||||
{
|
||||
$configTable = $schema->getTable($this->getTable('config'));
|
||||
|
@ -21,9 +18,6 @@ class Version20161128084725 extends WallabagMigration
|
|||
$configTable->addColumn('list_mode', 'integer', ['notnull' => false]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function down(Schema $schema)
|
||||
{
|
||||
$configTable = $schema->getTable($this->getTable('config'));
|
||||
|
|
|
@ -16,9 +16,6 @@ class Version20161128131503 extends WallabagMigration
|
|||
'expires_at' => 'datetime',
|
||||
];
|
||||
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function up(Schema $schema)
|
||||
{
|
||||
$userTable = $schema->getTable($this->getTable('user'));
|
||||
|
@ -29,9 +26,6 @@ class Version20161128131503 extends WallabagMigration
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function down(Schema $schema)
|
||||
{
|
||||
$userTable = $schema->getTable($this->getTable('user'));
|
||||
|
|
|
@ -10,9 +10,6 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
|
|||
*/
|
||||
class Version20161214094402 extends WallabagMigration
|
||||
{
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function up(Schema $schema)
|
||||
{
|
||||
$entryTable = $schema->getTable($this->getTable('entry'));
|
||||
|
@ -35,9 +32,6 @@ class Version20161214094402 extends WallabagMigration
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function down(Schema $schema)
|
||||
{
|
||||
$entryTable = $schema->getTable($this->getTable('entry'));
|
||||
|
|
|
@ -12,9 +12,6 @@ class Version20161214094403 extends WallabagMigration
|
|||
{
|
||||
private $indexName = 'IDX_entry_uid';
|
||||
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function up(Schema $schema)
|
||||
{
|
||||
$entryTable = $schema->getTable($this->getTable('entry'));
|
||||
|
@ -23,9 +20,6 @@ class Version20161214094403 extends WallabagMigration
|
|||
$entryTable->addIndex(['uid'], $this->indexName);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function down(Schema $schema)
|
||||
{
|
||||
$entryTable = $schema->getTable($this->getTable('entry'));
|
||||
|
|
|
@ -13,9 +13,6 @@ class Version20170127093841 extends WallabagMigration
|
|||
private $indexStarredName = 'IDX_entry_starred';
|
||||
private $indexArchivedName = 'IDX_entry_archived';
|
||||
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function up(Schema $schema)
|
||||
{
|
||||
$entryTable = $schema->getTable($this->getTable('entry'));
|
||||
|
@ -25,9 +22,6 @@ class Version20170127093841 extends WallabagMigration
|
|||
$entryTable->addIndex(['is_archived'], $this->indexArchivedName);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function down(Schema $schema)
|
||||
{
|
||||
$entryTable = $schema->getTable($this->getTable('entry'));
|
||||
|
|
|
@ -10,9 +10,6 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
|
|||
*/
|
||||
class Version20170327194233 extends WallabagMigration
|
||||
{
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function up(Schema $schema)
|
||||
{
|
||||
$scuttle = $this->container
|
||||
|
@ -26,9 +23,6 @@ class Version20170327194233 extends WallabagMigration
|
|||
$this->addSql('INSERT INTO ' . $this->getTable('craue_config_setting') . " (name, value, section) VALUES ('scuttle_url', 'http://scuttle.org', 'entry')");
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function down(Schema $schema)
|
||||
{
|
||||
$this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'share_scuttle';");
|
||||
|
|
|
@ -10,9 +10,6 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
|
|||
*/
|
||||
class Version20170405182620 extends WallabagMigration
|
||||
{
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function up(Schema $schema)
|
||||
{
|
||||
$entryTable = $schema->getTable($this->getTable('entry'));
|
||||
|
@ -30,9 +27,6 @@ class Version20170405182620 extends WallabagMigration
|
|||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function down(Schema $schema)
|
||||
{
|
||||
$entryTable = $schema->getTable($this->getTable('entry'));
|
||||
|
|
|
@ -10,9 +10,6 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
|
|||
*/
|
||||
class Version20170407200919 extends WallabagMigration
|
||||
{
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function up(Schema $schema)
|
||||
{
|
||||
$entryTable = $schema->getTable($this->getTable('entry'));
|
||||
|
@ -21,9 +18,6 @@ class Version20170407200919 extends WallabagMigration
|
|||
$entryTable->dropColumn('is_public');
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function down(Schema $schema)
|
||||
{
|
||||
$entryTable = $schema->getTable($this->getTable('entry'));
|
||||
|
|
|
@ -10,17 +10,11 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
|
|||
*/
|
||||
class Version20170420134133 extends WallabagMigration
|
||||
{
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function up(Schema $schema)
|
||||
{
|
||||
$this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'download_pictures';");
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function down(Schema $schema)
|
||||
{
|
||||
$downloadPictures = $this->container
|
||||
|
|
|
@ -10,9 +10,6 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
|
|||
*/
|
||||
class Version20170501115751 extends WallabagMigration
|
||||
{
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function up(Schema $schema)
|
||||
{
|
||||
$this->skipIf($schema->hasTable($this->getTable('site_credential')), 'It seems that you already played this migration.');
|
||||
|
@ -34,9 +31,6 @@ class Version20170501115751 extends WallabagMigration
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function down(Schema $schema)
|
||||
{
|
||||
$schema->dropTable($this->getTable('site_credential'));
|
||||
|
|
|
@ -17,9 +17,6 @@ class Version20170510082609 extends WallabagMigration
|
|||
'email_canonical',
|
||||
];
|
||||
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function up(Schema $schema)
|
||||
{
|
||||
$this->skipIf('mysql' !== $this->connection->getDatabasePlatform()->getName(), 'This migration only apply to MySQL');
|
||||
|
@ -29,9 +26,6 @@ class Version20170510082609 extends WallabagMigration
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function down(Schema $schema)
|
||||
{
|
||||
$this->skipIf('mysql' !== $this->connection->getDatabasePlatform()->getName(), 'This migration only apply to MySQL');
|
||||
|
|
|
@ -10,9 +10,6 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
|
|||
*/
|
||||
class Version20170511115400 extends WallabagMigration
|
||||
{
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function up(Schema $schema)
|
||||
{
|
||||
$entryTable = $schema->getTable($this->getTable('entry'));
|
||||
|
@ -24,9 +21,6 @@ class Version20170511115400 extends WallabagMigration
|
|||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function down(Schema $schema)
|
||||
{
|
||||
$entryTable = $schema->getTable($this->getTable('entry'));
|
||||
|
|
|
@ -10,9 +10,6 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
|
|||
*/
|
||||
class Version20170602075214 extends WallabagMigration
|
||||
{
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function up(Schema $schema)
|
||||
{
|
||||
$apiUserRegistration = $this->container
|
||||
|
@ -25,9 +22,6 @@ class Version20170602075214 extends WallabagMigration
|
|||
$this->addSql('INSERT INTO ' . $this->getTable('craue_config_setting') . " (name, value, section) VALUES ('api_user_registration', '0', 'api')");
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function down(Schema $schema)
|
||||
{
|
||||
$this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'api_user_registration';");
|
||||
|
|
|
@ -11,9 +11,6 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
|
|||
*/
|
||||
class Version20170606155640 extends WallabagMigration
|
||||
{
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function up(Schema $schema)
|
||||
{
|
||||
$apiUserRegistration = $this->container
|
||||
|
@ -26,9 +23,6 @@ class Version20170606155640 extends WallabagMigration
|
|||
$this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'wallabag_url'");
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function down(Schema $schema)
|
||||
{
|
||||
$this->addSql('INSERT INTO ' . $this->getTable('craue_config_setting') . " (name, value, section) VALUES ('wallabag_url', 'wallabag.me', 'misc')");
|
||||
|
|
|
@ -10,9 +10,6 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
|
|||
*/
|
||||
class Version20170719231144 extends WallabagMigration
|
||||
{
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function up(Schema $schema)
|
||||
{
|
||||
$this->skipIf('sqlite' === $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'mysql\' or \'postgresql\'.');
|
||||
|
@ -89,9 +86,6 @@ class Version20170719231144 extends WallabagMigration
|
|||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function down(Schema $schema)
|
||||
{
|
||||
throw new SkipMigrationException('Too complex ...');
|
||||
|
|
|
@ -10,9 +10,6 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
|
|||
*/
|
||||
class Version20170824113337 extends WallabagMigration
|
||||
{
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function up(Schema $schema)
|
||||
{
|
||||
$entryTable = $schema->getTable($this->getTable('entry'));
|
||||
|
@ -37,9 +34,6 @@ class Version20170824113337 extends WallabagMigration
|
|||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function down(Schema $schema)
|
||||
{
|
||||
$entryTable = $schema->getTable($this->getTable('entry'));
|
||||
|
|
|
@ -10,9 +10,6 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
|
|||
*/
|
||||
class Version20171008195606 extends WallabagMigration
|
||||
{
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function up(Schema $schema)
|
||||
{
|
||||
$this->skipIf('sqlite' === $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'mysql\' or \'postgresql\'.');
|
||||
|
@ -29,9 +26,6 @@ class Version20171008195606 extends WallabagMigration
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function down(Schema $schema)
|
||||
{
|
||||
$this->skipIf('sqlite' === $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'mysql\' or \'postgresql\'.');
|
||||
|
|
|
@ -10,9 +10,6 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
|
|||
*/
|
||||
class Version20171105202000 extends WallabagMigration
|
||||
{
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function up(Schema $schema)
|
||||
{
|
||||
$entryTable = $schema->getTable($this->getTable('entry'));
|
||||
|
@ -24,9 +21,6 @@ class Version20171105202000 extends WallabagMigration
|
|||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function down(Schema $schema)
|
||||
{
|
||||
$entryTable = $schema->getTable($this->getTable('entry'));
|
||||
|
|
|
@ -10,9 +10,6 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
|
|||
*/
|
||||
class Version20171120163128 extends WallabagMigration
|
||||
{
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function up(Schema $schema)
|
||||
{
|
||||
$storeArticleHeaders = $this->container
|
||||
|
@ -25,9 +22,6 @@ class Version20171120163128 extends WallabagMigration
|
|||
$this->addSql('INSERT INTO ' . $this->getTable('craue_config_setting') . " (name, value, section) VALUES ('store_article_headers', '0', 'entry')");
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function down(Schema $schema)
|
||||
{
|
||||
$this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'store_article_headers';");
|
||||
|
|
|
@ -10,9 +10,6 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
|
|||
*/
|
||||
class Version20171125164500 extends WallabagMigration
|
||||
{
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function up(Schema $schema)
|
||||
{
|
||||
$shaarliShareOriginUrl = $this->container
|
||||
|
@ -25,9 +22,6 @@ class Version20171125164500 extends WallabagMigration
|
|||
$this->addSql('INSERT INTO ' . $this->getTable('craue_config_setting') . " (name, value, section) VALUES ('shaarli_share_origin_url', '0', 'entry')");
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function down(Schema $schema)
|
||||
{
|
||||
$this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'shaarli_share_origin_url';");
|
||||
|
|
|
@ -10,9 +10,6 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
|
|||
*/
|
||||
class Version20180405182455 extends WallabagMigration
|
||||
{
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function up(Schema $schema)
|
||||
{
|
||||
$entryTable = $schema->getTable($this->getTable('entry'));
|
||||
|
@ -37,9 +34,6 @@ class Version20180405182455 extends WallabagMigration
|
|||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function down(Schema $schema)
|
||||
{
|
||||
$entryTable = $schema->getTable($this->getTable('entry'));
|
||||
|
|
|
@ -10,9 +10,6 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
|
|||
*/
|
||||
class Version20181128203230 extends WallabagMigration
|
||||
{
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function up(Schema $schema)
|
||||
{
|
||||
$this->skipIf('mysql' !== $this->connection->getDatabasePlatform()->getName(), 'This migration can only be applied on \'mysql\'.');
|
||||
|
|
|
@ -118,9 +118,6 @@ final class Version20190129120000 extends WallabagMigration
|
|||
],
|
||||
];
|
||||
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function up(Schema $schema)
|
||||
{
|
||||
foreach ($this->settings as $setting) {
|
||||
|
@ -137,9 +134,6 @@ final class Version20190129120000 extends WallabagMigration
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function down(Schema $schema)
|
||||
{
|
||||
$this->skipIf(true, 'These settings are required and should not be removed.');
|
||||
|
|
|
@ -10,9 +10,6 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
|
|||
*/
|
||||
class Version20190401105353 extends WallabagMigration
|
||||
{
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function up(Schema $schema)
|
||||
{
|
||||
$entryTable = $schema->getTable($this->getTable('entry'));
|
||||
|
@ -27,9 +24,6 @@ class Version20190401105353 extends WallabagMigration
|
|||
$entryTable->addIndex(['user_id', 'hashed_url'], 'hashed_url_user_id', [], ['lengths' => [null, 40]]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function down(Schema $schema)
|
||||
{
|
||||
$entryTable = $schema->getTable($this->getTable('entry'));
|
||||
|
|
|
@ -10,9 +10,6 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
|
|||
*/
|
||||
class Version20190601125843 extends WallabagMigration
|
||||
{
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function up(Schema $schema)
|
||||
{
|
||||
$entryTable = $schema->getTable($this->getTable('entry'));
|
||||
|
@ -34,9 +31,6 @@ class Version20190601125843 extends WallabagMigration
|
|||
$entryTable->addIndex(['user_id', 'hashed_given_url'], 'hashed_given_url_user_id', [], ['lengths' => [null, 40]]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function down(Schema $schema)
|
||||
{
|
||||
$entryTable = $schema->getTable($this->getTable('entry'));
|
||||
|
|
439
composer.lock
generated
439
composer.lock
generated
File diff suppressed because it is too large
Load diff
|
@ -16,8 +16,6 @@ class WallabagAnnotationController extends FOSRestController
|
|||
/**
|
||||
* Retrieve annotations for an entry.
|
||||
*
|
||||
* @param Entry $entry
|
||||
*
|
||||
* @see Wallabag\ApiBundle\Controller\WallabagRestController
|
||||
*
|
||||
* @return JsonResponse
|
||||
|
@ -39,9 +37,6 @@ class WallabagAnnotationController extends FOSRestController
|
|||
/**
|
||||
* Creates a new annotation.
|
||||
*
|
||||
* @param Request $request
|
||||
* @param Entry $entry
|
||||
*
|
||||
* @return JsonResponse
|
||||
*
|
||||
* @see Wallabag\ApiBundle\Controller\WallabagRestController
|
||||
|
@ -79,9 +74,6 @@ class WallabagAnnotationController extends FOSRestController
|
|||
*
|
||||
* @ParamConverter("annotation", class="WallabagAnnotationBundle:Annotation")
|
||||
*
|
||||
* @param Annotation $annotation
|
||||
* @param Request $request
|
||||
*
|
||||
* @return JsonResponse
|
||||
*/
|
||||
public function putAnnotationAction(Annotation $annotation, Request $request)
|
||||
|
@ -114,8 +106,6 @@ class WallabagAnnotationController extends FOSRestController
|
|||
*
|
||||
* @ParamConverter("annotation", class="WallabagAnnotationBundle:Annotation")
|
||||
*
|
||||
* @param Annotation $annotation
|
||||
*
|
||||
* @return JsonResponse
|
||||
*/
|
||||
public function deleteAnnotationAction(Annotation $annotation)
|
||||
|
|
|
@ -20,8 +20,6 @@ class AnnotationRestController extends WallabagRestController
|
|||
* }
|
||||
* )
|
||||
*
|
||||
* @param Entry $entry
|
||||
*
|
||||
* @return JsonResponse
|
||||
*/
|
||||
public function getAnnotationsAction(Entry $entry)
|
||||
|
@ -44,9 +42,6 @@ class AnnotationRestController extends WallabagRestController
|
|||
* }
|
||||
* )
|
||||
*
|
||||
* @param Request $request
|
||||
* @param Entry $entry
|
||||
*
|
||||
* @return JsonResponse
|
||||
*/
|
||||
public function postAnnotationAction(Request $request, Entry $entry)
|
||||
|
@ -70,9 +65,6 @@ class AnnotationRestController extends WallabagRestController
|
|||
*
|
||||
* @ParamConverter("annotation", class="WallabagAnnotationBundle:Annotation")
|
||||
*
|
||||
* @param Annotation $annotation
|
||||
* @param Request $request
|
||||
*
|
||||
* @return JsonResponse
|
||||
*/
|
||||
public function putAnnotationAction(Annotation $annotation, Request $request)
|
||||
|
@ -96,8 +88,6 @@ class AnnotationRestController extends WallabagRestController
|
|||
*
|
||||
* @ParamConverter("annotation", class="WallabagAnnotationBundle:Annotation")
|
||||
*
|
||||
* @param Annotation $annotation
|
||||
*
|
||||
* @return JsonResponse
|
||||
*/
|
||||
public function deleteAnnotationAction(Annotation $annotation)
|
||||
|
|
|
@ -29,8 +29,6 @@ class DeveloperController extends Controller
|
|||
/**
|
||||
* Create a client (an app).
|
||||
*
|
||||
* @param Request $request
|
||||
*
|
||||
* @Route("/developer/client/create", name="developer_create_client")
|
||||
*
|
||||
* @return \Symfony\Component\HttpFoundation\Response
|
||||
|
@ -67,8 +65,6 @@ class DeveloperController extends Controller
|
|||
/**
|
||||
* Remove a client.
|
||||
*
|
||||
* @param Client $client
|
||||
*
|
||||
* @Route("/developer/client/delete/{id}", requirements={"id" = "\d+"}, name="developer_delete_client")
|
||||
*
|
||||
* @return \Symfony\Component\HttpFoundation\RedirectResponse
|
||||
|
|
|
@ -822,8 +822,6 @@ class EntryRestController extends WallabagRestController
|
|||
* Retrieve value from the request.
|
||||
* Used for POST & PATCH on a an entry.
|
||||
*
|
||||
* @param Request $request
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
private function retrieveValueFromRequest(Request $request)
|
||||
|
|
|
@ -119,7 +119,6 @@ class UserRestController extends WallabagRestController
|
|||
/**
|
||||
* Send user response.
|
||||
*
|
||||
* @param User $user
|
||||
* @param string $group Used to define with serialized group might be used
|
||||
* @param int $status HTTP Status code to send
|
||||
*
|
||||
|
|
|
@ -63,9 +63,6 @@ class CleanDuplicatesCommand extends ContainerAwareCommand
|
|||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param User $user
|
||||
*/
|
||||
private function cleanDuplicates(User $user)
|
||||
{
|
||||
$em = $this->getContainer()->get('doctrine.orm.entity_manager');
|
||||
|
|
|
@ -54,9 +54,6 @@ class GenerateUrlHashesCommand extends ContainerAwareCommand
|
|||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param User $user
|
||||
*/
|
||||
private function generateHashedUrls(User $user)
|
||||
{
|
||||
$em = $this->getContainer()->get('doctrine.orm.entity_manager');
|
||||
|
|
|
@ -326,9 +326,7 @@ class InstallCommand extends ContainerAwareCommand
|
|||
if (0 !== $exitCode) {
|
||||
$this->getApplication()->setAutoExit(true);
|
||||
|
||||
throw new \RuntimeException(
|
||||
'The command "' . $command . "\" generates some errors: \n\n"
|
||||
. $output->fetch());
|
||||
throw new \RuntimeException('The command "' . $command . "\" generates some errors: \n\n" . $output->fetch());
|
||||
}
|
||||
|
||||
return $this;
|
||||
|
|
|
@ -46,9 +46,6 @@ class ShowUserCommand extends ContainerAwareCommand
|
|||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param User $user
|
||||
*/
|
||||
private function showUser(User $user)
|
||||
{
|
||||
$this->io->listing([
|
||||
|
|
|
@ -26,8 +26,6 @@ use Wallabag\CoreBundle\Tools\Utils;
|
|||
class ConfigController extends Controller
|
||||
{
|
||||
/**
|
||||
* @param Request $request
|
||||
*
|
||||
* @Route("/config", name="config")
|
||||
*/
|
||||
public function indexAction(Request $request)
|
||||
|
@ -279,8 +277,6 @@ class ConfigController extends Controller
|
|||
/**
|
||||
* Validate OTP code.
|
||||
*
|
||||
* @param Request $request
|
||||
*
|
||||
* @Route("/config/otp/app/check", name="config_otp_app_check")
|
||||
*/
|
||||
public function otpAppCheckAction(Request $request)
|
||||
|
@ -308,8 +304,6 @@ class ConfigController extends Controller
|
|||
}
|
||||
|
||||
/**
|
||||
* @param Request $request
|
||||
*
|
||||
* @Route("/generate-token", name="generate_token")
|
||||
*
|
||||
* @return RedirectResponse|JsonResponse
|
||||
|
@ -336,8 +330,6 @@ class ConfigController extends Controller
|
|||
}
|
||||
|
||||
/**
|
||||
* @param Request $request
|
||||
*
|
||||
* @Route("/revoke-token", name="revoke_token")
|
||||
*
|
||||
* @return RedirectResponse|JsonResponse
|
||||
|
@ -366,8 +358,6 @@ class ConfigController extends Controller
|
|||
/**
|
||||
* Deletes a tagging rule and redirect to the config homepage.
|
||||
*
|
||||
* @param TaggingRule $rule
|
||||
*
|
||||
* @Route("/tagging-rule/delete/{id}", requirements={"id" = "\d+"}, name="delete_tagging_rule")
|
||||
*
|
||||
* @return RedirectResponse
|
||||
|
@ -391,8 +381,6 @@ class ConfigController extends Controller
|
|||
/**
|
||||
* Edit a tagging rule.
|
||||
*
|
||||
* @param TaggingRule $rule
|
||||
*
|
||||
* @Route("/tagging-rule/edit/{id}", requirements={"id" = "\d+"}, name="edit_tagging_rule")
|
||||
*
|
||||
* @return RedirectResponse
|
||||
|
@ -459,8 +447,6 @@ class ConfigController extends Controller
|
|||
*
|
||||
* @Route("/account/delete", name="delete_account")
|
||||
*
|
||||
* @param Request $request
|
||||
*
|
||||
* @throws AccessDeniedHttpException
|
||||
*
|
||||
* @return \Symfony\Component\HttpFoundation\RedirectResponse
|
||||
|
@ -491,8 +477,6 @@ class ConfigController extends Controller
|
|||
*
|
||||
* @Route("/config/view-mode", name="switch_view_mode")
|
||||
*
|
||||
* @param Request $request
|
||||
*
|
||||
* @return \Symfony\Component\HttpFoundation\RedirectResponse
|
||||
*/
|
||||
public function changeViewModeAction(Request $request)
|
||||
|
@ -510,8 +494,7 @@ class ConfigController extends Controller
|
|||
/**
|
||||
* Change the locale for the current user.
|
||||
*
|
||||
* @param Request $request
|
||||
* @param string $language
|
||||
* @param string $language
|
||||
*
|
||||
* @Route("/locale/{language}", name="changeLocale")
|
||||
*
|
||||
|
@ -620,8 +603,6 @@ class ConfigController extends Controller
|
|||
|
||||
/**
|
||||
* Validate that a rule can be edited/deleted by the current user.
|
||||
*
|
||||
* @param TaggingRule $rule
|
||||
*/
|
||||
private function validateRuleAction(TaggingRule $rule)
|
||||
{
|
||||
|
|
|
@ -21,8 +21,7 @@ use Wallabag\CoreBundle\Form\Type\SearchEntryType;
|
|||
class EntryController extends Controller
|
||||
{
|
||||
/**
|
||||
* @param Request $request
|
||||
* @param int $page
|
||||
* @param int $page
|
||||
*
|
||||
* @Route("/search/{page}", name="search", defaults={"page" = 1})
|
||||
*
|
||||
|
@ -53,8 +52,6 @@ class EntryController extends Controller
|
|||
}
|
||||
|
||||
/**
|
||||
* @param Request $request
|
||||
*
|
||||
* @Route("/new-entry", name="new_entry")
|
||||
*
|
||||
* @return \Symfony\Component\HttpFoundation\Response
|
||||
|
@ -97,8 +94,6 @@ class EntryController extends Controller
|
|||
}
|
||||
|
||||
/**
|
||||
* @param Request $request
|
||||
*
|
||||
* @Route("/bookmarklet", name="bookmarklet")
|
||||
*
|
||||
* @return \Symfony\Component\HttpFoundation\Response
|
||||
|
@ -135,9 +130,6 @@ class EntryController extends Controller
|
|||
/**
|
||||
* Edit an entry content.
|
||||
*
|
||||
* @param Request $request
|
||||
* @param Entry $entry
|
||||
*
|
||||
* @Route("/edit/{id}", requirements={"id" = "\d+"}, name="edit")
|
||||
*
|
||||
* @return \Symfony\Component\HttpFoundation\Response
|
||||
|
@ -171,8 +163,7 @@ class EntryController extends Controller
|
|||
/**
|
||||
* Shows all entries for current user.
|
||||
*
|
||||
* @param Request $request
|
||||
* @param int $page
|
||||
* @param int $page
|
||||
*
|
||||
* @Route("/all/list/{page}", name="all", defaults={"page" = "1"})
|
||||
*
|
||||
|
@ -186,8 +177,7 @@ class EntryController extends Controller
|
|||
/**
|
||||
* Shows unread entries for current user.
|
||||
*
|
||||
* @param Request $request
|
||||
* @param int $page
|
||||
* @param int $page
|
||||
*
|
||||
* @Route("/unread/list/{page}", name="unread", defaults={"page" = "1"})
|
||||
*
|
||||
|
@ -206,8 +196,7 @@ class EntryController extends Controller
|
|||
/**
|
||||
* Shows read entries for current user.
|
||||
*
|
||||
* @param Request $request
|
||||
* @param int $page
|
||||
* @param int $page
|
||||
*
|
||||
* @Route("/archive/list/{page}", name="archive", defaults={"page" = "1"})
|
||||
*
|
||||
|
@ -221,8 +210,7 @@ class EntryController extends Controller
|
|||
/**
|
||||
* Shows starred entries for current user.
|
||||
*
|
||||
* @param Request $request
|
||||
* @param int $page
|
||||
* @param int $page
|
||||
*
|
||||
* @Route("/starred/list/{page}", name="starred", defaults={"page" = "1"})
|
||||
*
|
||||
|
@ -236,8 +224,7 @@ class EntryController extends Controller
|
|||
/**
|
||||
* Shows untagged articles for current user.
|
||||
*
|
||||
* @param Request $request
|
||||
* @param int $page
|
||||
* @param int $page
|
||||
*
|
||||
* @Route("/untagged/list/{page}", name="untagged", defaults={"page" = "1"})
|
||||
*
|
||||
|
@ -276,8 +263,6 @@ class EntryController extends Controller
|
|||
/**
|
||||
* Shows entry content.
|
||||
*
|
||||
* @param Entry $entry
|
||||
*
|
||||
* @Route("/view/{id}", requirements={"id" = "\d+"}, name="view")
|
||||
*
|
||||
* @return \Symfony\Component\HttpFoundation\Response
|
||||
|
@ -296,8 +281,6 @@ class EntryController extends Controller
|
|||
* Reload an entry.
|
||||
* Refetch content from the website and make it readable again.
|
||||
*
|
||||
* @param Entry $entry
|
||||
*
|
||||
* @Route("/reload/{id}", requirements={"id" = "\d+"}, name="reload_entry")
|
||||
*
|
||||
* @return \Symfony\Component\HttpFoundation\RedirectResponse
|
||||
|
@ -330,9 +313,6 @@ class EntryController extends Controller
|
|||
/**
|
||||
* Changes read status for an entry.
|
||||
*
|
||||
* @param Request $request
|
||||
* @param Entry $entry
|
||||
*
|
||||
* @Route("/archive/{id}", requirements={"id" = "\d+"}, name="archive_entry")
|
||||
*
|
||||
* @return \Symfony\Component\HttpFoundation\RedirectResponse
|
||||
|
@ -362,9 +342,6 @@ class EntryController extends Controller
|
|||
/**
|
||||
* Changes starred status for an entry.
|
||||
*
|
||||
* @param Request $request
|
||||
* @param Entry $entry
|
||||
*
|
||||
* @Route("/star/{id}", requirements={"id" = "\d+"}, name="star_entry")
|
||||
*
|
||||
* @return \Symfony\Component\HttpFoundation\RedirectResponse
|
||||
|
@ -395,8 +372,6 @@ class EntryController extends Controller
|
|||
/**
|
||||
* Deletes entry and redirect to the homepage or the last viewed page.
|
||||
*
|
||||
* @param Entry $entry
|
||||
*
|
||||
* @Route("/delete/{id}", requirements={"id" = "\d+"}, name="delete_entry")
|
||||
*
|
||||
* @return \Symfony\Component\HttpFoundation\RedirectResponse
|
||||
|
@ -437,8 +412,6 @@ class EntryController extends Controller
|
|||
/**
|
||||
* Get public URL for entry (and generate it if necessary).
|
||||
*
|
||||
* @param Entry $entry
|
||||
*
|
||||
* @Route("/share/{id}", requirements={"id" = "\d+"}, name="share")
|
||||
*
|
||||
* @return \Symfony\Component\HttpFoundation\Response
|
||||
|
@ -463,8 +436,6 @@ class EntryController extends Controller
|
|||
/**
|
||||
* Disable public sharing for an entry.
|
||||
*
|
||||
* @param Entry $entry
|
||||
*
|
||||
* @Route("/share/delete/{id}", requirements={"id" = "\d+"}, name="delete_share")
|
||||
*
|
||||
* @return \Symfony\Component\HttpFoundation\Response
|
||||
|
@ -487,8 +458,6 @@ class EntryController extends Controller
|
|||
/**
|
||||
* Ability to view a content publicly.
|
||||
*
|
||||
* @param Entry $entry
|
||||
*
|
||||
* @Route("/share/{uid}", requirements={"uid" = ".+"}, name="share_entry")
|
||||
* @Cache(maxage="25200", smaxage="25200", public=true)
|
||||
*
|
||||
|
@ -510,9 +479,8 @@ class EntryController extends Controller
|
|||
* Global method to retrieve entries depending on the given type
|
||||
* It returns the response to be send.
|
||||
*
|
||||
* @param string $type Entries type: unread, starred or archive
|
||||
* @param Request $request
|
||||
* @param int $page
|
||||
* @param string $type Entries type: unread, starred or archive
|
||||
* @param int $page
|
||||
*
|
||||
* @return \Symfony\Component\HttpFoundation\Response
|
||||
*/
|
||||
|
@ -582,7 +550,6 @@ class EntryController extends Controller
|
|||
* Fetch content and update entry.
|
||||
* In case it fails, $entry->getContent will return an error message.
|
||||
*
|
||||
* @param Entry $entry
|
||||
* @param string $prefixMessage Should be the translation key: entry_saved or entry_reloaded
|
||||
*/
|
||||
private function updateEntry(Entry $entry, $prefixMessage = 'entry_saved')
|
||||
|
@ -613,8 +580,6 @@ class EntryController extends Controller
|
|||
|
||||
/**
|
||||
* Check if the logged user can manage the given entry.
|
||||
*
|
||||
* @param Entry $entry
|
||||
*/
|
||||
private function checkUserAction(Entry $entry)
|
||||
{
|
||||
|
@ -626,8 +591,6 @@ class EntryController extends Controller
|
|||
/**
|
||||
* Check for existing entry, if it exists, redirect to it with a message.
|
||||
*
|
||||
* @param Entry $entry
|
||||
*
|
||||
* @return Entry|bool
|
||||
*/
|
||||
private function checkIfEntryAlreadyExists(Entry $entry)
|
||||
|
|
|
@ -17,7 +17,6 @@ class ExportController extends Controller
|
|||
/**
|
||||
* Gets one entry content.
|
||||
*
|
||||
* @param Entry $entry
|
||||
* @param string $format
|
||||
*
|
||||
* @Route("/export/{id}.{format}", name="export_entry", requirements={
|
||||
|
|
|
@ -23,7 +23,6 @@ class FeedController extends Controller
|
|||
*
|
||||
* @ParamConverter("user", class="WallabagUserBundle:User", converter="username_feed_token_converter")
|
||||
*
|
||||
* @param User $user
|
||||
* @param $page
|
||||
*
|
||||
* @return \Symfony\Component\HttpFoundation\Response
|
||||
|
@ -40,7 +39,6 @@ class FeedController extends Controller
|
|||
*
|
||||
* @ParamConverter("user", class="WallabagUserBundle:User", converter="username_feed_token_converter")
|
||||
*
|
||||
* @param User $user
|
||||
* @param $page
|
||||
*
|
||||
* @return \Symfony\Component\HttpFoundation\Response
|
||||
|
@ -57,7 +55,6 @@ class FeedController extends Controller
|
|||
*
|
||||
* @ParamConverter("user", class="WallabagUserBundle:User", converter="username_feed_token_converter")
|
||||
*
|
||||
* @param User $user
|
||||
* @param $page
|
||||
*
|
||||
* @return \Symfony\Component\HttpFoundation\Response
|
||||
|
@ -147,7 +144,6 @@ class FeedController extends Controller
|
|||
* It returns the response to be send.
|
||||
*
|
||||
* @param string $type Entries type: unread, starred or archive
|
||||
* @param User $user
|
||||
* @param int $page
|
||||
*
|
||||
* @return \Symfony\Component\HttpFoundation\Response
|
||||
|
|
|
@ -36,8 +36,6 @@ class SiteCredentialController extends Controller
|
|||
*
|
||||
* @Route("/new", name="site_credentials_new", methods={"GET", "POST"})
|
||||
*
|
||||
* @param Request $request
|
||||
*
|
||||
* @return \Symfony\Component\HttpFoundation\Response
|
||||
*/
|
||||
public function newAction(Request $request)
|
||||
|
@ -76,9 +74,6 @@ class SiteCredentialController extends Controller
|
|||
*
|
||||
* @Route("/{id}/edit", name="site_credentials_edit", methods={"GET", "POST"})
|
||||
*
|
||||
* @param Request $request
|
||||
* @param SiteCredential $siteCredential
|
||||
*
|
||||
* @return \Symfony\Component\HttpFoundation\Response
|
||||
*/
|
||||
public function editAction(Request $request, SiteCredential $siteCredential)
|
||||
|
@ -119,9 +114,6 @@ class SiteCredentialController extends Controller
|
|||
*
|
||||
* @Route("/{id}", name="site_credentials_delete", methods={"DELETE"})
|
||||
*
|
||||
* @param Request $request
|
||||
* @param SiteCredential $siteCredential
|
||||
*
|
||||
* @return \Symfony\Component\HttpFoundation\RedirectResponse
|
||||
*/
|
||||
public function deleteAction(Request $request, SiteCredential $siteCredential)
|
||||
|
|
|
@ -16,9 +16,6 @@ use Wallabag\CoreBundle\Form\Type\RenameTagType;
|
|||
class TagController extends Controller
|
||||
{
|
||||
/**
|
||||
* @param Request $request
|
||||
* @param Entry $entry
|
||||
*
|
||||
* @Route("/new-tag/{entry}", requirements={"entry" = "\d+"}, name="new_tag")
|
||||
*
|
||||
* @return \Symfony\Component\HttpFoundation\Response
|
||||
|
@ -103,7 +100,6 @@ class TagController extends Controller
|
|||
}
|
||||
|
||||
/**
|
||||
* @param Tag $tag
|
||||
* @param int $page
|
||||
*
|
||||
* @Route("/tag/list/{slug}/{page}", name="tag_entries", defaults={"page" = "1"})
|
||||
|
@ -145,9 +141,6 @@ class TagController extends Controller
|
|||
* Rename a given tag with a new label
|
||||
* Create a new tag with the new name and drop the old one.
|
||||
*
|
||||
* @param Tag $tag
|
||||
* @param Request $request
|
||||
*
|
||||
* @Route("/tag/rename/{slug}", name="tag_rename")
|
||||
* @ParamConverter("tag", options={"mapping": {"slug": "slug"}})
|
||||
*
|
||||
|
|
|
@ -371,8 +371,6 @@ class Config
|
|||
}
|
||||
|
||||
/**
|
||||
* @param TaggingRule $rule
|
||||
*
|
||||
* @return Config
|
||||
*/
|
||||
public function addTaggingRule(TaggingRule $rule)
|
||||
|
|
|
@ -550,8 +550,6 @@ class Entry
|
|||
* Set created_at.
|
||||
* Only used when importing data from an other service.
|
||||
*
|
||||
* @param \DateTime $createdAt
|
||||
*
|
||||
* @return Entry
|
||||
*/
|
||||
public function setCreatedAt(\DateTime $createdAt)
|
||||
|
@ -623,9 +621,6 @@ class Entry
|
|||
return $this->annotations;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Annotation $annotation
|
||||
*/
|
||||
public function setAnnotation(Annotation $annotation)
|
||||
{
|
||||
$this->annotations[] = $annotation;
|
||||
|
@ -702,9 +697,6 @@ class Entry
|
|||
return $data;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Tag $tag
|
||||
*/
|
||||
public function addTag(Tag $tag)
|
||||
{
|
||||
if ($this->tags->contains($tag)) {
|
||||
|
@ -725,8 +717,6 @@ class Entry
|
|||
|
||||
/**
|
||||
* Remove the given tag from the entry (if the tag is associated).
|
||||
*
|
||||
* @param Tag $tag
|
||||
*/
|
||||
public function removeTag(Tag $tag)
|
||||
{
|
||||
|
@ -874,8 +864,6 @@ class Entry
|
|||
}
|
||||
|
||||
/**
|
||||
* @param \Datetime $publishedAt
|
||||
*
|
||||
* @return Entry
|
||||
*/
|
||||
public function setPublishedAt(\Datetime $publishedAt)
|
||||
|
|
|
@ -104,9 +104,6 @@ class Tag
|
|||
return $this->slug;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Entry $entry
|
||||
*/
|
||||
public function addEntry(Entry $entry)
|
||||
{
|
||||
if ($this->entries->contains($entry)) {
|
||||
|
@ -117,9 +114,6 @@ class Tag
|
|||
$entry->addTag($this);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Entry $entry
|
||||
*/
|
||||
public function removeEntry(Entry $entry)
|
||||
{
|
||||
if (!$this->entries->contains($entry)) {
|
||||
|
|
|
@ -121,8 +121,6 @@ class TaggingRule
|
|||
/**
|
||||
* Set config.
|
||||
*
|
||||
* @param Config $config
|
||||
*
|
||||
* @return TaggingRule
|
||||
*/
|
||||
public function setConfig(Config $config)
|
||||
|
|
|
@ -25,9 +25,6 @@ class UserLocaleListener
|
|||
$this->session = $session;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param InteractiveLoginEvent $event
|
||||
*/
|
||||
public function onInteractiveLogin(InteractiveLoginEvent $event)
|
||||
{
|
||||
$user = $event->getAuthenticationToken()->getUser();
|
||||
|
|
|
@ -12,9 +12,6 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface;
|
|||
*/
|
||||
class CustomDoctrineORMSubscriber extends DoctrineORMSubscriber implements EventSubscriberInterface
|
||||
{
|
||||
/**
|
||||
* @param GetFilterConditionEvent $event
|
||||
*/
|
||||
public function filterDateRange(GetFilterConditionEvent $event)
|
||||
{
|
||||
$expr = $event->getFilterQuery()->getExpressionBuilder();
|
||||
|
|
|
@ -35,8 +35,6 @@ class DownloadImagesSubscriber implements EventSubscriberInterface
|
|||
|
||||
/**
|
||||
* Download images and updated the data into the entry.
|
||||
*
|
||||
* @param EntrySavedEvent $event
|
||||
*/
|
||||
public function onEntrySaved(EntrySavedEvent $event)
|
||||
{
|
||||
|
@ -69,8 +67,6 @@ class DownloadImagesSubscriber implements EventSubscriberInterface
|
|||
|
||||
/**
|
||||
* Remove images related to the entry.
|
||||
*
|
||||
* @param EntryDeletedEvent $event
|
||||
*/
|
||||
public function onEntryDeleted(EntryDeletedEvent $event)
|
||||
{
|
||||
|
@ -88,8 +84,6 @@ class DownloadImagesSubscriber implements EventSubscriberInterface
|
|||
*
|
||||
* @todo If we want to add async download, it should be done in that method
|
||||
*
|
||||
* @param Entry $entry
|
||||
*
|
||||
* @return string|false False in case of async
|
||||
*/
|
||||
private function downloadImages(Entry $entry)
|
||||
|
@ -106,8 +100,6 @@ class DownloadImagesSubscriber implements EventSubscriberInterface
|
|||
*
|
||||
* @todo If we want to add async download, it should be done in that method
|
||||
*
|
||||
* @param Entry $entry
|
||||
*
|
||||
* @return string|false False in case of async
|
||||
*/
|
||||
private function downloadPreviewImage(Entry $entry)
|
||||
|
|
|
@ -18,9 +18,6 @@ class SQLiteCascadeDeleteSubscriber implements EventSubscriber
|
|||
{
|
||||
private $doctrine;
|
||||
|
||||
/**
|
||||
* @param \Doctrine\Bundle\DoctrineBundle\Registry $doctrine
|
||||
*/
|
||||
public function __construct(Registry $doctrine)
|
||||
{
|
||||
$this->doctrine = $doctrine;
|
||||
|
@ -39,8 +36,6 @@ class SQLiteCascadeDeleteSubscriber implements EventSubscriber
|
|||
/**
|
||||
* We removed everything related to the upcoming removed entry because SQLite can't handle it on it own.
|
||||
* We do it in the preRemove, because we can't retrieve tags in the postRemove (because the entry id is gone).
|
||||
*
|
||||
* @param LifecycleEventArgs $args
|
||||
*/
|
||||
public function preRemove(LifecycleEventArgs $args)
|
||||
{
|
||||
|
|
|
@ -23,9 +23,6 @@ class EntryFilterType extends AbstractType
|
|||
|
||||
/**
|
||||
* Repository & user are used to get a list of language entries for this user.
|
||||
*
|
||||
* @param EntityRepository $entryRepository
|
||||
* @param TokenStorageInterface $tokenStorage
|
||||
*/
|
||||
public function __construct(EntityRepository $entryRepository, TokenStorageInterface $tokenStorage)
|
||||
{
|
||||
|
|
|
@ -34,11 +34,6 @@ class GrabySiteConfigBuilder implements SiteConfigBuilder
|
|||
|
||||
/**
|
||||
* GrabySiteConfigBuilder constructor.
|
||||
*
|
||||
* @param ConfigBuilder $grabyConfigBuilder
|
||||
* @param TokenStorage $token
|
||||
* @param SiteCredentialRepository $credentialRepository
|
||||
* @param LoggerInterface $logger
|
||||
*/
|
||||
public function __construct(ConfigBuilder $grabyConfigBuilder, TokenStorage $token, SiteCredentialRepository $credentialRepository, LoggerInterface $logger)
|
||||
{
|
||||
|
|
|
@ -86,7 +86,6 @@ class ContentProxy
|
|||
/**
|
||||
* Use a Symfony validator to ensure the language is well formatted.
|
||||
*
|
||||
* @param Entry $entry
|
||||
* @param string $value Language to validate and save
|
||||
*/
|
||||
public function updateLanguage(Entry $entry, $value)
|
||||
|
@ -112,7 +111,6 @@ class ContentProxy
|
|||
/**
|
||||
* Use a Symfony validator to ensure the preview picture is a real url.
|
||||
*
|
||||
* @param Entry $entry
|
||||
* @param string $value URL to validate and save
|
||||
*/
|
||||
public function updatePreviewPicture(Entry $entry, $value)
|
||||
|
@ -134,7 +132,6 @@ class ContentProxy
|
|||
/**
|
||||
* Update date.
|
||||
*
|
||||
* @param Entry $entry
|
||||
* @param string $value Date to validate and save
|
||||
*/
|
||||
public function updatePublishedAt(Entry $entry, $value)
|
||||
|
@ -161,8 +158,6 @@ class ContentProxy
|
|||
|
||||
/**
|
||||
* Helper to extract and save host from entry url.
|
||||
*
|
||||
* @param Entry $entry
|
||||
*/
|
||||
public function setEntryDomainName(Entry $entry)
|
||||
{
|
||||
|
@ -176,8 +171,6 @@ class ContentProxy
|
|||
* Helper to set a default title using:
|
||||
* - url basename, if applicable
|
||||
* - hostname.
|
||||
*
|
||||
* @param Entry $entry
|
||||
*/
|
||||
public function setDefaultEntryTitle(Entry $entry)
|
||||
{
|
||||
|
@ -333,7 +326,6 @@ class ContentProxy
|
|||
* Update the origin_url field when a redirection occurs
|
||||
* This field is set if it is empty and new url does not match ignore list.
|
||||
*
|
||||
* @param Entry $entry
|
||||
* @param string $url
|
||||
*/
|
||||
private function updateOriginUrl(Entry $entry, $url)
|
||||
|
@ -441,8 +433,6 @@ class ContentProxy
|
|||
/**
|
||||
* Validate that the given content has at least a title, an html and a url.
|
||||
*
|
||||
* @param array $content
|
||||
*
|
||||
* @return bool true if valid otherwise false
|
||||
*/
|
||||
private function validateContent(array $content)
|
||||
|
|
|
@ -213,8 +213,6 @@ class DownloadImages
|
|||
/**
|
||||
* Get images urls from the srcset image attribute.
|
||||
*
|
||||
* @param Crawler $imagesCrawler
|
||||
*
|
||||
* @return array An array of urls
|
||||
*/
|
||||
private static function getSrcsetUrls(Crawler $imagesCrawler)
|
||||
|
|
|
@ -27,9 +27,7 @@ class HttpClientFactory implements ClientFactory
|
|||
/**
|
||||
* HttpClientFactory constructor.
|
||||
*
|
||||
* @param \GuzzleHttp\Cookie\CookieJar $cookieJar
|
||||
* @param string $restrictedAccess This param is a kind of boolean. Values: 0 or 1
|
||||
* @param LoggerInterface $logger
|
||||
* @param string $restrictedAccess This param is a kind of boolean. Values: 0 or 1
|
||||
*/
|
||||
public function __construct(CookieJar $cookieJar, $restrictedAccess, LoggerInterface $logger)
|
||||
{
|
||||
|
@ -40,8 +38,6 @@ class HttpClientFactory implements ClientFactory
|
|||
|
||||
/**
|
||||
* Adds a subscriber to the HTTP client.
|
||||
*
|
||||
* @param SubscriberInterface $subscriber
|
||||
*/
|
||||
public function addSubscriber(SubscriberInterface $subscriber)
|
||||
{
|
||||
|
@ -51,8 +47,6 @@ class HttpClientFactory implements ClientFactory
|
|||
/**
|
||||
* Input an array of configuration to be able to create a HttpClient.
|
||||
*
|
||||
* @param array $config
|
||||
*
|
||||
* @return HttpClient
|
||||
*/
|
||||
public function createClient(array $config = [])
|
||||
|
|
|
@ -20,8 +20,7 @@ class PreparePagerForEntries
|
|||
}
|
||||
|
||||
/**
|
||||
* @param AdapterInterface $adapter
|
||||
* @param User $user If user isn't logged in, we can force it (like for feed)
|
||||
* @param User $user If user isn't logged in, we can force it (like for feed)
|
||||
*
|
||||
* @return Pagerfanta|null
|
||||
*/
|
||||
|
|
|
@ -56,8 +56,6 @@ class RuleBasedTagger
|
|||
/**
|
||||
* Apply all the tagging rules defined by a user on its entries.
|
||||
*
|
||||
* @param User $user
|
||||
*
|
||||
* @return array<Entry> A list of modified entries
|
||||
*/
|
||||
public function tagAllForUser(User $user)
|
||||
|
@ -109,8 +107,6 @@ class RuleBasedTagger
|
|||
/**
|
||||
* Retrieves the tagging rules for a given user.
|
||||
*
|
||||
* @param User $user
|
||||
*
|
||||
* @return array<TaggingRule>
|
||||
*/
|
||||
private function getRulesForUser(User $user)
|
||||
|
|
|
@ -21,7 +21,6 @@ class TagsAssigner
|
|||
/**
|
||||
* Assign some tags to an entry.
|
||||
*
|
||||
* @param Entry $entry
|
||||
* @param array|string $tags An array of tag or a string coma separated of tag
|
||||
* @param array $entitiesReady Entities from the EntityManager which are persisted but not yet flushed
|
||||
* It is mostly to fix duplicate tag on import @see http://stackoverflow.com/a/7879164/569101
|
||||
|
|
|
@ -11,7 +11,6 @@ class UrlHasher
|
|||
* Hash the given url using the given algorithm.
|
||||
* Hashed url are faster to be retrieved in the database than the real url.
|
||||
*
|
||||
* @param string $url
|
||||
* @param string $algorithm
|
||||
*
|
||||
* @return string
|
||||
|
|
|
@ -306,7 +306,6 @@ class EntryRepository extends EntityRepository
|
|||
* DELETE et FROM entry_tag et WHERE et.entry_id IN ( SELECT e.id FROM entry e WHERE e.user_id = :userId ) AND et.tag_id = :tagId
|
||||
*
|
||||
* @param int $userId
|
||||
* @param Tag $tag
|
||||
*/
|
||||
public function removeTag($userId, Tag $tag)
|
||||
{
|
||||
|
@ -565,9 +564,8 @@ class EntryRepository extends EntityRepository
|
|||
/**
|
||||
* Return the given QueryBuilder with an orderBy() call.
|
||||
*
|
||||
* @param QueryBuilder $qb
|
||||
* @param string $sortBy
|
||||
* @param string $direction
|
||||
* @param string $sortBy
|
||||
* @param string $direction
|
||||
*
|
||||
* @return QueryBuilder
|
||||
*/
|
||||
|
|
|
@ -13,8 +13,6 @@ abstract class BrowserController extends Controller
|
|||
/**
|
||||
* @Route("/browser", name="import_browser")
|
||||
*
|
||||
* @param Request $request
|
||||
*
|
||||
* @return Response
|
||||
*/
|
||||
public function indexAction(Request $request)
|
||||
|
|
|
@ -16,8 +16,6 @@ abstract class WallabagController extends Controller
|
|||
/**
|
||||
* Handle import request.
|
||||
*
|
||||
* @param Request $request
|
||||
*
|
||||
* @return Response|RedirectResponse
|
||||
*/
|
||||
public function indexAction(Request $request)
|
||||
|
|
|
@ -46,8 +46,6 @@ abstract class AbstractImport implements ImportInterface
|
|||
/**
|
||||
* Set RabbitMQ/Redis Producer to send each entry to a queue.
|
||||
* This method should be called when user has enabled RabbitMQ.
|
||||
*
|
||||
* @param ProducerInterface $producer
|
||||
*/
|
||||
public function setProducer(ProducerInterface $producer)
|
||||
{
|
||||
|
@ -57,8 +55,6 @@ abstract class AbstractImport implements ImportInterface
|
|||
/**
|
||||
* Set current user.
|
||||
* Could the current *connected* user or one retrieve by the consumer.
|
||||
*
|
||||
* @param User $user
|
||||
*/
|
||||
public function setUser(User $user)
|
||||
{
|
||||
|
@ -112,8 +108,6 @@ abstract class AbstractImport implements ImportInterface
|
|||
/**
|
||||
* Parse one entry.
|
||||
*
|
||||
* @param array $importedEntry
|
||||
*
|
||||
* @return Entry
|
||||
*/
|
||||
abstract public function parseEntry(array $importedEntry);
|
||||
|
@ -121,8 +115,6 @@ abstract class AbstractImport implements ImportInterface
|
|||
/**
|
||||
* Validate that an entry is valid (like has some required keys, etc.).
|
||||
*
|
||||
* @param array $importedEntry
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
abstract public function validateEntry(array $importedEntry);
|
||||
|
@ -149,8 +141,6 @@ abstract class AbstractImport implements ImportInterface
|
|||
|
||||
/**
|
||||
* Parse and insert all given entries.
|
||||
*
|
||||
* @param array $entries
|
||||
*/
|
||||
protected function parseEntries(array $entries)
|
||||
{
|
||||
|
@ -210,8 +200,6 @@ abstract class AbstractImport implements ImportInterface
|
|||
*
|
||||
* Faster parse entries for Producer.
|
||||
* We don't care to make check at this time. They'll be done by the consumer.
|
||||
*
|
||||
* @param array $entries
|
||||
*/
|
||||
protected function parseEntriesForProducer(array $entries)
|
||||
{
|
||||
|
@ -233,8 +221,6 @@ abstract class AbstractImport implements ImportInterface
|
|||
* Set current imported entry to archived / read.
|
||||
* Implementation is different accross all imports.
|
||||
*
|
||||
* @param array $importedEntry
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
abstract protected function setEntryAsRead(array $importedEntry);
|
||||
|
|
|
@ -148,8 +148,6 @@ abstract class BrowserImport extends AbstractImport
|
|||
|
||||
/**
|
||||
* Parse and insert all given entries.
|
||||
*
|
||||
* @param array $entries
|
||||
*/
|
||||
protected function parseEntries(array $entries)
|
||||
{
|
||||
|
@ -199,8 +197,6 @@ abstract class BrowserImport extends AbstractImport
|
|||
*
|
||||
* Faster parse entries for Producer.
|
||||
* We don't care to make check at this time. They'll be done by the consumer.
|
||||
*
|
||||
* @param array $entries
|
||||
*/
|
||||
protected function parseEntriesForProducer(array $entries)
|
||||
{
|
||||
|
|
|
@ -14,8 +14,7 @@ class ImportChain
|
|||
/**
|
||||
* Add an import to the chain.
|
||||
*
|
||||
* @param ImportInterface $import
|
||||
* @param string $alias
|
||||
* @param string $alias
|
||||
*/
|
||||
public function addImport(ImportInterface $import, $alias)
|
||||
{
|
||||
|
|
|
@ -151,9 +151,6 @@ class PocketImport extends AbstractImport
|
|||
|
||||
/**
|
||||
* Set the Http client.
|
||||
*
|
||||
* @param HttpClient $client
|
||||
* @param MessageFactory|null $messageFactory
|
||||
*/
|
||||
public function setClient(HttpClient $client, MessageFactory $messageFactory = null)
|
||||
{
|
||||
|
|
|
@ -127,8 +127,7 @@ class ManageController extends Controller
|
|||
}
|
||||
|
||||
/**
|
||||
* @param Request $request
|
||||
* @param int $page
|
||||
* @param int $page
|
||||
*
|
||||
* @Route("/list/{page}", name="user_index", defaults={"page" = 1})
|
||||
*
|
||||
|
|
|
@ -188,8 +188,6 @@ class User extends BaseUser implements EmailTwoFactorInterface, GoogleTwoFactorI
|
|||
}
|
||||
|
||||
/**
|
||||
* @param Entry $entry
|
||||
*
|
||||
* @return User
|
||||
*/
|
||||
public function addEntry(Entry $entry)
|
||||
|
@ -355,8 +353,6 @@ class User extends BaseUser implements EmailTwoFactorInterface, GoogleTwoFactorI
|
|||
}
|
||||
|
||||
/**
|
||||
* @param Client $client
|
||||
*
|
||||
* @return User
|
||||
*/
|
||||
public function addClient(Client $client)
|
||||
|
|
|
@ -12,10 +12,6 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
|
|||
|
||||
class UserType extends AbstractType
|
||||
{
|
||||
/**
|
||||
* @param FormBuilderInterface $builder
|
||||
* @param array $options
|
||||
*/
|
||||
public function buildForm(FormBuilderInterface $builder, array $options)
|
||||
{
|
||||
$builder
|
||||
|
@ -50,9 +46,6 @@ class UserType extends AbstractType
|
|||
;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param OptionsResolver $resolver
|
||||
*/
|
||||
public function configureOptions(OptionsResolver $resolver)
|
||||
{
|
||||
$resolver->setDefaults([
|
||||
|
|
|
@ -57,12 +57,10 @@ class AuthCodeMailer implements AuthCodeMailerInterface
|
|||
/**
|
||||
* Initialize the auth code mailer with the SwiftMailer object.
|
||||
*
|
||||
* @param \Swift_Mailer $mailer
|
||||
* @param Environment $twig
|
||||
* @param string $senderEmail
|
||||
* @param string $senderName
|
||||
* @param string $supportUrl wallabag support url
|
||||
* @param string $wallabagUrl wallabag instance url
|
||||
* @param string $senderEmail
|
||||
* @param string $senderName
|
||||
* @param string $supportUrl wallabag support url
|
||||
* @param string $wallabagUrl wallabag instance url
|
||||
*/
|
||||
public function __construct(\Swift_Mailer $mailer, Environment $twig, $senderEmail, $senderName, $supportUrl, $wallabagUrl)
|
||||
{
|
||||
|
@ -76,8 +74,6 @@ class AuthCodeMailer implements AuthCodeMailerInterface
|
|||
|
||||
/**
|
||||
* Send the auth code to the user via email.
|
||||
*
|
||||
* @param TwoFactorInterface $user
|
||||
*/
|
||||
public function sendAuthCode(TwoFactorInterface $user): void
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue