Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Move entities to lib/entities and use "Entity" suffix

Browse Source 
[MAILPOET-2014]
This commit is contained in:
Jan Jakeš
2019-07-24 10:58:08 +02:00
committed by M. Shull
parent 6ede84af1b
commit 0353f8e8b1
7 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Config/Populator.php
View File

@ -7,7 +7,7 @@ use MailPoet\Cron\CronTrigger;
use MailPoet\Cron\Workers\AuthorizedSendingEmailsCheck; use MailPoet\Cron\Workers\AuthorizedSendingEmailsCheck;
use MailPoet\Cron\Workers\Beamer; use MailPoet\Cron\Workers\Beamer;
use MailPoet\Cron\Workers\InactiveSubscribers; use MailPoet\Cron\Workers\InactiveSubscribers;
use MailPoet\Doctrine\Entities\UserFlag; use MailPoet\Entities\UserFlagEntity;
use MailPoet\Settings\UserFlagsRepository; use MailPoet\Settings\UserFlagsRepository;
use MailPoet\Mailer\MailerLog; use MailPoet\Mailer\MailerLog;
use MailPoet\Models\NewsletterTemplate; use MailPoet\Models\NewsletterTemplate;
@ -307,7 +307,7 @@ class Populator {
]); ]);
if (!$flag) { if (!$flag) {
$flag = new UserFlag(); $flag = new UserFlagEntity();
$flag->setUserId($user_id); $flag->setUserId($user_id);
$flag->setName($name); $flag->setName($name);
$user_flags_repository->persist($flag); $user_flags_repository->persist($flag);

2
lib/Doctrine/ConfigurationFactory.php
View File

@ -9,7 +9,7 @@ use MailPoetVendor\Doctrine\ORM\Configuration;
use MailPoetVendor\Doctrine\ORM\Mapping\UnderscoreNamingStrategy; use MailPoetVendor\Doctrine\ORM\Mapping\UnderscoreNamingStrategy;
class ConfigurationFactory { class ConfigurationFactory {
const ENTITY_DIR = __DIR__ . '/../Doctrine/Entities'; const ENTITY_DIR = __DIR__ . '/../Entities';
const METADATA_DIR = __DIR__ . '/../../generated/doctrine-metadata'; const METADATA_DIR = __DIR__ . '/../../generated/doctrine-metadata';
const PROXY_DIR = __DIR__ . '/../../generated/doctrine-proxies'; const PROXY_DIR = __DIR__ . '/../../generated/doctrine-proxies';
const PROXY_NAMESPACE = 'MailPoetDoctrineProxies'; const PROXY_NAMESPACE = 'MailPoetDoctrineProxies';

4
lib/Doctrine/Entities/UserFlag.php → lib/Entities/UserFlagEntity.php
View File

@ -1,6 +1,6 @@
<?php <?php
namespace MailPoet\Doctrine\Entities; namespace MailPoet\Entities;
use MailPoet\Doctrine\EntityTraits\AutoincrementedIdTrait; use MailPoet\Doctrine\EntityTraits\AutoincrementedIdTrait;
use MailPoet\Doctrine\EntityTraits\CreatedAtTrait; use MailPoet\Doctrine\EntityTraits\CreatedAtTrait;
@ -10,7 +10,7 @@ use MailPoet\Doctrine\EntityTraits\UpdatedAtTrait;
* @Entity() * @Entity()
* @Table(name="user_flags") * @Table(name="user_flags")
*/ */
class UserFlag { class UserFlagEntity {
use AutoincrementedIdTrait; use AutoincrementedIdTrait;
use CreatedAtTrait; use CreatedAtTrait;
use UpdatedAtTrait; use UpdatedAtTrait;

4
lib/Settings/UserFlagsController.php
View File

@ -1,7 +1,7 @@
<?php <?php
namespace MailPoet\Settings; namespace MailPoet\Settings;
use MailPoet\Doctrine\Entities\UserFlag; use MailPoet\Entities\UserFlagEntity;
use MailPoet\WP\Functions as WPFunctions; use MailPoet\WP\Functions as WPFunctions;
class UserFlagsController { class UserFlagsController {
@ -44,7 +44,7 @@ class UserFlagsController {
]); ]);
if (!$flag) { if (!$flag) {
$flag = new UserFlag(); $flag = new UserFlagEntity();
$flag->setUserId($current_user_id); $flag->setUserId($current_user_id);
$flag->setName($name); $flag->setName($name);
$this->user_flags_repository->persist($flag); $this->user_flags_repository->persist($flag);

14
lib/Settings/UserFlagsRepository.php
View File

@ -2,18 +2,18 @@
namespace MailPoet\Settings; namespace MailPoet\Settings;
use MailPoet\Doctrine\Entities\UserFlag; use MailPoet\Entities\UserFlagEntity;
use MailPoet\Doctrine\Repository; use MailPoet\Doctrine\Repository;
/** /**
* @method UserFlag[] findBy(array $criteria, array $order_by = null, int $limit = null, int $offset = null) * @method UserFlagEntity[] findBy(array $criteria, array $order_by = null, int $limit = null, int $offset = null)
* @method UserFlag|null findOneBy(array $criteria, array $order_by = null) * @method UserFlagEntity|null findOneBy(array $criteria, array $order_by = null)
* @method UserFlag|null findOneById(mixed $id) * @method UserFlagEntity|null findOneById(mixed $id)
* @method void persist(UserFlag $entity) * @method void persist(UserFlagEntity $entity)
* @method void remove(UserFlag $entity) * @method void remove(UserFlagEntity $entity)
*/ */
class UserFlagsRepository extends Repository { class UserFlagsRepository extends Repository {
protected function getEntityClassName() { protected function getEntityClassName() {
return UserFlag::class; return UserFlagEntity::class;
} }
} }

4
tests/integration/API/JSON/v1/UserFlagsTest.php
View File

@ -6,7 +6,7 @@ use Codeception\Stub;
use MailPoet\API\JSON\Response as APIResponse; use MailPoet\API\JSON\Response as APIResponse;
use MailPoet\API\JSON\Error as APIError; use MailPoet\API\JSON\Error as APIError;
use MailPoet\API\JSON\v1\UserFlags; use MailPoet\API\JSON\v1\UserFlags;
use MailPoet\Doctrine\Entities\UserFlag; use MailPoet\Entities\UserFlagEntity;
use MailPoet\Settings\UserFlagsRepository; use MailPoet\Settings\UserFlagsRepository;
use MailPoet\Settings\UserFlagsController; use MailPoet\Settings\UserFlagsController;
@ -61,7 +61,7 @@ class UserFlagsTest extends \MailPoetTest {
} }
private function cleanup() { private function cleanup() {
$table_name = $this->entity_manager->getClassMetadata(UserFlag::class)->getTableName(); $table_name = $this->entity_manager->getClassMetadata(UserFlagEntity::class)->getTableName();
$this->entity_manager->getConnection()->executeUpdate("TRUNCATE $table_name"); $this->entity_manager->getConnection()->executeUpdate("TRUNCATE $table_name");
} }
} }

6
tests/integration/Settings/UserFlagsControllerTest.php
View File

@ -2,7 +2,7 @@
namespace MailPoet\Test\Settings; namespace MailPoet\Test\Settings;
use Codeception\Stub; use Codeception\Stub;
use MailPoet\Doctrine\Entities\UserFlag; use MailPoet\Entities\UserFlagEntity;
use MailPoet\Settings\UserFlagsRepository; use MailPoet\Settings\UserFlagsRepository;
use MailPoet\Settings\UserFlagsController; use MailPoet\Settings\UserFlagsController;
use MailPoet\WP\Functions as WPFunctions; use MailPoet\WP\Functions as WPFunctions;
@ -90,7 +90,7 @@ class UserFlagsControllerTest extends \MailPoetTest {
} }
private function createUserFlag($user_id, $name, $value) { private function createUserFlag($user_id, $name, $value) {
$flag = new UserFlag(); $flag = new UserFlagEntity();
$flag->setUserId($user_id); $flag->setUserId($user_id);
$flag->setName($name); $flag->setName($name);
$flag->setValue($value); $flag->setValue($value);
@ -114,7 +114,7 @@ class UserFlagsControllerTest extends \MailPoetTest {
} }
private function cleanup() { private function cleanup() {
$table_name = $this->entity_manager->getClassMetadata(UserFlag::class)->getTableName(); $table_name = $this->entity_manager->getClassMetadata(UserFlagEntity::class)->getTableName();
$this->connection->executeUpdate("TRUNCATE $table_name"); $this->connection->executeUpdate("TRUNCATE $table_name");
} }
} }