oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-09-05 18:41:02 +00:00
Code Wiki Activity

Remove the CoreBundle namespace

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

10
src/Entity/Annotation.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\CoreBundle\Entity;
namespace Wallabag\Entity;
use Doctrine\ORM\Mapping as ORM;
use JMS\Serializer\Annotation\Exclude;
@ -9,13 +9,13 @@ use JMS\Serializer\Annotation\Groups;
use JMS\Serializer\Annotation\SerializedName;
use JMS\Serializer\Annotation\VirtualProperty;
use Symfony\Component\Validator\Constraints as Assert;
use Wallabag\CoreBundle\Helper\EntityTimestampsTrait;
use Wallabag\Helper\EntityTimestampsTrait;
/**
* Annotation.
*
* @ORM\Table(name="annotation")
* @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\AnnotationRepository")
* @ORM\Entity(repositoryClass="Wallabag\Repository\AnnotationRepository")
* @ORM\HasLifecycleCallbacks()
* @ExclusionPolicy("none")
*/
@ -80,14 +80,14 @@ class Annotation
/**
* @Exclude
*
* @ORM\ManyToOne(targetEntity="Wallabag\CoreBundle\Entity\User")
* @ORM\ManyToOne(targetEntity="Wallabag\Entity\User")
*/
private $user;
/**
* @Exclude
*
* @ORM\ManyToOne(targetEntity="Wallabag\CoreBundle\Entity\Entry", inversedBy="annotations")
* @ORM\ManyToOne(targetEntity="Wallabag\Entity\Entry", inversedBy="annotations")
* @ORM\JoinColumn(name="entry_id", referencedColumnName="id", onDelete="cascade")
*/
private $entry;

6
src/Entity/Api/AccessToken.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\CoreBundle\Entity\Api;
namespace Wallabag\Entity\Api;
use Doctrine\ORM\Mapping as ORM;
use FOS\OAuthServerBundle\Entity\AccessToken as BaseAccessToken;
@ -35,13 +35,13 @@ class AccessToken extends BaseAccessToken
protected $id;
/**
* @ORM\ManyToOne(targetEntity="Wallabag\CoreBundle\Entity\Api\Client", inversedBy="accessTokens")
* @ORM\ManyToOne(targetEntity="Wallabag\Entity\Api\Client", inversedBy="accessTokens")
* @ORM\JoinColumn(nullable=false)
*/
protected $client;
/**
* @ORM\ManyToOne(targetEntity="Wallabag\CoreBundle\Entity\User")
* @ORM\ManyToOne(targetEntity="Wallabag\Entity\User")
* @ORM\JoinColumn(name="user_id", referencedColumnName="id", onDelete="CASCADE")
*/
protected $user;

2
src/Entity/Api/ApplicationInfo.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\CoreBundle\Entity\Api;
namespace Wallabag\Entity\Api;
use OpenApi\Annotations as OA;

6
src/Entity/Api/AuthCode.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\CoreBundle\Entity\Api;
namespace Wallabag\Entity\Api;
use Doctrine\ORM\Mapping as ORM;
use FOS\OAuthServerBundle\Entity\AuthCode as BaseAuthCode;
@ -35,13 +35,13 @@ class AuthCode extends BaseAuthCode
protected $id;
/**
* @ORM\ManyToOne(targetEntity="Wallabag\CoreBundle\Entity\Api\Client")
* @ORM\ManyToOne(targetEntity="Wallabag\Entity\Api\Client")
* @ORM\JoinColumn(nullable=false)
*/
protected $client;
/**
* @ORM\ManyToOne(targetEntity="Wallabag\CoreBundle\Entity\User")
* @ORM\ManyToOne(targetEntity="Wallabag\Entity\User")
* @ORM\JoinColumn(name="user_id", referencedColumnName="id", onDelete="CASCADE")
*/
protected $user;

