Remove the CoreBundle namespace

This commit is contained in:
Yassine Guedidi 2024-02-19 01:30:12 +01:00
parent fe039247b5
commit 0b44170e83
338 changed files with 1061 additions and 1061 deletions

View file

@ -3,7 +3,7 @@
use Symfony\Component\Config\Loader\LoaderInterface; use Symfony\Component\Config\Loader\LoaderInterface;
use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\HttpKernel\Kernel; use Symfony\Component\HttpKernel\Kernel;
use Wallabag\CoreBundle\Import\ImportCompilerPass; use Wallabag\Import\ImportCompilerPass;
class AppKernel extends Kernel class AppKernel extends Kernel
{ {

View file

@ -6,7 +6,7 @@ use Doctrine\DBAL\Platforms\MySQLPlatform;
use Doctrine\DBAL\Platforms\PostgreSQLPlatform; use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
use Doctrine\DBAL\Platforms\SqlitePlatform; use Doctrine\DBAL\Platforms\SqlitePlatform;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Initial database structure. * Initial database structure.

View file

@ -3,7 +3,7 @@
namespace Application\Migrations; namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Added foreign keys for account resetting. * Added foreign keys for account resetting.

View file

@ -4,7 +4,7 @@ namespace Application\Migrations;
use Doctrine\DBAL\Platforms\SqlitePlatform; use Doctrine\DBAL\Platforms\SqlitePlatform;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Added name field on wallabag_oauth2_clients. * Added name field on wallabag_oauth2_clients.

View file

@ -3,7 +3,7 @@
namespace Application\Migrations; namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Added settings for RabbitMQ and Redis imports. * Added settings for RabbitMQ and Redis imports.

View file

@ -3,7 +3,7 @@
namespace Application\Migrations; namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Added pocket_consumer_key field on wallabag_config. * Added pocket_consumer_key field on wallabag_config.

View file

@ -7,7 +7,7 @@ use Doctrine\DBAL\Platforms\MySQLPlatform;
use Doctrine\DBAL\Platforms\PostgreSQLPlatform; use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
use Doctrine\DBAL\Platforms\SqlitePlatform; use Doctrine\DBAL\Platforms\SqlitePlatform;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Added pocket_consumer_key field on wallabag_config. * Added pocket_consumer_key field on wallabag_config.

View file

@ -4,7 +4,7 @@ namespace Application\Migrations;
use Doctrine\DBAL\Platforms\MySQLPlatform; use Doctrine\DBAL\Platforms\MySQLPlatform;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Converted database to utf8mb4 encoding (for MySQL only). * Converted database to utf8mb4 encoding (for MySQL only).

View file

@ -4,7 +4,7 @@ namespace Application\Migrations;
use Doctrine\DBAL\Platforms\SqlitePlatform; use Doctrine\DBAL\Platforms\SqlitePlatform;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Added user_id column on oauth2_clients to prevent users to delete API clients from other users. * Added user_id column on oauth2_clients to prevent users to delete API clients from other users.

View file

@ -3,7 +3,7 @@
namespace Application\Migrations; namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Added the internal setting to enable/disable downloading pictures. * Added the internal setting to enable/disable downloading pictures.

View file

@ -3,7 +3,7 @@
namespace Application\Migrations; namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Added created_at index on entry table. * Added created_at index on entry table.

View file

@ -3,7 +3,7 @@
namespace Application\Migrations; namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Added action_mark_as_read field on config table. * Added action_mark_as_read field on config table.

View file

@ -3,7 +3,7 @@
namespace Application\Migrations; namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Added the internal setting to share articles to unmark.it. * Added the internal setting to share articles to unmark.it.

View file

@ -3,7 +3,7 @@
namespace Application\Migrations; namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Add http_status in `entry_table`. * Add http_status in `entry_table`.

View file

@ -3,7 +3,7 @@
namespace Application\Migrations; namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Add the restricted_access internal setting for articles with paywall. * Add the restricted_access internal setting for articles with paywall.

View file

@ -3,7 +3,7 @@
namespace Application\Migrations; namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Methods and properties removed from `FOS\UserBundle\Model\User`. * Methods and properties removed from `FOS\UserBundle\Model\User`.

View file

@ -3,7 +3,7 @@
namespace Application\Migrations; namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Added list_mode in user config. * Added list_mode in user config.

View file

@ -3,7 +3,7 @@
namespace Application\Migrations; namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Removed locked, credentials_expire_at and expires_at. * Removed locked, credentials_expire_at and expires_at.

View file

@ -6,7 +6,7 @@ use Doctrine\DBAL\Platforms\MySQLPlatform;
use Doctrine\DBAL\Platforms\PostgreSQLPlatform; use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
use Doctrine\DBAL\Platforms\SqlitePlatform; use Doctrine\DBAL\Platforms\SqlitePlatform;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Renamed uuid to uid in entry table. * Renamed uuid to uid in entry table.

View file

@ -3,7 +3,7 @@
namespace Application\Migrations; namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Added index on wallabag_entry.uid. * Added index on wallabag_entry.uid.

View file

@ -3,7 +3,7 @@
namespace Application\Migrations; namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Added indexes on wallabag_entry.is_starred and wallabag_entry.is_archived. * Added indexes on wallabag_entry.is_starred and wallabag_entry.is_archived.

View file

@ -3,7 +3,7 @@
namespace Application\Migrations; namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Add the share_scuttle internal setting. * Add the share_scuttle internal setting.

View file

@ -3,7 +3,7 @@
namespace Application\Migrations; namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Add published_at and published_by in `entry` table. * Add published_at and published_by in `entry` table.

View file

@ -3,7 +3,7 @@
namespace Application\Migrations; namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Remove isPublic in Entry Table. * Remove isPublic in Entry Table.

View file

@ -3,7 +3,7 @@
namespace Application\Migrations; namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Remove download_pictures in craue_config_setting. * Remove download_pictures in craue_config_setting.

View file

@ -4,7 +4,7 @@ namespace Application\Migrations;
use Doctrine\DBAL\Platforms\PostgreSQLPlatform; use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Add site credential table to store username & password for some website (behind authentication or paywall). * Add site credential table to store username & password for some website (behind authentication or paywall).

View file

@ -4,7 +4,7 @@ namespace Application\Migrations;
use Doctrine\DBAL\Platforms\MySQLPlatform; use Doctrine\DBAL\Platforms\MySQLPlatform;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Changed length for username, username_canonical, email and email_canonical fields in wallabag_user table. * Changed length for username, username_canonical, email and email_canonical fields in wallabag_user table.

View file

@ -3,7 +3,7 @@
namespace Application\Migrations; namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Added `headers` field in entry table. * Added `headers` field in entry table.

View file

@ -7,7 +7,7 @@ use Doctrine\DBAL\Platforms\MySQLPlatform;
use Doctrine\DBAL\Platforms\PostgreSQLPlatform; use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
use Doctrine\DBAL\Platforms\SqlitePlatform; use Doctrine\DBAL\Platforms\SqlitePlatform;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Increase the length of the "quote" column of "annotation" table. * Increase the length of the "quote" column of "annotation" table.

View file

@ -3,7 +3,7 @@
namespace Application\Migrations; namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Add api_user_registration in craue_config_setting. * Add api_user_registration in craue_config_setting.

View file

@ -3,7 +3,7 @@
namespace Application\Migrations; namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Remove wallabag_url from craue_config_setting. * Remove wallabag_url from craue_config_setting.

View file

@ -4,7 +4,7 @@ namespace Application\Migrations;
use Doctrine\DBAL\Platforms\SqlitePlatform; use Doctrine\DBAL\Platforms\SqlitePlatform;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Changed tags to lowercase. * Changed tags to lowercase.

View file

@ -3,7 +3,7 @@
namespace Application\Migrations; namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Add starred_at column and set its value to updated_at for is_starred entries. * Add starred_at column and set its value to updated_at for is_starred entries.

View file

@ -6,7 +6,7 @@ use Doctrine\DBAL\Platforms\MySQLPlatform;
use Doctrine\DBAL\Platforms\PostgreSQLPlatform; use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
use Doctrine\DBAL\Platforms\SqlitePlatform; use Doctrine\DBAL\Platforms\SqlitePlatform;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Changed reading_time field to prevent null value. * Changed reading_time field to prevent null value.

View file

@ -3,7 +3,7 @@
namespace Application\Migrations; namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Add origin_url column. * Add origin_url column.

View file

@ -3,7 +3,7 @@
namespace Application\Migrations; namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Add store_article_headers in craue_config_setting. * Add store_article_headers in craue_config_setting.

View file

@ -3,7 +3,7 @@
namespace Application\Migrations; namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Add shaarli_share_origin_url in craue_config_setting. * Add shaarli_share_origin_url in craue_config_setting.

View file

@ -3,7 +3,7 @@
namespace Application\Migrations; namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Add archived_at column and set its value to updated_at for is_archived entries. * Add archived_at column and set its value to updated_at for is_archived entries.

View file

@ -4,7 +4,7 @@ namespace Application\Migrations;
use Doctrine\DBAL\Platforms\MySQLPlatform; use Doctrine\DBAL\Platforms\MySQLPlatform;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Fix varchar field from vendor to work with utf8mb4. * Fix varchar field from vendor to work with utf8mb4.

View file

@ -6,7 +6,7 @@ use Doctrine\DBAL\Platforms\MySQLPlatform;
use Doctrine\DBAL\Platforms\PostgreSQLPlatform; use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
use Doctrine\DBAL\Platforms\SqlitePlatform; use Doctrine\DBAL\Platforms\SqlitePlatform;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Add 2fa OTP stuff. * Add 2fa OTP stuff.

View file

@ -3,7 +3,7 @@
namespace Application\Migrations; namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Add updated_at fields to site_credential table. * Add updated_at fields to site_credential table.

View file

@ -3,7 +3,7 @@
namespace Application\Migrations; namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Add missing entries in craue_config_setting. * Add missing entries in craue_config_setting.

View file

@ -3,7 +3,7 @@
namespace Application\Migrations; namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Add hashed_url in entry. * Add hashed_url in entry.

View file

@ -6,7 +6,7 @@ use Doctrine\DBAL\Platforms\MySQLPlatform;
use Doctrine\DBAL\Platforms\PostgreSQLPlatform; use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
use Doctrine\DBAL\Platforms\SqlitePlatform; use Doctrine\DBAL\Platforms\SqlitePlatform;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Rename rss_token & rss_limit to feed_token & feed_limit. * Rename rss_token & rss_limit to feed_token & feed_limit.

View file

@ -7,7 +7,7 @@ use Doctrine\DBAL\Platforms\MySQLPlatform;
use Doctrine\DBAL\Platforms\PostgreSQLPlatform; use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
use Doctrine\DBAL\Platforms\SqlitePlatform; use Doctrine\DBAL\Platforms\SqlitePlatform;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Enable cascade delete when deleting a user on: * Enable cascade delete when deleting a user on:

View file

@ -6,7 +6,7 @@ namespace Application\Migrations;
use Doctrine\DBAL\Platforms\MySQLPlatform; use Doctrine\DBAL\Platforms\MySQLPlatform;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Convert tab label to utf8mb4_bin (MySQL only). * Convert tab label to utf8mb4_bin (MySQL only).

View file

@ -3,7 +3,7 @@
namespace Application\Migrations; namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Added `given_url` & `hashed_given_url` field in entry table. * Added `given_url` & `hashed_given_url` field in entry table.

View file

@ -4,7 +4,7 @@ namespace Application\Migrations;
use Doctrine\DBAL\Platforms\SqlitePlatform; use Doctrine\DBAL\Platforms\SqlitePlatform;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Change reading_time field on SQLite to be integer NOT NULL * Change reading_time field on SQLite to be integer NOT NULL

View file

@ -3,7 +3,7 @@
namespace Application\Migrations; namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Change reading speed value. * Change reading speed value.

View file

@ -6,7 +6,7 @@ use Doctrine\DBAL\Platforms\MySQLPlatform;
use Doctrine\DBAL\Platforms\PostgreSQLPlatform; use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
use Doctrine\DBAL\Platforms\SqlitePlatform; use Doctrine\DBAL\Platforms\SqlitePlatform;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Adding more index to kill some slow queries: * Adding more index to kill some slow queries:

View file

@ -6,7 +6,7 @@ use Doctrine\DBAL\Platforms\MySQLPlatform;
use Doctrine\DBAL\Platforms\PostgreSQLPlatform; use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
use Doctrine\DBAL\Platforms\SqlitePlatform; use Doctrine\DBAL\Platforms\SqlitePlatform;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Change the internal setting table name. * Change the internal setting table name.

View file

@ -6,7 +6,7 @@ namespace Application\Migrations;
use Doctrine\DBAL\Platforms\PostgreSQLPlatform; use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Add tables for the ignore origin rules. * Add tables for the ignore origin rules.

View file

@ -4,7 +4,7 @@ namespace Application\Migrations;
use Doctrine\DBAL\Migrations\SkipMigrationException; use Doctrine\DBAL\Migrations\SkipMigrationException;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Remove baggy theme. * Remove baggy theme.

View file

@ -5,7 +5,7 @@ declare(strict_types=1);
namespace Application\Migrations; namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Renamed Piwik to Matomo in configuration. * Renamed Piwik to Matomo in configuration.

View file

@ -3,7 +3,7 @@
namespace Application\Migrations; namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Drop theme fields from config table. * Drop theme fields from config table.

View file

@ -6,7 +6,7 @@ use Doctrine\DBAL\Platforms\MySQLPlatform;
use Doctrine\DBAL\Platforms\PostgreSQLPlatform; use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
use Doctrine\DBAL\Platforms\SqlitePlatform; use Doctrine\DBAL\Platforms\SqlitePlatform;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Remove the deprecated (and removed in DBAL v3) `json_array` type. * Remove the deprecated (and removed in DBAL v3) `json_array` type.

View file

@ -3,7 +3,7 @@
namespace Application\Migrations; namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Added a new setting to display or not thumbnails. * Added a new setting to display or not thumbnails.

View file

@ -5,7 +5,7 @@ declare(strict_types=1);
namespace Application\Migrations; namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Remove demonstration mode settings. * Remove demonstration mode settings.

View file

@ -5,7 +5,7 @@ declare(strict_types=1);
namespace Application\Migrations; namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Remove mobi export. * Remove mobi export.

View file

@ -5,7 +5,7 @@ declare(strict_types=1);
namespace Application\Migrations; namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Add is_not_parsed field to entry table. * Add is_not_parsed field to entry table.

View file

@ -5,7 +5,7 @@ declare(strict_types=1);
namespace Application\Migrations; namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration; use Wallabag\Doctrine\WallabagMigration;
/** /**
* Add custom_css column to config table. * Add custom_css column to config table.

View file

@ -61,7 +61,7 @@ doctrine:
dbal: dbal:
url: '%env(resolve:DATABASE_URL)%' url: '%env(resolve:DATABASE_URL)%'
types: types:
json_array: Wallabag\CoreBundle\Doctrine\JsonArrayType json_array: Wallabag\Doctrine\JsonArrayType
orm: orm:
auto_generate_proxy_classes: "%kernel.debug%" auto_generate_proxy_classes: "%kernel.debug%"
@ -73,7 +73,7 @@ doctrine:
type: annotation type: annotation
is_bundle: false is_bundle: false
dir: '%kernel.project_dir%/src/Entity' dir: '%kernel.project_dir%/src/Entity'
prefix: 'Wallabag\CoreBundle\Entity' prefix: 'Wallabag\Entity'
alias: Wallabag alias: Wallabag
stof_doctrine_extensions: stof_doctrine_extensions:
@ -177,7 +177,7 @@ nelmio_cors:
fos_user: fos_user:
db_driver: orm db_driver: orm
firewall_name: secured_area firewall_name: secured_area
user_class: Wallabag\CoreBundle\Entity\User user_class: Wallabag\Entity\User
registration: registration:
confirmation: confirmation:
enabled: "%fosuser_confirmation%" enabled: "%fosuser_confirmation%"
@ -185,14 +185,14 @@ fos_user:
address: "%from_email%" address: "%from_email%"
sender_name: wallabag sender_name: wallabag
service: service:
mailer: Wallabag\CoreBundle\Mailer\UserMailer mailer: Wallabag\Mailer\UserMailer
fos_oauth_server: fos_oauth_server:
db_driver: orm db_driver: orm
client_class: Wallabag\CoreBundle\Entity\Api\Client client_class: Wallabag\Entity\Api\Client
access_token_class: Wallabag\CoreBundle\Entity\Api\AccessToken access_token_class: Wallabag\Entity\Api\AccessToken
refresh_token_class: Wallabag\CoreBundle\Entity\Api\RefreshToken refresh_token_class: Wallabag\Entity\Api\RefreshToken
auth_code_class: Wallabag\CoreBundle\Entity\Api\AuthCode auth_code_class: Wallabag\Entity\Api\AuthCode
service: service:
user_provider: fos_user.user_provider.username_email user_provider: fos_user.user_provider.username_email
options: options:
@ -218,7 +218,7 @@ scheb_two_factor:
sender_email: "%twofactor_sender%" sender_email: "%twofactor_sender%"
digits: 6 digits: 6
template: "Authentication/form.html.twig" template: "Authentication/form.html.twig"
mailer: Wallabag\CoreBundle\Mailer\AuthCodeMailer mailer: Wallabag\Mailer\AuthCodeMailer
rulerz: rulerz:
targets: targets:
@ -433,7 +433,7 @@ sensio_framework_extra:
httplug: httplug:
clients: clients:
wallabag_core: wallabag_core:
factory: Wallabag\CoreBundle\Helper\HttpClientFactory factory: Wallabag\Helper\HttpClientFactory
config: config:
defaults: defaults:
timeout: 10 timeout: 10
@ -443,7 +443,7 @@ httplug:
# define custom entity so we can override length attribute to fix utf8mb4 issue # define custom entity so we can override length attribute to fix utf8mb4 issue
craue_config: craue_config:
entity_name: Wallabag\CoreBundle\Entity\InternalSetting entity_name: Wallabag\Entity\InternalSetting
when@dev: when@dev:
maker: maker:

View file

@ -9,7 +9,7 @@ doc-api:
homepage: homepage:
path: "/{page}" path: "/{page}"
defaults: defaults:
_controller: 'Wallabag\CoreBundle\Controller\EntryController::showUnreadAction' _controller: 'Wallabag\Controller\EntryController::showUnreadAction'
page : 1 page : 1
requirements: requirements:
page: \d+ page: \d+

View file

@ -9,7 +9,7 @@ security:
providers: providers:
administrators: administrators:
entity: entity:
class: 'Wallabag\CoreBundle\Entity\User' class: 'Wallabag\Entity\User'
property: username property: username
fos_userbundle: fos_userbundle:
id: fos_user.user_provider.username_email id: fos_user.user_provider.username_email

View file

@ -4,7 +4,7 @@ imports:
- { resource: parameters_addons.yml } - { resource: parameters_addons.yml }
parameters: parameters:
spiriit_form_filter.get_filter.doctrine_orm.class: Wallabag\CoreBundle\Event\Subscriber\CustomDoctrineORMSubscriber spiriit_form_filter.get_filter.doctrine_orm.class: Wallabag\Event\Subscriber\CustomDoctrineORMSubscriber
services: services:
_defaults: _defaults:
@ -32,73 +32,73 @@ services:
$supportUrl: '@=service(''craue_config'').get(''wallabag_support_url'')' $supportUrl: '@=service(''craue_config'').get(''wallabag_support_url'')'
$fonts: '%wallabag_core.fonts%' $fonts: '%wallabag_core.fonts%'
Wallabag\CoreBundle\: Wallabag\:
resource: '../../src/*' resource: '../../src/*'
exclude: ['../../src/{Consumer,Controller,Entity,ExpressionLanguage,DataFixtures,Redis}', '../../src/Event/*Event.php'] exclude: ['../../src/{Consumer,Controller,Entity,ExpressionLanguage,DataFixtures,Redis}', '../../src/Event/*Event.php']
# controllers are imported separately to make sure services can be injected # controllers are imported separately to make sure services can be injected
# as action arguments even if you don't extend any base controller class # as action arguments even if you don't extend any base controller class
Wallabag\CoreBundle\Controller\: Wallabag\Controller\:
resource: '../../src/Controller/' resource: '../../src/Controller/'
tags: ['controller.service_arguments'] tags: ['controller.service_arguments']
# inject alias service into controllers # inject alias service into controllers
Wallabag\CoreBundle\Controller\Import\ChromeController: Wallabag\Controller\Import\ChromeController:
arguments: arguments:
$rabbitMqProducer: '@old_sound_rabbit_mq.import_chrome_producer' $rabbitMqProducer: '@old_sound_rabbit_mq.import_chrome_producer'
$redisProducer: '@wallabag_core.producer.redis.chrome' $redisProducer: '@wallabag_core.producer.redis.chrome'
Wallabag\CoreBundle\Controller\Import\DeliciousController: Wallabag\Controller\Import\DeliciousController:
arguments: arguments:
$rabbitMqProducer: '@old_sound_rabbit_mq.import_delicious_producer' $rabbitMqProducer: '@old_sound_rabbit_mq.import_delicious_producer'
$redisProducer: '@wallabag_core.producer.redis.delicious' $redisProducer: '@wallabag_core.producer.redis.delicious'
Wallabag\CoreBundle\Controller\Import\ElcuratorController: Wallabag\Controller\Import\ElcuratorController:
arguments: arguments:
$rabbitMqProducer: '@old_sound_rabbit_mq.import_elcurator_producer' $rabbitMqProducer: '@old_sound_rabbit_mq.import_elcurator_producer'
$redisProducer: '@wallabag_core.producer.redis.elcurator' $redisProducer: '@wallabag_core.producer.redis.elcurator'
Wallabag\CoreBundle\Controller\Import\FirefoxController: Wallabag\Controller\Import\FirefoxController:
arguments: arguments:
$rabbitMqProducer: '@old_sound_rabbit_mq.import_firefox_producer' $rabbitMqProducer: '@old_sound_rabbit_mq.import_firefox_producer'
$redisProducer: '@wallabag_core.producer.redis.firefox' $redisProducer: '@wallabag_core.producer.redis.firefox'
Wallabag\CoreBundle\Controller\Import\InstapaperController: Wallabag\Controller\Import\InstapaperController:
arguments: arguments:
$rabbitMqProducer: '@old_sound_rabbit_mq.import_instapaper_producer' $rabbitMqProducer: '@old_sound_rabbit_mq.import_instapaper_producer'
$redisProducer: '@wallabag_core.producer.redis.instapaper' $redisProducer: '@wallabag_core.producer.redis.instapaper'
Wallabag\CoreBundle\Controller\Import\PinboardController: Wallabag\Controller\Import\PinboardController:
arguments: arguments:
$rabbitMqProducer: '@old_sound_rabbit_mq.import_pinboard_producer' $rabbitMqProducer: '@old_sound_rabbit_mq.import_pinboard_producer'
$redisProducer: '@wallabag_core.producer.redis.pinboard' $redisProducer: '@wallabag_core.producer.redis.pinboard'
Wallabag\CoreBundle\Controller\Import\PocketController: Wallabag\Controller\Import\PocketController:
arguments: arguments:
$rabbitMqProducer: '@old_sound_rabbit_mq.import_pocket_producer' $rabbitMqProducer: '@old_sound_rabbit_mq.import_pocket_producer'
$redisProducer: '@wallabag_core.producer.redis.pocket' $redisProducer: '@wallabag_core.producer.redis.pocket'
Wallabag\CoreBundle\Controller\Import\ReadabilityController: Wallabag\Controller\Import\ReadabilityController:
arguments: arguments:
$rabbitMqProducer: '@old_sound_rabbit_mq.import_readability_producer' $rabbitMqProducer: '@old_sound_rabbit_mq.import_readability_producer'
$redisProducer: '@wallabag_core.producer.redis.readability' $redisProducer: '@wallabag_core.producer.redis.readability'
Wallabag\CoreBundle\Controller\Import\WallabagV1Controller: Wallabag\Controller\Import\WallabagV1Controller:
arguments: arguments:
$rabbitMqProducer: '@old_sound_rabbit_mq.import_wallabag_v1_producer' $rabbitMqProducer: '@old_sound_rabbit_mq.import_wallabag_v1_producer'
$redisProducer: '@wallabag_core.producer.redis.wallabag_v1' $redisProducer: '@wallabag_core.producer.redis.wallabag_v1'
Wallabag\CoreBundle\Controller\Import\WallabagV2Controller: Wallabag\Controller\Import\WallabagV2Controller:
arguments: arguments:
$rabbitMqProducer: '@old_sound_rabbit_mq.import_wallabag_v2_producer' $rabbitMqProducer: '@old_sound_rabbit_mq.import_wallabag_v2_producer'
$redisProducer: '@wallabag_core.producer.redis.wallabag_v2' $redisProducer: '@wallabag_core.producer.redis.wallabag_v2'
Wallabag\CoreBundle\Controller\Import\ShaarliController: Wallabag\Controller\Import\ShaarliController:
arguments: arguments:
$rabbitMqProducer: '@old_sound_rabbit_mq.import_shaarli_producer' $rabbitMqProducer: '@old_sound_rabbit_mq.import_shaarli_producer'
$redisProducer: '@wallabag_core.producer.redis.shaarli' $redisProducer: '@wallabag_core.producer.redis.shaarli'
Wallabag\CoreBundle\Controller\Import\PocketHtmlController: Wallabag\Controller\Import\PocketHtmlController:
arguments: arguments:
$rabbitMqProducer: '@old_sound_rabbit_mq.import_pocket_html_producer' $rabbitMqProducer: '@old_sound_rabbit_mq.import_pocket_html_producer'
$redisProducer: '@wallabag_core.producer.redis.pocket_html' $redisProducer: '@wallabag_core.producer.redis.pocket_html'
@ -154,7 +154,7 @@ services:
ScssPhp\ScssPhp\Compiler: ScssPhp\ScssPhp\Compiler:
public: false public: false
Wallabag\CoreBundle\Event\Listener\UserLocaleListener: Wallabag\Event\Listener\UserLocaleListener:
tags: tags:
- { name: kernel.event_listener, event: security.interactive_login, method: onInteractiveLogin } - { name: kernel.event_listener, event: security.interactive_login, method: onInteractiveLogin }
@ -166,11 +166,11 @@ services:
$defaultLifetime: 0 $defaultLifetime: 0
$directory: '%kernel.cache_dir%' $directory: '%kernel.cache_dir%'
Wallabag\CoreBundle\ParamConverter\UsernameFeedTokenConverter: Wallabag\ParamConverter\UsernameFeedTokenConverter:
tags: tags:
- { name: request.param_converter, converter: username_feed_token_converter } - { name: request.param_converter, converter: username_feed_token_converter }
Wallabag\CoreBundle\Event\Subscriber\TablePrefixSubscriber: Wallabag\Event\Subscriber\TablePrefixSubscriber:
tags: tags:
- { name: doctrine.event_subscriber } - { name: doctrine.event_subscriber }
@ -191,42 +191,42 @@ services:
wallabag_core.http_client: wallabag_core.http_client:
alias: 'httplug.client.wallabag_core' alias: 'httplug.client.wallabag_core'
Wallabag\CoreBundle\SiteConfig\GrabySiteConfigBuilder: Wallabag\SiteConfig\GrabySiteConfigBuilder:
tags: tags:
- { name: monolog.logger, channel: graby } - { name: monolog.logger, channel: graby }
# service alias override # service alias override
Wallabag\CoreBundle\SiteConfig\SiteConfigBuilder: Wallabag\SiteConfig\SiteConfigBuilder:
alias: Wallabag\CoreBundle\SiteConfig\GrabySiteConfigBuilder alias: Wallabag\SiteConfig\GrabySiteConfigBuilder
GuzzleHttp\Cookie\CookieJar: GuzzleHttp\Cookie\CookieJar:
alias: 'Wallabag\CoreBundle\Helper\FileCookieJar' alias: 'Wallabag\Helper\FileCookieJar'
Wallabag\CoreBundle\Helper\HttpClientFactory: Wallabag\Helper\HttpClientFactory:
calls: calls:
- ['addSubscriber', ['@Wallabag\CoreBundle\Guzzle\AuthenticatorSubscriber']] - ['addSubscriber', ['@Wallabag\Guzzle\AuthenticatorSubscriber']]
- ['addSubscriber', ['@Wallabag\CoreBundle\Guzzle\FixupMondeDiplomatiqueUriSubscriber']] - ['addSubscriber', ['@Wallabag\Guzzle\FixupMondeDiplomatiqueUriSubscriber']]
RulerZ\RulerZ: RulerZ\RulerZ:
alias: rulerz alias: rulerz
Wallabag\CoreBundle\Operator\PHP\Matches: Wallabag\Operator\PHP\Matches:
tags: tags:
- { name: rulerz.operator, target: native, operator: matches } - { name: rulerz.operator, target: native, operator: matches }
Wallabag\CoreBundle\Operator\Doctrine\Matches: Wallabag\Operator\Doctrine\Matches:
tags: tags:
- { name: rulerz.operator, target: doctrine, operator: matches, inline: true } - { name: rulerz.operator, target: doctrine, operator: matches, inline: true }
Wallabag\CoreBundle\Operator\PHP\NotMatches: Wallabag\Operator\PHP\NotMatches:
tags: tags:
- { name: rulerz.operator, target: native, operator: notmatches } - { name: rulerz.operator, target: native, operator: notmatches }
Wallabag\CoreBundle\Operator\Doctrine\NotMatches: Wallabag\Operator\Doctrine\NotMatches:
tags: tags:
- { name: rulerz.operator, target: doctrine, operator: notmatches, inline: true } - { name: rulerz.operator, target: doctrine, operator: notmatches, inline: true }
Wallabag\CoreBundle\Operator\PHP\PatternMatches: Wallabag\Operator\PHP\PatternMatches:
tags: tags:
- { name: rulerz.operator, target: native, operator: "~" } - { name: rulerz.operator, target: native, operator: "~" }
@ -239,26 +239,26 @@ services:
path: '%redis_path%' path: '%redis_path%'
password: '%redis_password%' password: '%redis_password%'
Wallabag\CoreBundle\Event\Subscriber\SQLiteCascadeDeleteSubscriber: Wallabag\Event\Subscriber\SQLiteCascadeDeleteSubscriber:
tags: tags:
- { name: doctrine.event_subscriber } - { name: doctrine.event_subscriber }
Wallabag\CoreBundle\Event\Subscriber\DownloadImagesSubscriber: Wallabag\Event\Subscriber\DownloadImagesSubscriber:
arguments: arguments:
$enabled: '@=service(''craue_config'').get(''download_images_enabled'')' $enabled: '@=service(''craue_config'').get(''download_images_enabled'')'
Wallabag\CoreBundle\Helper\DownloadImages: Wallabag\Helper\DownloadImages:
arguments: arguments:
$baseFolder: "%kernel.project_dir%/web/assets/images" $baseFolder: "%kernel.project_dir%/web/assets/images"
Wallabag\CoreBundle\Command\InstallCommand: Wallabag\Command\InstallCommand:
arguments: arguments:
$databaseDriver: '%database_driver%' $databaseDriver: '%database_driver%'
$databaseName: '%database_name%' $databaseName: '%database_name%'
$defaultSettings: '%wallabag_core.default_internal_settings%' $defaultSettings: '%wallabag_core.default_internal_settings%'
$defaultIgnoreOriginInstanceRules: '%wallabag_core.default_ignore_origin_instance_rules%' $defaultIgnoreOriginInstanceRules: '%wallabag_core.default_ignore_origin_instance_rules%'
Wallabag\CoreBundle\Mailer\UserMailer: Wallabag\Mailer\UserMailer:
arguments: arguments:
$parameters: $parameters:
template: template:
@ -268,7 +268,7 @@ services:
confirmation: '%fos_user.registration.confirmation.from_email%' confirmation: '%fos_user.registration.confirmation.from_email%'
resetting: '%fos_user.resetting.email.from_email%' resetting: '%fos_user.resetting.email.from_email%'
Wallabag\CoreBundle\Event\Listener\CreateConfigListener: Wallabag\Event\Listener\CreateConfigListener:
arguments: arguments:
$itemsOnPage: "%wallabag_core.items_on_page%" $itemsOnPage: "%wallabag_core.items_on_page%"
$feedLimit: "%wallabag_core.feed_limit%" $feedLimit: "%wallabag_core.feed_limit%"
@ -278,57 +278,57 @@ services:
$listMode: "%wallabag_core.list_mode%" $listMode: "%wallabag_core.list_mode%"
$displayThumbnails: "%wallabag_core.display_thumbnails%" $displayThumbnails: "%wallabag_core.display_thumbnails%"
Wallabag\CoreBundle\Event\Listener\AuthenticationFailureListener: Wallabag\Event\Listener\AuthenticationFailureListener:
tags: tags:
- { name: kernel.event_listener, event: security.authentication.failure, method: onAuthenticationFailure } - { name: kernel.event_listener, event: security.authentication.failure, method: onAuthenticationFailure }
Wallabag\CoreBundle\Import\PocketImport: Wallabag\Import\PocketImport:
calls: calls:
- [ setClient, [ '@Symfony\Contracts\HttpClient\HttpClientInterface $pocketClient' ] ] - [ setClient, [ '@Symfony\Contracts\HttpClient\HttpClientInterface $pocketClient' ] ]
tags: tags:
- { name: wallabag_core.import, alias: pocket } - { name: wallabag_core.import, alias: pocket }
Wallabag\CoreBundle\Import\WallabagV1Import: Wallabag\Import\WallabagV1Import:
tags: tags:
- { name: wallabag_core.import, alias: wallabag_v1 } - { name: wallabag_core.import, alias: wallabag_v1 }
Wallabag\CoreBundle\Import\WallabagV2Import: Wallabag\Import\WallabagV2Import:
tags: tags:
- { name: wallabag_core.import, alias: wallabag_v2 } - { name: wallabag_core.import, alias: wallabag_v2 }
Wallabag\CoreBundle\Import\ElcuratorImport: Wallabag\Import\ElcuratorImport:
tags: tags:
- { name: wallabag_core.import, alias: elcurator } - { name: wallabag_core.import, alias: elcurator }
Wallabag\CoreBundle\Import\ReadabilityImport: Wallabag\Import\ReadabilityImport:
tags: tags:
- { name: wallabag_core.import, alias: readability } - { name: wallabag_core.import, alias: readability }
Wallabag\CoreBundle\Import\InstapaperImport: Wallabag\Import\InstapaperImport:
tags: tags:
- { name: wallabag_core.import, alias: instapaper } - { name: wallabag_core.import, alias: instapaper }
Wallabag\CoreBundle\Import\PinboardImport: Wallabag\Import\PinboardImport:
tags: tags:
- { name: wallabag_core.import, alias: pinboard } - { name: wallabag_core.import, alias: pinboard }
Wallabag\CoreBundle\Import\DeliciousImport: Wallabag\Import\DeliciousImport:
tags: tags:
- { name: wallabag_core.import, alias: delicious } - { name: wallabag_core.import, alias: delicious }
Wallabag\CoreBundle\Import\FirefoxImport: Wallabag\Import\FirefoxImport:
tags: tags:
- { name: wallabag_core.import, alias: firefox } - { name: wallabag_core.import, alias: firefox }
Wallabag\CoreBundle\Import\ChromeImport: Wallabag\Import\ChromeImport:
tags: tags:
- { name: wallabag_core.import, alias: chrome } - { name: wallabag_core.import, alias: chrome }
Wallabag\CoreBundle\Import\ShaarliImport: Wallabag\Import\ShaarliImport:
tags: tags:
- { name: wallabag_core.import, alias: shaarli } - { name: wallabag_core.import, alias: shaarli }
Wallabag\CoreBundle\Import\PocketHtmlImport: Wallabag\Import\PocketHtmlImport:
tags: tags:
- { name: wallabag_core.import, alias: pocket_html } - { name: wallabag_core.import, alias: pocket_html }

View file

@ -5,7 +5,7 @@ services:
autoconfigure: true autoconfigure: true
public: true public: true
Wallabag\CoreBundle\Consumer\RabbitMQConsumerTotalProxy: Wallabag\Consumer\RabbitMQConsumerTotalProxy:
arguments: arguments:
$pocketConsumer: '@old_sound_rabbit_mq.import_pocket_consumer' $pocketConsumer: '@old_sound_rabbit_mq.import_pocket_consumer'
$readabilityConsumer: '@old_sound_rabbit_mq.import_readability_consumer' $readabilityConsumer: '@old_sound_rabbit_mq.import_readability_consumer'
@ -21,61 +21,61 @@ services:
$pocketHtmlConsumer: '@old_sound_rabbit_mq.import_pocket_html_consumer' $pocketHtmlConsumer: '@old_sound_rabbit_mq.import_pocket_html_consumer'
wallabag_core.consumer.amqp.pocket: wallabag_core.consumer.amqp.pocket:
class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer class: Wallabag\Consumer\AMQPEntryConsumer
arguments: arguments:
$import: '@Wallabag\CoreBundle\Import\PocketImport' $import: '@Wallabag\Import\PocketImport'
wallabag_core.consumer.amqp.readability: wallabag_core.consumer.amqp.readability:
class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer class: Wallabag\Consumer\AMQPEntryConsumer
arguments: arguments:
$import: '@Wallabag\CoreBundle\Import\ReadabilityImport' $import: '@Wallabag\Import\ReadabilityImport'
wallabag_core.consumer.amqp.instapaper: wallabag_core.consumer.amqp.instapaper:
class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer class: Wallabag\Consumer\AMQPEntryConsumer
arguments: arguments:
$import: '@Wallabag\CoreBundle\Import\InstapaperImport' $import: '@Wallabag\Import\InstapaperImport'
wallabag_core.consumer.amqp.pinboard: wallabag_core.consumer.amqp.pinboard:
class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer class: Wallabag\Consumer\AMQPEntryConsumer
arguments: arguments:
$import: '@Wallabag\CoreBundle\Import\PinboardImport' $import: '@Wallabag\Import\PinboardImport'
wallabag_core.consumer.amqp.delicious: wallabag_core.consumer.amqp.delicious:
class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer class: Wallabag\Consumer\AMQPEntryConsumer
arguments: arguments:
$import: '@Wallabag\CoreBundle\Import\DeliciousImport' $import: '@Wallabag\Import\DeliciousImport'
wallabag_core.consumer.amqp.wallabag_v1: wallabag_core.consumer.amqp.wallabag_v1:
class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer class: Wallabag\Consumer\AMQPEntryConsumer
arguments: arguments:
$import: '@Wallabag\CoreBundle\Import\WallabagV1Import' $import: '@Wallabag\Import\WallabagV1Import'
wallabag_core.consumer.amqp.wallabag_v2: wallabag_core.consumer.amqp.wallabag_v2:
class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer class: Wallabag\Consumer\AMQPEntryConsumer
arguments: arguments:
$import: '@Wallabag\CoreBundle\Import\WallabagV2Import' $import: '@Wallabag\Import\WallabagV2Import'
wallabag_core.consumer.amqp.elcurator: wallabag_core.consumer.amqp.elcurator:
class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer class: Wallabag\Consumer\AMQPEntryConsumer
arguments: arguments:
$import: '@Wallabag\CoreBundle\Import\ElcuratorImport' $import: '@Wallabag\Import\ElcuratorImport'
wallabag_core.consumer.amqp.firefox: wallabag_core.consumer.amqp.firefox:
class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer class: Wallabag\Consumer\AMQPEntryConsumer
arguments: arguments:
$import: '@Wallabag\CoreBundle\Import\FirefoxImport' $import: '@Wallabag\Import\FirefoxImport'
wallabag_core.consumer.amqp.chrome: wallabag_core.consumer.amqp.chrome:
class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer class: Wallabag\Consumer\AMQPEntryConsumer
arguments: arguments:
$import: '@Wallabag\CoreBundle\Import\ChromeImport' $import: '@Wallabag\Import\ChromeImport'
wallabag_core.consumer.amqp.shaarli: wallabag_core.consumer.amqp.shaarli:
class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer class: Wallabag\Consumer\AMQPEntryConsumer
arguments: arguments:
$import: '@Wallabag\CoreBundle\Import\ShaarliImport' $import: '@Wallabag\Import\ShaarliImport'
wallabag_core.consumer.amqp.pocket_html: wallabag_core.consumer.amqp.pocket_html:
class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer class: Wallabag\Consumer\AMQPEntryConsumer
arguments: arguments:
$import: '@Wallabag\CoreBundle\Import\PocketHtmlImport' $import: '@Wallabag\Import\PocketHtmlImport'

View file

@ -12,14 +12,14 @@ services:
$queueName: "wallabag.import.readability" $queueName: "wallabag.import.readability"
wallabag_core.producer.redis.readability: wallabag_core.producer.redis.readability:
class: Wallabag\CoreBundle\Redis\Producer class: Wallabag\Redis\Producer
arguments: arguments:
- "@wallabag_core.queue.redis.readability" - "@wallabag_core.queue.redis.readability"
wallabag_core.consumer.redis.readability: wallabag_core.consumer.redis.readability:
class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer class: Wallabag\Consumer\RedisEntryConsumer
arguments: arguments:
$import: '@Wallabag\CoreBundle\Import\ReadabilityImport' $import: '@Wallabag\Import\ReadabilityImport'
# instapaper # instapaper
wallabag_core.queue.redis.instapaper: wallabag_core.queue.redis.instapaper:
@ -28,14 +28,14 @@ services:
$queueName: "wallabag.import.instapaper" $queueName: "wallabag.import.instapaper"
wallabag_core.producer.redis.instapaper: wallabag_core.producer.redis.instapaper:
class: Wallabag\CoreBundle\Redis\Producer class: Wallabag\Redis\Producer
arguments: arguments:
- "@wallabag_core.queue.redis.instapaper" - "@wallabag_core.queue.redis.instapaper"
wallabag_core.consumer.redis.instapaper: wallabag_core.consumer.redis.instapaper:
class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer class: Wallabag\Consumer\RedisEntryConsumer
arguments: arguments:
$import: '@Wallabag\CoreBundle\Import\InstapaperImport' $import: '@Wallabag\Import\InstapaperImport'
# pinboard # pinboard
wallabag_core.queue.redis.pinboard: wallabag_core.queue.redis.pinboard:
@ -44,14 +44,14 @@ services:
$queueName: "wallabag.import.pinboard" $queueName: "wallabag.import.pinboard"
wallabag_core.producer.redis.pinboard: wallabag_core.producer.redis.pinboard:
class: Wallabag\CoreBundle\Redis\Producer class: Wallabag\Redis\Producer
arguments: arguments:
- "@wallabag_core.queue.redis.pinboard" - "@wallabag_core.queue.redis.pinboard"
wallabag_core.consumer.redis.pinboard: wallabag_core.consumer.redis.pinboard:
class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer class: Wallabag\Consumer\RedisEntryConsumer
arguments: arguments:
$import: '@Wallabag\CoreBundle\Import\PinboardImport' $import: '@Wallabag\Import\PinboardImport'
# delicious # delicious
wallabag_core.queue.redis.delicious: wallabag_core.queue.redis.delicious:
@ -60,14 +60,14 @@ services:
$queueName: "wallabag.import.delicious" $queueName: "wallabag.import.delicious"
wallabag_core.producer.redis.delicious: wallabag_core.producer.redis.delicious:
class: Wallabag\CoreBundle\Redis\Producer class: Wallabag\Redis\Producer
arguments: arguments:
- "@wallabag_core.queue.redis.delicious" - "@wallabag_core.queue.redis.delicious"
wallabag_core.consumer.redis.delicious: wallabag_core.consumer.redis.delicious:
class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer class: Wallabag\Consumer\RedisEntryConsumer
arguments: arguments:
$import: '@Wallabag\CoreBundle\Import\DeliciousImport' $import: '@Wallabag\Import\DeliciousImport'
# pocket # pocket
wallabag_core.queue.redis.pocket: wallabag_core.queue.redis.pocket:
@ -76,14 +76,14 @@ services:
$queueName: "wallabag.import.pocket" $queueName: "wallabag.import.pocket"
wallabag_core.producer.redis.pocket: wallabag_core.producer.redis.pocket:
class: Wallabag\CoreBundle\Redis\Producer class: Wallabag\Redis\Producer
arguments: arguments:
- "@wallabag_core.queue.redis.pocket" - "@wallabag_core.queue.redis.pocket"
wallabag_core.consumer.redis.pocket: wallabag_core.consumer.redis.pocket:
class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer class: Wallabag\Consumer\RedisEntryConsumer
arguments: arguments:
$import: '@Wallabag\CoreBundle\Import\PocketImport' $import: '@Wallabag\Import\PocketImport'
# wallabag v1 # wallabag v1
wallabag_core.queue.redis.wallabag_v1: wallabag_core.queue.redis.wallabag_v1:
@ -92,14 +92,14 @@ services:
$queueName: "wallabag.import.wallabag_v1" $queueName: "wallabag.import.wallabag_v1"
wallabag_core.producer.redis.wallabag_v1: wallabag_core.producer.redis.wallabag_v1:
class: Wallabag\CoreBundle\Redis\Producer class: Wallabag\Redis\Producer
arguments: arguments:
- "@wallabag_core.queue.redis.wallabag_v1" - "@wallabag_core.queue.redis.wallabag_v1"
wallabag_core.consumer.redis.wallabag_v1: wallabag_core.consumer.redis.wallabag_v1:
class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer class: Wallabag\Consumer\RedisEntryConsumer
arguments: arguments:
$import: '@Wallabag\CoreBundle\Import\WallabagV1Import' $import: '@Wallabag\Import\WallabagV1Import'
# wallabag v2 # wallabag v2
wallabag_core.queue.redis.wallabag_v2: wallabag_core.queue.redis.wallabag_v2:
@ -108,14 +108,14 @@ services:
$queueName: "wallabag.import.wallabag_v2" $queueName: "wallabag.import.wallabag_v2"
wallabag_core.producer.redis.wallabag_v2: wallabag_core.producer.redis.wallabag_v2:
class: Wallabag\CoreBundle\Redis\Producer class: Wallabag\Redis\Producer
arguments: arguments:
- "@wallabag_core.queue.redis.wallabag_v2" - "@wallabag_core.queue.redis.wallabag_v2"
wallabag_core.consumer.redis.wallabag_v2: wallabag_core.consumer.redis.wallabag_v2:
class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer class: Wallabag\Consumer\RedisEntryConsumer
arguments: arguments:
$import: '@Wallabag\CoreBundle\Import\WallabagV2Import' $import: '@Wallabag\Import\WallabagV2Import'
# elcurator # elcurator
wallabag_core.queue.redis.elcurator: wallabag_core.queue.redis.elcurator:
@ -124,14 +124,14 @@ services:
$queueName: "wallabag.import.elcurator" $queueName: "wallabag.import.elcurator"
wallabag_core.producer.redis.elcurator: wallabag_core.producer.redis.elcurator:
class: Wallabag\CoreBundle\Redis\Producer class: Wallabag\Redis\Producer
arguments: arguments:
- "@wallabag_core.queue.redis.elcurator" - "@wallabag_core.queue.redis.elcurator"
wallabag_core.consumer.redis.elcurator: wallabag_core.consumer.redis.elcurator:
class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer class: Wallabag\Consumer\RedisEntryConsumer
arguments: arguments:
$import: '@Wallabag\CoreBundle\Import\ElcuratorImport' $import: '@Wallabag\Import\ElcuratorImport'
# firefox # firefox
wallabag_core.queue.redis.firefox: wallabag_core.queue.redis.firefox:
@ -140,14 +140,14 @@ services:
$queueName: "wallabag.import.firefox" $queueName: "wallabag.import.firefox"
wallabag_core.producer.redis.firefox: wallabag_core.producer.redis.firefox:
class: Wallabag\CoreBundle\Redis\Producer class: Wallabag\Redis\Producer
arguments: arguments:
- "@wallabag_core.queue.redis.firefox" - "@wallabag_core.queue.redis.firefox"
wallabag_core.consumer.redis.firefox: wallabag_core.consumer.redis.firefox:
class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer class: Wallabag\Consumer\RedisEntryConsumer
arguments: arguments:
$import: '@Wallabag\CoreBundle\Import\FirefoxImport' $import: '@Wallabag\Import\FirefoxImport'
# chrome # chrome
wallabag_core.queue.redis.chrome: wallabag_core.queue.redis.chrome:
@ -156,14 +156,14 @@ services:
$queueName: "wallabag.import.chrome" $queueName: "wallabag.import.chrome"
wallabag_core.producer.redis.chrome: wallabag_core.producer.redis.chrome:
class: Wallabag\CoreBundle\Redis\Producer class: Wallabag\Redis\Producer
arguments: arguments:
- "@wallabag_core.queue.redis.chrome" - "@wallabag_core.queue.redis.chrome"
wallabag_core.consumer.redis.chrome: wallabag_core.consumer.redis.chrome:
class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer class: Wallabag\Consumer\RedisEntryConsumer
arguments: arguments:
$import: '@Wallabag\CoreBundle\Import\ChromeImport' $import: '@Wallabag\Import\ChromeImport'
# shaarli # shaarli
wallabag_core.queue.redis.shaarli: wallabag_core.queue.redis.shaarli:
@ -172,14 +172,14 @@ services:
$queueName: "wallabag.import.shaarli" $queueName: "wallabag.import.shaarli"
wallabag_core.producer.redis.shaarli: wallabag_core.producer.redis.shaarli:
class: Wallabag\CoreBundle\Redis\Producer class: Wallabag\Redis\Producer
arguments: arguments:
- "@wallabag_core.queue.redis.shaarli" - "@wallabag_core.queue.redis.shaarli"
wallabag_core.consumer.redis.shaarli: wallabag_core.consumer.redis.shaarli:
class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer class: Wallabag\Consumer\RedisEntryConsumer
arguments: arguments:
$import: '@Wallabag\CoreBundle\Import\ShaarliImport' $import: '@Wallabag\Import\ShaarliImport'
# pocket html # pocket html
wallabag_core.queue.redis.pocket_html: wallabag_core.queue.redis.pocket_html:
@ -188,11 +188,11 @@ services:
$queueName: "wallabag.import.pocket_html" $queueName: "wallabag.import.pocket_html"
wallabag_core.producer.redis.pocket_html: wallabag_core.producer.redis.pocket_html:
class: Wallabag\CoreBundle\Redis\Producer class: Wallabag\Redis\Producer
arguments: arguments:
- "@wallabag_core.queue.redis.pocket_html" - "@wallabag_core.queue.redis.pocket_html"
wallabag_core.consumer.redis.pocket_html: wallabag_core.consumer.redis.pocket_html:
class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer class: Wallabag\Consumer\RedisEntryConsumer
arguments: arguments:
$import: '@Wallabag\CoreBundle\Import\PocketHtmlImport' $import: '@Wallabag\Import\PocketHtmlImport'

View file

@ -9,11 +9,11 @@ services:
public: true public: true
wallabag_core.entry_repository.test: wallabag_core.entry_repository.test:
alias: Wallabag\CoreBundle\Repository\EntryRepository alias: Wallabag\Repository\EntryRepository
public: true public: true
wallabag_user.user_repository.test: wallabag_user.user_repository.test:
alias: Wallabag\CoreBundle\Repository\UserRepository alias: Wallabag\Repository\UserRepository
public: true public: true
filesystem_cache: filesystem_cache:
@ -22,7 +22,7 @@ services:
- "%kernel.cache_dir%/doctrine/metadata" - "%kernel.cache_dir%/doctrine/metadata"
# fixtures # fixtures
Wallabag\CoreBundle\DataFixtures\: Wallabag\DataFixtures\:
resource: '../../src/DataFixtures/*' resource: '../../src/DataFixtures/*'
tags: ['doctrine.fixture.orm'] tags: ['doctrine.fixture.orm']
autowire: true autowire: true

View file

@ -191,7 +191,7 @@
"prefer-stable": true, "prefer-stable": true,
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"Wallabag\\CoreBundle\\": "src/" "Wallabag\\": "src/"
}, },
"classmap": [ "classmap": [
"app/AppKernel.php", "app/AppKernel.php",
@ -200,7 +200,7 @@
}, },
"autoload-dev": { "autoload-dev": {
"psr-4": { "psr-4": {
"Tests\\Wallabag\\CoreBundle\\": "tests/" "Tests\\Wallabag\\": "tests/"
}, },
"files": [ "files": [
"tests/functions.php" "tests/functions.php"

View file

@ -1,17 +1,17 @@
parameters: parameters:
ignoreErrors: ignoreErrors:
- -
message: "#^Method Wallabag\\\\CoreBundle\\\\Controller\\\\AnnotationController\\:\\:postAnnotationAction\\(\\) should return Symfony\\\\Component\\\\HttpFoundation\\\\JsonResponse but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\<mixed\\>\\.$#" message: "#^Method Wallabag\\\\Controller\\\\AnnotationController\\:\\:postAnnotationAction\\(\\) should return Symfony\\\\Component\\\\HttpFoundation\\\\JsonResponse but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\<mixed\\>\\.$#"
count: 1 count: 1
path: src/Controller/AnnotationController.php path: src/Controller/AnnotationController.php
- -
message: "#^Method Wallabag\\\\CoreBundle\\\\Controller\\\\AnnotationController\\:\\:putAnnotationAction\\(\\) should return Symfony\\\\Component\\\\HttpFoundation\\\\JsonResponse but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\<null\\>\\.$#" message: "#^Method Wallabag\\\\Controller\\\\AnnotationController\\:\\:putAnnotationAction\\(\\) should return Symfony\\\\Component\\\\HttpFoundation\\\\JsonResponse but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\<null\\>\\.$#"
count: 1 count: 1
path: src/Controller/AnnotationController.php path: src/Controller/AnnotationController.php
- -
message: "#^Call to an undefined method Wallabag\\\\CoreBundle\\\\Entity\\\\RuleInterface\\:\\:getConfig\\(\\)\\.$#" message: "#^Call to an undefined method Wallabag\\\\Entity\\\\RuleInterface\\:\\:getConfig\\(\\)\\.$#"
count: 1 count: 1
path: src/Controller/ConfigController.php path: src/Controller/ConfigController.php
@ -21,32 +21,32 @@ parameters:
path: src/Controller/ConfigController.php path: src/Controller/ConfigController.php
- -
message: "#^Call to an undefined method Wallabag\\\\CoreBundle\\\\Import\\\\ImportInterface\\:\\:setFilepath\\(\\)\\.$#" message: "#^Call to an undefined method Wallabag\\\\Import\\\\ImportInterface\\:\\:setFilepath\\(\\)\\.$#"
count: 1 count: 1
path: src/Controller/Import/BrowserController.php path: src/Controller/Import/BrowserController.php
- -
message: "#^Call to an undefined method Wallabag\\\\CoreBundle\\\\Import\\\\ImportInterface\\:\\:setUser\\(\\)\\.$#" message: "#^Call to an undefined method Wallabag\\\\Import\\\\ImportInterface\\:\\:setUser\\(\\)\\.$#"
count: 1 count: 1
path: src/Controller/Import/BrowserController.php path: src/Controller/Import/BrowserController.php
- -
message: "#^Call to an undefined method Wallabag\\\\CoreBundle\\\\Import\\\\ImportInterface\\:\\:setFilepath\\(\\)\\.$#" message: "#^Call to an undefined method Wallabag\\\\Import\\\\ImportInterface\\:\\:setFilepath\\(\\)\\.$#"
count: 1 count: 1
path: src/Controller/Import/HtmlController.php path: src/Controller/Import/HtmlController.php
- -
message: "#^Call to an undefined method Wallabag\\\\CoreBundle\\\\Import\\\\ImportInterface\\:\\:setUser\\(\\)\\.$#" message: "#^Call to an undefined method Wallabag\\\\Import\\\\ImportInterface\\:\\:setUser\\(\\)\\.$#"
count: 1 count: 1
path: src/Controller/Import/HtmlController.php path: src/Controller/Import/HtmlController.php
- -
message: "#^Call to an undefined method Wallabag\\\\CoreBundle\\\\Import\\\\ImportInterface\\:\\:setFilepath\\(\\)\\.$#" message: "#^Call to an undefined method Wallabag\\\\Import\\\\ImportInterface\\:\\:setFilepath\\(\\)\\.$#"
count: 1 count: 1
path: src/Controller/Import/WallabagController.php path: src/Controller/Import/WallabagController.php
- -
message: "#^Call to an undefined method Wallabag\\\\CoreBundle\\\\Import\\\\ImportInterface\\:\\:setUser\\(\\)\\.$#" message: "#^Call to an undefined method Wallabag\\\\Import\\\\ImportInterface\\:\\:setUser\\(\\)\\.$#"
count: 1 count: 1
path: src/Controller/Import/WallabagController.php path: src/Controller/Import/WallabagController.php
@ -66,7 +66,7 @@ parameters:
path: src/Mailer/AuthCodeMailer.php path: src/Mailer/AuthCodeMailer.php
- -
message: "#^PHPDoc type Symfony\\\\Component\\\\Mailer\\\\MailerInterface of property Wallabag\\\\CoreBundle\\\\Mailer\\\\UserMailer\\:\\:\\$mailer is not covariant with PHPDoc type Swift_Mailer of overridden property FOS\\\\UserBundle\\\\Mailer\\\\TwigSwiftMailer\\:\\:\\$mailer\\.$#" message: "#^PHPDoc type Symfony\\\\Component\\\\Mailer\\\\MailerInterface of property Wallabag\\\\Mailer\\\\UserMailer\\:\\:\\$mailer is not covariant with PHPDoc type Swift_Mailer of overridden property FOS\\\\UserBundle\\\\Mailer\\\\TwigSwiftMailer\\:\\:\\$mailer\\.$#"
count: 1 count: 1
path: src/Mailer/UserMailer.php path: src/Mailer/UserMailer.php

View file

@ -1,6 +1,6 @@
<?php <?php
namespace Wallabag\CoreBundle\Command; namespace Wallabag\Command;
use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputInterface;
@ -8,8 +8,8 @@ use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Style\SymfonyStyle; use Symfony\Component\Console\Style\SymfonyStyle;
use Symfony\Component\Finder\Finder; use Symfony\Component\Finder\Finder;
use Wallabag\CoreBundle\Helper\DownloadImages; use Wallabag\Helper\DownloadImages;
use Wallabag\CoreBundle\Repository\EntryRepository; use Wallabag\Repository\EntryRepository;
class CleanDownloadedImagesCommand extends Command class CleanDownloadedImagesCommand extends Command
{ {

View file

@ -1,6 +1,6 @@
<?php <?php
namespace Wallabag\CoreBundle\Command; namespace Wallabag\Command;
use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\NoResultException; use Doctrine\ORM\NoResultException;
@ -9,10 +9,10 @@ use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Style\SymfonyStyle; use Symfony\Component\Console\Style\SymfonyStyle;
use Wallabag\CoreBundle\Entity\Entry; use Wallabag\Entity\Entry;
use Wallabag\CoreBundle\Entity\User; use Wallabag\Entity\User;
use Wallabag\CoreBundle\Repository\EntryRepository; use Wallabag\Repository\EntryRepository;
use Wallabag\CoreBundle\Repository\UserRepository; use Wallabag\Repository\UserRepository;
class CleanDuplicatesCommand extends Command class CleanDuplicatesCommand extends Command
{ {

View file

@ -1,6 +1,6 @@
<?php <?php
namespace Wallabag\CoreBundle\Command; namespace Wallabag\Command;
use Doctrine\ORM\NoResultException; use Doctrine\ORM\NoResultException;
use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Command\Command;
@ -8,9 +8,9 @@ use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Style\SymfonyStyle; use Symfony\Component\Console\Style\SymfonyStyle;
use Wallabag\CoreBundle\Helper\EntriesExport; use Wallabag\Helper\EntriesExport;
use Wallabag\CoreBundle\Repository\EntryRepository; use Wallabag\Repository\EntryRepository;
use Wallabag\CoreBundle\Repository\UserRepository; use Wallabag\Repository\UserRepository;
class ExportCommand extends Command class ExportCommand extends Command
{ {

View file

@ -1,6 +1,6 @@
<?php <?php
namespace Wallabag\CoreBundle\Command; namespace Wallabag\Command;
use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\NoResultException; use Doctrine\ORM\NoResultException;
@ -8,10 +8,10 @@ use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Output\OutputInterface;
use Wallabag\CoreBundle\Entity\User; use Wallabag\Entity\User;
use Wallabag\CoreBundle\Helper\UrlHasher; use Wallabag\Helper\UrlHasher;
use Wallabag\CoreBundle\Repository\EntryRepository; use Wallabag\Repository\EntryRepository;
use Wallabag\CoreBundle\Repository\UserRepository; use Wallabag\Repository\UserRepository;
class GenerateUrlHashesCommand extends Command class GenerateUrlHashesCommand extends Command
{ {

View file

@ -1,6 +1,6 @@
<?php <?php
namespace Wallabag\CoreBundle\Command\Import; namespace Wallabag\Command\Import;
use Doctrine\DBAL\Driver\Middleware; use Doctrine\DBAL\Driver\Middleware;
use Doctrine\DBAL\Logging\Middleware as LoggingMiddleware; use Doctrine\DBAL\Logging\Middleware as LoggingMiddleware;
@ -13,19 +13,19 @@ use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken; use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
use Wallabag\CoreBundle\Entity\User; use Wallabag\Entity\User;
use Wallabag\CoreBundle\Import\ChromeImport; use Wallabag\Import\ChromeImport;
use Wallabag\CoreBundle\Import\DeliciousImport; use Wallabag\Import\DeliciousImport;
use Wallabag\CoreBundle\Import\ElcuratorImport; use Wallabag\Import\ElcuratorImport;
use Wallabag\CoreBundle\Import\FirefoxImport; use Wallabag\Import\FirefoxImport;
use Wallabag\CoreBundle\Import\InstapaperImport; use Wallabag\Import\InstapaperImport;
use Wallabag\CoreBundle\Import\PinboardImport; use Wallabag\Import\PinboardImport;
use Wallabag\CoreBundle\Import\PocketHtmlImport; use Wallabag\Import\PocketHtmlImport;
use Wallabag\CoreBundle\Import\ReadabilityImport; use Wallabag\Import\ReadabilityImport;
use Wallabag\CoreBundle\Import\ShaarliImport; use Wallabag\Import\ShaarliImport;
use Wallabag\CoreBundle\Import\WallabagV1Import; use Wallabag\Import\WallabagV1Import;
use Wallabag\CoreBundle\Import\WallabagV2Import; use Wallabag\Import\WallabagV2Import;
use Wallabag\CoreBundle\Repository\UserRepository; use Wallabag\Repository\UserRepository;
class ImportCommand extends Command class ImportCommand extends Command
{ {

View file

@ -1,6 +1,6 @@
<?php <?php
namespace Wallabag\CoreBundle\Command\Import; namespace Wallabag\Command\Import;
use Simpleue\Worker\QueueWorker; use Simpleue\Worker\QueueWorker;
use Symfony\Component\Config\Definition\Exception\Exception; use Symfony\Component\Config\Definition\Exception\Exception;

View file

@ -1,6 +1,6 @@
<?php <?php
namespace Wallabag\CoreBundle\Command; namespace Wallabag\Command;
use Doctrine\DBAL\Connection; use Doctrine\DBAL\Connection;
use Doctrine\DBAL\Exception\DriverException; use Doctrine\DBAL\Exception\DriverException;
@ -20,9 +20,9 @@ use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Question\Question; use Symfony\Component\Console\Question\Question;
use Symfony\Component\Console\Style\SymfonyStyle; use Symfony\Component\Console\Style\SymfonyStyle;
use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Wallabag\CoreBundle\Entity\IgnoreOriginInstanceRule; use Wallabag\Entity\IgnoreOriginInstanceRule;
use Wallabag\CoreBundle\Entity\InternalSetting; use Wallabag\Entity\InternalSetting;
use Wallabag\CoreBundle\Entity\User; use Wallabag\Entity\User;
class InstallCommand extends Command class InstallCommand extends Command
{ {
@ -299,8 +299,8 @@ class InstallCommand extends Command
$this->io->section('Step 4 of 4: Config setup.'); $this->io->section('Step 4 of 4: Config setup.');
// cleanup before insert new stuff // cleanup before insert new stuff
$this->entityManager->createQuery('DELETE FROM Wallabag\CoreBundle\Entity\InternalSetting')->execute(); $this->entityManager->createQuery('DELETE FROM Wallabag\Entity\InternalSetting')->execute();
$this->entityManager->createQuery('DELETE FROM Wallabag\CoreBundle\Entity\IgnoreOriginInstanceRule')->execute(); $this->entityManager->createQuery('DELETE FROM Wallabag\Entity\IgnoreOriginInstanceRule')->execute();
foreach ($this->defaultSettings as $setting) { foreach ($this->defaultSettings as $setting) {
$newSetting = new InternalSetting(); $newSetting = new InternalSetting();

View file

@ -1,6 +1,6 @@
<?php <?php
namespace Wallabag\CoreBundle\Command; namespace Wallabag\Command;
use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputArgument;
@ -8,7 +8,7 @@ use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Style\SymfonyStyle; use Symfony\Component\Console\Style\SymfonyStyle;
use Wallabag\CoreBundle\Repository\UserRepository; use Wallabag\Repository\UserRepository;
class ListUserCommand extends Command class ListUserCommand extends Command
{ {

View file

@ -1,6 +1,6 @@
<?php <?php
namespace Wallabag\CoreBundle\Command; namespace Wallabag\Command;
use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\NoResultException; use Doctrine\ORM\NoResultException;
@ -11,10 +11,10 @@ use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Style\SymfonyStyle; use Symfony\Component\Console\Style\SymfonyStyle;
use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Wallabag\CoreBundle\Event\EntrySavedEvent; use Wallabag\Event\EntrySavedEvent;
use Wallabag\CoreBundle\Helper\ContentProxy; use Wallabag\Helper\ContentProxy;
use Wallabag\CoreBundle\Repository\EntryRepository; use Wallabag\Repository\EntryRepository;
use Wallabag\CoreBundle\Repository\UserRepository; use Wallabag\Repository\UserRepository;
class ReloadEntryCommand extends Command class ReloadEntryCommand extends Command
{ {

View file

@ -1,6 +1,6 @@
<?php <?php
namespace Wallabag\CoreBundle\Command; namespace Wallabag\Command;
use Doctrine\ORM\NoResultException; use Doctrine\ORM\NoResultException;
use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Command\Command;
@ -8,8 +8,8 @@ use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Style\SymfonyStyle; use Symfony\Component\Console\Style\SymfonyStyle;
use Wallabag\CoreBundle\Entity\User; use Wallabag\Entity\User;
use Wallabag\CoreBundle\Repository\UserRepository; use Wallabag\Repository\UserRepository;
class ShowUserCommand extends Command class ShowUserCommand extends Command
{ {

View file

@ -1,6 +1,6 @@
<?php <?php
namespace Wallabag\CoreBundle\Command; namespace Wallabag\Command;
use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\NoResultException; use Doctrine\ORM\NoResultException;
@ -9,9 +9,9 @@ use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Style\SymfonyStyle; use Symfony\Component\Console\Style\SymfonyStyle;
use Wallabag\CoreBundle\Entity\User; use Wallabag\Entity\User;
use Wallabag\CoreBundle\Helper\RuleBasedTagger; use Wallabag\Helper\RuleBasedTagger;
use Wallabag\CoreBundle\Repository\UserRepository; use Wallabag\Repository\UserRepository;
class TagAllCommand extends Command class TagAllCommand extends Command
{ {

View file

@ -1,6 +1,6 @@
<?php <?php
namespace Wallabag\CoreBundle\Command; namespace Wallabag\Command;
use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\EntityManagerInterface;
use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Command\Command;
@ -8,7 +8,7 @@ use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Style\SymfonyStyle; use Symfony\Component\Console\Style\SymfonyStyle;
use Wallabag\CoreBundle\Repository\EntryRepository; use Wallabag\Repository\EntryRepository;
class UpdatePicturesPathCommand extends Command class UpdatePicturesPathCommand extends Command
{ {

View file

@ -1,6 +1,6 @@
<?php <?php
namespace Wallabag\CoreBundle\Consumer; namespace Wallabag\Consumer;
use OldSound\RabbitMqBundle\RabbitMq\ConsumerInterface; use OldSound\RabbitMqBundle\RabbitMq\ConsumerInterface;
use PhpAmqpLib\Message\AMQPMessage; use PhpAmqpLib\Message\AMQPMessage;

View file

@ -1,16 +1,16 @@
<?php <?php
namespace Wallabag\CoreBundle\Consumer; namespace Wallabag\Consumer;
use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\EntityManagerInterface;
use Psr\Log\LoggerInterface; use Psr\Log\LoggerInterface;
use Psr\Log\NullLogger; use Psr\Log\NullLogger;
use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Wallabag\CoreBundle\Entity\Entry; use Wallabag\Entity\Entry;
use Wallabag\CoreBundle\Entity\Tag; use Wallabag\Entity\Tag;
use Wallabag\CoreBundle\Event\EntrySavedEvent; use Wallabag\Event\EntrySavedEvent;
use Wallabag\CoreBundle\Import\AbstractImport; use Wallabag\Import\AbstractImport;
use Wallabag\CoreBundle\Repository\UserRepository; use Wallabag\Repository\UserRepository;
abstract class AbstractConsumer abstract class AbstractConsumer
{ {

View file

@ -1,6 +1,6 @@
<?php <?php
namespace Wallabag\CoreBundle\Consumer; namespace Wallabag\Consumer;
use OldSound\RabbitMqBundle\RabbitMq\Consumer; use OldSound\RabbitMqBundle\RabbitMq\Consumer;

View file

@ -1,6 +1,6 @@
<?php <?php
namespace Wallabag\CoreBundle\Consumer; namespace Wallabag\Consumer;
use Simpleue\Job\Job; use Simpleue\Job\Job;

View file

@ -1,9 +1,9 @@
<?php <?php
namespace Wallabag\CoreBundle\Controller; namespace Wallabag\Controller;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController as BaseAbstractController; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController as BaseAbstractController;
use Wallabag\CoreBundle\Entity\User; use Wallabag\Entity\User;
abstract class AbstractController extends BaseAbstractController abstract class AbstractController extends BaseAbstractController
{ {

View file

@ -1,6 +1,6 @@
<?php <?php
namespace Wallabag\CoreBundle\Controller; namespace Wallabag\Controller;
use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\EntityManagerInterface;
use FOS\RestBundle\Controller\AbstractFOSRestController; use FOS\RestBundle\Controller\AbstractFOSRestController;
@ -10,12 +10,12 @@ use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Routing\Annotation\Route;
use Wallabag\CoreBundle\Entity\Annotation; use Wallabag\Entity\Annotation;
use Wallabag\CoreBundle\Entity\Entry; use Wallabag\Entity\Entry;
use Wallabag\CoreBundle\Entity\User; use Wallabag\Entity\User;
use Wallabag\CoreBundle\Form\Type\EditAnnotationType; use Wallabag\Form\Type\EditAnnotationType;
use Wallabag\CoreBundle\Form\Type\NewAnnotationType; use Wallabag\Form\Type\NewAnnotationType;
use Wallabag\CoreBundle\Repository\AnnotationRepository; use Wallabag\Repository\AnnotationRepository;
class AnnotationController extends AbstractFOSRestController class AnnotationController extends AbstractFOSRestController
{ {

View file

@ -1,14 +1,14 @@
<?php <?php
namespace Wallabag\CoreBundle\Controller\Api; namespace Wallabag\Controller\Api;
use Nelmio\ApiDocBundle\Annotation\Operation; use Nelmio\ApiDocBundle\Annotation\Operation;
use OpenApi\Annotations as OA; use OpenApi\Annotations as OA;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Routing\Annotation\Route;
use Wallabag\CoreBundle\Entity\Annotation; use Wallabag\Entity\Annotation;
use Wallabag\CoreBundle\Entity\Entry; use Wallabag\Entity\Entry;
class AnnotationRestController extends WallabagRestController class AnnotationRestController extends WallabagRestController
{ {
@ -42,7 +42,7 @@ class AnnotationRestController extends WallabagRestController
{ {
$this->validateAuthentication(); $this->validateAuthentication();
return $this->forward('Wallabag\CoreBundle\Controller\AnnotationController::getAnnotationsAction', [ return $this->forward('Wallabag\Controller\AnnotationController::getAnnotationsAction', [
'entry' => $entry, 'entry' => $entry,
]); ]);
} }
@ -108,7 +108,7 @@ class AnnotationRestController extends WallabagRestController
{ {
$this->validateAuthentication(); $this->validateAuthentication();
return $this->forward('Wallabag\CoreBundle\Controller\AnnotationController::postAnnotationAction', [ return $this->forward('Wallabag\Controller\AnnotationController::postAnnotationAction', [
'request' => $request, 'request' => $request,
'entry' => $entry, 'entry' => $entry,
]); ]);
@ -144,7 +144,7 @@ class AnnotationRestController extends WallabagRestController
{ {
$this->validateAuthentication(); $this->validateAuthentication();
return $this->forward('Wallabag\CoreBundle\Controller\AnnotationController::putAnnotationAction', [ return $this->forward('Wallabag\Controller\AnnotationController::putAnnotationAction', [
'annotation' => $annotation, 'annotation' => $annotation,
'request' => $request, 'request' => $request,
]); ]);
@ -180,7 +180,7 @@ class AnnotationRestController extends WallabagRestController
{ {
$this->validateAuthentication(); $this->validateAuthentication();
return $this->forward('Wallabag\CoreBundle\Controller\AnnotationController::deleteAnnotationAction', [ return $this->forward('Wallabag\Controller\AnnotationController::deleteAnnotationAction', [
'annotation' => $annotation, 'annotation' => $annotation,
]); ]);
} }

View file

@ -1,6 +1,6 @@
<?php <?php
namespace Wallabag\CoreBundle\Controller\Api; namespace Wallabag\Controller\Api;
use JMS\Serializer\SerializationContext; use JMS\Serializer\SerializationContext;
use JMS\Serializer\SerializerInterface; use JMS\Serializer\SerializerInterface;

View file

@ -1,6 +1,6 @@
<?php <?php
namespace Wallabag\CoreBundle\Controller\Api; namespace Wallabag\Controller\Api;
use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\EntityManagerInterface;
use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\RedirectResponse;
@ -8,10 +8,10 @@ use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Routing\Annotation\Route;
use Symfony\Contracts\Translation\TranslatorInterface; use Symfony\Contracts\Translation\TranslatorInterface;
use Wallabag\CoreBundle\Controller\AbstractController; use Wallabag\Controller\AbstractController;
use Wallabag\CoreBundle\Entity\Api\Client; use Wallabag\Entity\Api\Client;
use Wallabag\CoreBundle\Form\Type\Api\ClientType; use Wallabag\Form\Type\Api\ClientType;
use Wallabag\CoreBundle\Repository\Api\ClientRepository; use Wallabag\Repository\Api\ClientRepository;
class DeveloperController extends AbstractController class DeveloperController extends AbstractController
{ {

View file

@ -1,6 +1,6 @@
<?php <?php
namespace Wallabag\CoreBundle\Controller\Api; namespace Wallabag\Controller\Api;
use Hateoas\Configuration\Route as HateoasRoute; use Hateoas\Configuration\Route as HateoasRoute;
use Hateoas\Representation\Factory\PagerfantaFactory; use Hateoas\Representation\Factory\PagerfantaFactory;
@ -15,16 +15,16 @@ use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
use Symfony\Component\HttpKernel\Exception\HttpException; use Symfony\Component\HttpKernel\Exception\HttpException;
use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Routing\Annotation\Route;
use Wallabag\CoreBundle\Entity\Entry; use Wallabag\Entity\Entry;
use Wallabag\CoreBundle\Entity\Tag; use Wallabag\Entity\Tag;
use Wallabag\CoreBundle\Event\EntryDeletedEvent; use Wallabag\Event\EntryDeletedEvent;
use Wallabag\CoreBundle\Event\EntrySavedEvent; use Wallabag\Event\EntrySavedEvent;
use Wallabag\CoreBundle\Helper\ContentProxy; use Wallabag\Helper\ContentProxy;
use Wallabag\CoreBundle\Helper\EntriesExport; use Wallabag\Helper\EntriesExport;
use Wallabag\CoreBundle\Helper\TagsAssigner; use Wallabag\Helper\TagsAssigner;
use Wallabag\CoreBundle\Helper\UrlHasher; use Wallabag\Helper\UrlHasher;
use Wallabag\CoreBundle\Repository\EntryRepository; use Wallabag\Repository\EntryRepository;
use Wallabag\CoreBundle\Repository\TagRepository; use Wallabag\Repository\TagRepository;
class EntryRestController extends WallabagRestController class EntryRestController extends WallabagRestController
{ {

View file

@ -1,6 +1,6 @@
<?php <?php
namespace Wallabag\CoreBundle\Controller\Api; namespace Wallabag\Controller\Api;
use Hateoas\Configuration\Route as HateoasRoute; use Hateoas\Configuration\Route as HateoasRoute;
use Hateoas\Representation\Factory\PagerfantaFactory; use Hateoas\Representation\Factory\PagerfantaFactory;
@ -11,7 +11,7 @@ use Pagerfanta\Pagerfanta;
use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Routing\Annotation\Route;
use Wallabag\CoreBundle\Repository\EntryRepository; use Wallabag\Repository\EntryRepository;
class SearchRestController extends WallabagRestController class SearchRestController extends WallabagRestController
{ {

View file

@ -1,16 +1,16 @@
<?php <?php
namespace Wallabag\CoreBundle\Controller\Api; namespace Wallabag\Controller\Api;
use Nelmio\ApiDocBundle\Annotation\Operation; use Nelmio\ApiDocBundle\Annotation\Operation;
use OpenApi\Annotations as OA; use OpenApi\Annotations as OA;
use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Routing\Annotation\Route;
use Wallabag\CoreBundle\Entity\Entry; use Wallabag\Entity\Entry;
use Wallabag\CoreBundle\Entity\Tag; use Wallabag\Entity\Tag;
use Wallabag\CoreBundle\Repository\EntryRepository; use Wallabag\Repository\EntryRepository;
use Wallabag\CoreBundle\Repository\TagRepository; use Wallabag\Repository\TagRepository;
class TagRestController extends WallabagRestController class TagRestController extends WallabagRestController
{ {

View file

@ -1,6 +1,6 @@
<?php <?php
namespace Wallabag\CoreBundle\Controller\Api; namespace Wallabag\Controller\Api;
use JMS\Serializer\SerializationContext; use JMS\Serializer\SerializationContext;
use JMS\Serializer\SerializerBuilder; use JMS\Serializer\SerializerBuilder;

View file

@ -1,6 +1,6 @@
<?php <?php
namespace Wallabag\CoreBundle\Controller\Api; namespace Wallabag\Controller\Api;
use Craue\ConfigBundle\Util\Config; use Craue\ConfigBundle\Util\Config;
use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\EntityManagerInterface;
@ -15,9 +15,9 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Routing\Annotation\Route;
use Wallabag\CoreBundle\Entity\Api\Client; use Wallabag\Entity\Api\Client;
use Wallabag\CoreBundle\Entity\User; use Wallabag\Entity\User;
use Wallabag\CoreBundle\Form\Type\NewUserType; use Wallabag\Form\Type\NewUserType;
class UserRestController extends WallabagRestController class UserRestController extends WallabagRestController
{ {

View file

@ -1,6 +1,6 @@
<?php <?php
namespace Wallabag\CoreBundle\Controller\Api; namespace Wallabag\Controller\Api;
use Craue\ConfigBundle\Util\Config; use Craue\ConfigBundle\Util\Config;
use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\EntityManagerInterface;
@ -16,8 +16,8 @@ use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInt
use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface; use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
use Symfony\Component\Security\Core\Exception\AccessDeniedException; use Symfony\Component\Security\Core\Exception\AccessDeniedException;
use Symfony\Contracts\Translation\TranslatorInterface; use Symfony\Contracts\Translation\TranslatorInterface;
use Wallabag\CoreBundle\Entity\Api\ApplicationInfo; use Wallabag\Entity\Api\ApplicationInfo;
use Wallabag\CoreBundle\Entity\User; use Wallabag\Entity\User;
class WallabagRestController extends AbstractFOSRestController class WallabagRestController extends AbstractFOSRestController
{ {

View file

@ -1,6 +1,6 @@
<?php <?php
namespace Wallabag\CoreBundle\Controller; namespace Wallabag\Controller;
use Craue\ConfigBundle\Util\Config; use Craue\ConfigBundle\Util\Config;
use Doctrine\DBAL\Platforms\SqlitePlatform; use Doctrine\DBAL\Platforms\SqlitePlatform;
@ -20,27 +20,27 @@ use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
use Symfony\Component\Validator\Constraints\Locale as LocaleConstraint; use Symfony\Component\Validator\Constraints\Locale as LocaleConstraint;
use Symfony\Component\Validator\Validator\ValidatorInterface; use Symfony\Component\Validator\Validator\ValidatorInterface;
use Wallabag\CoreBundle\Entity\Config as ConfigEntity; use Wallabag\Entity\Config as ConfigEntity;
use Wallabag\CoreBundle\Entity\IgnoreOriginUserRule; use Wallabag\Entity\IgnoreOriginUserRule;
use Wallabag\CoreBundle\Entity\RuleInterface; use Wallabag\Entity\RuleInterface;
use Wallabag\CoreBundle\Entity\TaggingRule; use Wallabag\Entity\TaggingRule;
use Wallabag\CoreBundle\Event\ConfigUpdatedEvent; use Wallabag\Event\ConfigUpdatedEvent;
use Wallabag\CoreBundle\Form\Type\ChangePasswordType; use Wallabag\Form\Type\ChangePasswordType;
use Wallabag\CoreBundle\Form\Type\ConfigType; use Wallabag\Form\Type\ConfigType;
use Wallabag\CoreBundle\Form\Type\FeedType; use Wallabag\Form\Type\FeedType;
use Wallabag\CoreBundle\Form\Type\IgnoreOriginUserRuleType; use Wallabag\Form\Type\IgnoreOriginUserRuleType;
use Wallabag\CoreBundle\Form\Type\TaggingRuleImportType; use Wallabag\Form\Type\TaggingRuleImportType;
use Wallabag\CoreBundle\Form\Type\TaggingRuleType; use Wallabag\Form\Type\TaggingRuleType;
use Wallabag\CoreBundle\Form\Type\UserInformationType; use Wallabag\Form\Type\UserInformationType;
use Wallabag\CoreBundle\Helper\Redirect; use Wallabag\Helper\Redirect;
use Wallabag\CoreBundle\Repository\AnnotationRepository; use Wallabag\Repository\AnnotationRepository;
use Wallabag\CoreBundle\Repository\ConfigRepository; use Wallabag\Repository\ConfigRepository;
use Wallabag\CoreBundle\Repository\EntryRepository; use Wallabag\Repository\EntryRepository;
use Wallabag\CoreBundle\Repository\IgnoreOriginUserRuleRepository; use Wallabag\Repository\IgnoreOriginUserRuleRepository;
use Wallabag\CoreBundle\Repository\TaggingRuleRepository; use Wallabag\Repository\TaggingRuleRepository;
use Wallabag\CoreBundle\Repository\TagRepository; use Wallabag\Repository\TagRepository;
use Wallabag\CoreBundle\Repository\UserRepository; use Wallabag\Repository\UserRepository;
use Wallabag\CoreBundle\Tools\Utils; use Wallabag\Tools\Utils;
class ConfigController extends AbstractController class ConfigController extends AbstractController
{ {

View file

@ -1,6 +1,6 @@
<?php <?php
namespace Wallabag\CoreBundle\Controller; namespace Wallabag\Controller;
use Craue\ConfigBundle\Util\Config; use Craue\ConfigBundle\Util\Config;
use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\EntityManagerInterface;
@ -15,19 +15,19 @@ use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Routing\Annotation\Route;
use Symfony\Contracts\Translation\TranslatorInterface; use Symfony\Contracts\Translation\TranslatorInterface;
use Wallabag\CoreBundle\Entity\Entry; use Wallabag\Entity\Entry;
use Wallabag\CoreBundle\Entity\Tag; use Wallabag\Entity\Tag;
use Wallabag\CoreBundle\Event\EntryDeletedEvent; use Wallabag\Event\EntryDeletedEvent;
use Wallabag\CoreBundle\Event\EntrySavedEvent; use Wallabag\Event\EntrySavedEvent;
use Wallabag\CoreBundle\Form\Type\EditEntryType; use Wallabag\Form\Type\EditEntryType;
use Wallabag\CoreBundle\Form\Type\EntryFilterType; use Wallabag\Form\Type\EntryFilterType;
use Wallabag\CoreBundle\Form\Type\NewEntryType; use Wallabag\Form\Type\NewEntryType;
use Wallabag\CoreBundle\Form\Type\SearchEntryType; use Wallabag\Form\Type\SearchEntryType;
use Wallabag\CoreBundle\Helper\ContentProxy; use Wallabag\Helper\ContentProxy;
use Wallabag\CoreBundle\Helper\PreparePagerForEntries; use Wallabag\Helper\PreparePagerForEntries;
use Wallabag\CoreBundle\Helper\Redirect; use Wallabag\Helper\Redirect;
use Wallabag\CoreBundle\Repository\EntryRepository; use Wallabag\Repository\EntryRepository;
use Wallabag\CoreBundle\Repository\TagRepository; use Wallabag\Repository\TagRepository;
class EntryController extends AbstractController class EntryController extends AbstractController
{ {

View file

@ -1,14 +1,14 @@
<?php <?php
namespace Wallabag\CoreBundle\Controller; namespace Wallabag\Controller;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Routing\Annotation\Route;
use Wallabag\CoreBundle\Helper\EntriesExport; use Wallabag\Helper\EntriesExport;
use Wallabag\CoreBundle\Repository\EntryRepository; use Wallabag\Repository\EntryRepository;
use Wallabag\CoreBundle\Repository\TagRepository; use Wallabag\Repository\TagRepository;
/** /**
* The try/catch can be removed once all formats will be implemented. * The try/catch can be removed once all formats will be implemented.

Some files were not shown because too many files have changed in this diff Show more