12
src/Entity/Api/Client.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\CoreBundle\Entity\Api;
namespace Wallabag\Entity\Api;
use Doctrine\ORM\Mapping as ORM;
use FOS\OAuthServerBundle\Entity\Client as BaseClient;
@ -8,11 +8,11 @@ use JMS\Serializer\Annotation\Groups;
use JMS\Serializer\Annotation\SerializedName;
use JMS\Serializer\Annotation\VirtualProperty;
use OpenApi\Annotations as OA;
use Wallabag\CoreBundle\Entity\User;
use Wallabag\Entity\User;
/**
* @ORM\Table("oauth2_clients")
* @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\Api\ClientRepository")
* @ORM\Entity(repositoryClass="Wallabag\Repository\Api\ClientRepository")
*/
class Client extends BaseClient
{
@ -39,12 +39,12 @@ class Client extends BaseClient
protected $name;
/**
* @ORM\OneToMany(targetEntity="Wallabag\CoreBundle\Entity\Api\RefreshToken", mappedBy="client", cascade={"remove"})
* @ORM\OneToMany(targetEntity="Wallabag\Entity\Api\RefreshToken", mappedBy="client", cascade={"remove"})
*/
protected $refreshTokens;
/**
* @ORM\OneToMany(targetEntity="Wallabag\CoreBundle\Entity\Api\AccessToken", mappedBy="client", cascade={"remove"})
* @ORM\OneToMany(targetEntity="Wallabag\Entity\Api\AccessToken", mappedBy="client", cascade={"remove"})
*/
protected $accessTokens;
@ -63,7 +63,7 @@ class Client extends BaseClient
protected $secret;
/**
* @ORM\ManyToOne(targetEntity="Wallabag\CoreBundle\Entity\User", inversedBy="clients")
* @ORM\ManyToOne(targetEntity="Wallabag\Entity\User", inversedBy="clients")
*/
private $user;

6
src/Entity/Api/RefreshToken.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\CoreBundle\Entity\Api;
namespace Wallabag\Entity\Api;
use Doctrine\ORM\Mapping as ORM;
use FOS\OAuthServerBundle\Entity\RefreshToken as BaseRefreshToken;
@ -35,13 +35,13 @@ class RefreshToken extends BaseRefreshToken
protected $id;
/**
* @ORM\ManyToOne(targetEntity="Wallabag\CoreBundle\Entity\Api\Client", inversedBy="refreshTokens")
* @ORM\ManyToOne(targetEntity="Wallabag\Entity\Api\Client", inversedBy="refreshTokens")
* @ORM\JoinColumn(nullable=false)
*/
protected $client;
/**
* @ORM\ManyToOne(targetEntity="Wallabag\CoreBundle\Entity\User")
* @ORM\ManyToOne(targetEntity="Wallabag\Entity\User")
* @ORM\JoinColumn(name="user_id", referencedColumnName="id", onDelete="CASCADE")
*/
protected $user;

10
src/Entity/Config.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\CoreBundle\Entity;
namespace Wallabag\Entity;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\ORM\Mapping as ORM;
@ -10,7 +10,7 @@ use Symfony\Component\Validator\Constraints as Assert;
/**
* Config.
*
* @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\ConfigRepository")
* @ORM\Entity(repositoryClass="Wallabag\Repository\ConfigRepository")
* @ORM\Table(
* name="`config`",
* indexes={
@ -169,14 +169,14 @@ class Config
private $customCSS;
/**
* @ORM\OneToOne(targetEntity="Wallabag\CoreBundle\Entity\User", inversedBy="config")
* @ORM\OneToOne(targetEntity="Wallabag\Entity\User", inversedBy="config")
*/
private $user;
/**
* @var ArrayCollection<TaggingRule>
*
* @ORM\OneToMany(targetEntity="Wallabag\CoreBundle\Entity\TaggingRule", mappedBy="config", cascade={"remove"})
* @ORM\OneToMany(targetEntity="Wallabag\Entity\TaggingRule", mappedBy="config", cascade={"remove"})
* @ORM\OrderBy({"id" = "ASC"})
*/
private $taggingRules;
@ -184,7 +184,7 @@ class Config
/**
* @var ArrayCollection<IgnoreOriginUserRule>
*
* @ORM\OneToMany(targetEntity="Wallabag\CoreBundle\Entity\IgnoreOriginUserRule", mappedBy="config", cascade={"remove"})
* @ORM\OneToMany(targetEntity="Wallabag\Entity\IgnoreOriginUserRule", mappedBy="config", cascade={"remove"})
* @ORM\OrderBy({"id" = "ASC"})
*/
private $ignoreOriginRules;

14
src/Entity/Entry.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\CoreBundle\Entity;
namespace Wallabag\Entity;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\ORM\Mapping as ORM;
@ -11,14 +11,14 @@ use JMS\Serializer\Annotation\SerializedName;
use JMS\Serializer\Annotation\VirtualProperty;
use JMS\Serializer\Annotation\XmlRoot;
use Symfony\Component\Validator\Constraints as Assert;
use Wallabag\CoreBundle\Helper\EntityTimestampsTrait;
use Wallabag\CoreBundle\Helper\UrlHasher;
use Wallabag\Helper\EntityTimestampsTrait;
use Wallabag\Helper\UrlHasher;
/**
* Entry.
*
* @XmlRoot("entry")
* @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\EntryRepository")
* @ORM\Entity(repositoryClass="Wallabag\Repository\EntryRepository")
* @ORM\Table(
* name="`entry`",
* options={"collate"="utf8mb4_unicode_ci", "charset"="utf8mb4"},
@ -204,7 +204,7 @@ class Entry
private $starredAt;
/**
* @ORM\OneToMany(targetEntity="Wallabag\CoreBundle\Entity\Annotation", mappedBy="entry", cascade={"persist", "remove"})
* @ORM\OneToMany(targetEntity="Wallabag\Entity\Annotation", mappedBy="entry", cascade={"persist", "remove"})
* @ORM\JoinTable
*
* @Groups({"entries_for_user", "export_all"})
@ -288,14 +288,14 @@ class Entry
/**
* @Exclude
*
* @ORM\ManyToOne(targetEntity="Wallabag\CoreBundle\Entity\User", inversedBy="entries")
* @ORM\ManyToOne(targetEntity="Wallabag\Entity\User", inversedBy="entries")
*
* @Groups({"export_all"})
*/
private $user;
/**
* @ORM\ManyToMany(targetEntity="Wallabag\CoreBundle\Entity\Tag", inversedBy="entries", cascade={"persist"})
* @ORM\ManyToMany(targetEntity="Wallabag\Entity\Tag", inversedBy="entries", cascade={"persist"})
* @ORM\JoinTable(
* name="entry_tag",
* joinColumns={

4
src/Entity/IgnoreOriginInstanceRule.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\CoreBundle\Entity;
namespace Wallabag\Entity;
use Doctrine\ORM\Mapping as ORM;
use Symfony\Bridge\RulerZ\Validator\Constraints as RulerZAssert;
@ -9,7 +9,7 @@ use Symfony\Component\Validator\Constraints as Assert;
/**
* Ignore Origin rule.
*
* @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\IgnoreOriginInstanceRuleRepository")
* @ORM\Entity(repositoryClass="Wallabag\Repository\IgnoreOriginInstanceRuleRepository")
* @ORM\Table(name="`ignore_origin_instance_rule`")
*/
class IgnoreOriginInstanceRule implements IgnoreOriginRuleInterface, RuleInterface

2
src/Entity/IgnoreOriginRuleInterface.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\CoreBundle\Entity;
namespace Wallabag\Entity;
interface IgnoreOriginRuleInterface
{

6
src/Entity/IgnoreOriginUserRule.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\CoreBundle\Entity;
namespace Wallabag\Entity;
use Doctrine\ORM\Mapping as ORM;
use Symfony\Bridge\RulerZ\Validator\Constraints as RulerZAssert;
@ -9,7 +9,7 @@ use Symfony\Component\Validator\Constraints as Assert;
/**
* Ignore Origin rule.
*
* @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\IgnoreOriginUserRuleRepository")
* @ORM\Entity(repositoryClass="Wallabag\Repository\IgnoreOriginUserRuleRepository")
* @ORM\Table(name="`ignore_origin_user_rule`")
*/
class IgnoreOriginUserRule implements IgnoreOriginRuleInterface, RuleInterface
@ -37,7 +37,7 @@ class IgnoreOriginUserRule implements IgnoreOriginRuleInterface, RuleInterface
private $rule;
/**
* @ORM\ManyToOne(targetEntity="Wallabag\CoreBundle\Entity\Config", inversedBy="ignoreOriginRules")
* @ORM\ManyToOne(targetEntity="Wallabag\Entity\Config", inversedBy="ignoreOriginRules")
*/
private $config;

2
src/Entity/InternalSetting.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\CoreBundle\Entity;
namespace Wallabag\Entity;
use Craue\ConfigBundle\Entity\BaseSetting;
use Doctrine\ORM\Mapping as ORM;

2
src/Entity/RuleInterface.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\CoreBundle\Entity;
namespace Wallabag\Entity;
interface RuleInterface
{

8
src/Entity/SiteCredential.php
View file

@ -1,15 +1,15 @@
<?php
namespace Wallabag\CoreBundle\Entity;
namespace Wallabag\Entity;
use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Validator\Constraints as Assert;
use Wallabag\CoreBundle\Helper\EntityTimestampsTrait;
use Wallabag\Helper\EntityTimestampsTrait;
/**
* SiteCredential.
*
* @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\SiteCredentialRepository")
* @ORM\Entity(repositoryClass="Wallabag\Repository\SiteCredentialRepository")
* @ORM\Table(name="`site_credential`")
* @ORM\HasLifecycleCallbacks()
*/
@ -66,7 +66,7 @@ class SiteCredential
private $updatedAt;
/**
* @ORM\ManyToOne(targetEntity="Wallabag\CoreBundle\Entity\User", inversedBy="siteCredentials")
* @ORM\ManyToOne(targetEntity="Wallabag\Entity\User", inversedBy="siteCredentials")
*/
private $user;

4
src/Entity/Tag.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\CoreBundle\Entity;
namespace Wallabag\Entity;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\ORM\Mapping as ORM;
@ -20,7 +20,7 @@ use JMS\Serializer\Annotation\XmlRoot;
* @ORM\Index(name="tag_label", columns={"label"}, options={"lengths"={255}}),
* }
* )
* @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\TagRepository")
* @ORM\Entity(repositoryClass="Wallabag\Repository\TagRepository")
* @ExclusionPolicy("all")
*/
class Tag

6
src/Entity/TaggingRule.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\CoreBundle\Entity;
namespace Wallabag\Entity;
use Doctrine\ORM\Mapping as ORM;
use JMS\Serializer\Annotation\Exclude;
@ -13,7 +13,7 @@ use Symfony\Component\Validator\Constraints as Assert;
* Tagging rule.
*
* @XmlRoot("tagging_rule")
* @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\TaggingRuleRepository")
* @ORM\Entity(repositoryClass="Wallabag\Repository\TaggingRuleRepository")
* @ORM\Table(name="`tagging_rule`")
* @ORM\Entity
*/
@ -56,7 +56,7 @@ class TaggingRule implements RuleInterface
/**
* @Exclude
*
* @ORM\ManyToOne(targetEntity="Wallabag\CoreBundle\Entity\Config", inversedBy="taggingRules")
* @ORM\ManyToOne(targetEntity="Wallabag\Entity\Config", inversedBy="taggingRules")
*/
private $config;

20
src/Entity/User.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\CoreBundle\Entity;
namespace Wallabag\Entity;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\ORM\Mapping as ORM;
@ -14,14 +14,14 @@ use Scheb\TwoFactorBundle\Model\BackupCodeInterface;
use Scheb\TwoFactorBundle\Model\Email\TwoFactorInterface as EmailTwoFactorInterface;
use Scheb\TwoFactorBundle\Model\Google\TwoFactorInterface as GoogleTwoFactorInterface;
use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
use Wallabag\CoreBundle\Entity\Api\Client;
use Wallabag\CoreBundle\Helper\EntityTimestampsTrait;
use Wallabag\Entity\Api\Client;
use Wallabag\Helper\EntityTimestampsTrait;
/**
* User.
*
* @XmlRoot("user")
* @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\UserRepository")
* @ORM\Entity(repositoryClass="Wallabag\Repository\UserRepository")
* @ORM\Table(name="`user`")
* @ORM\HasLifecycleCallbacks()
*
@ -122,26 +122,26 @@ class User extends BaseUser implements EmailTwoFactorInterface, GoogleTwoFactorI
protected $updatedAt;
/**
* @ORM\OneToMany(targetEntity="Wallabag\CoreBundle\Entity\Entry", mappedBy="user", cascade={"remove"})
* @ORM\OneToMany(targetEntity="Wallabag\Entity\Entry", mappedBy="user", cascade={"remove"})
*/
protected $entries;
/**
* @ORM\OneToOne(targetEntity="Wallabag\CoreBundle\Entity\Config", mappedBy="user", cascade={"remove"})
* @ORM\OneToOne(targetEntity="Wallabag\Entity\Config", mappedBy="user", cascade={"remove"})
*/
protected $config;
/**
* @var ArrayCollection&iterable<\Wallabag\CoreBundle\Entity\SiteCredential>
* @var ArrayCollection&iterable<\Wallabag\Entity\SiteCredential>
*
* @ORM\OneToMany(targetEntity="Wallabag\CoreBundle\Entity\SiteCredential", mappedBy="user", cascade={"remove"})
* @ORM\OneToMany(targetEntity="Wallabag\Entity\SiteCredential", mappedBy="user", cascade={"remove"})
*/
protected $siteCredentials;
/**
* @var ArrayCollection&iterable<\Wallabag\CoreBundle\Entity\Api\Client>
* @var ArrayCollection&iterable<\Wallabag\Entity\Api\Client>
*
* @ORM\OneToMany(targetEntity="Wallabag\CoreBundle\Entity\Api\Client", mappedBy="user", cascade={"remove"})
* @ORM\OneToMany(targetEntity="Wallabag\Entity\Api\Client", mappedBy="user", cascade={"remove"})
*/
protected $clients;