Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Es add entity set #12

Open
wants to merge 2 commits into
base: 8.x-1.0
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/Controller/AbstractEntityController.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,13 @@ public function getEntity() {
return $this->entity;
}

/**
* @param \Drupal\Core\Entity\EntityInterface $entity
*/
public function setEntity(EntityInterface $entity) {
$this->entity = $entity;
}

/**
* @return string
*/
Expand Down
50 changes: 50 additions & 0 deletions src/Factory/EntityControllerFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,47 @@

namespace Drupal\cw_tool\Factory;

use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Entity\EntityManagerInterface;
use Drupal\cw_tool\Controller\AbstractEntityController;

/**
* Class EntityControllerFactory
* @package Drupal\cw_tool\Factory
*
* The purpose of this class is to create entity controllers.
*/
class EntityControllerFactory {

const MASTER_CONTROLLER_CLASS = 'Drupal\cw_tool\Controller\AbstractEntityController';

/**
* @var string
*/
private $entityType;

/**
* @var string
*/
private $controllerClass;

/**
* @var \Drupal\Core\Entity\EntityManagerInterface
*/
private $entityManager;

/**
* EntityControllerFactory constructor.
*
* @param \Drupal\Core\Entity\EntityManagerInterface $entityManager
* Drupal entity manager.
* @param string $entityType
* Entity type.
* @param string $controllerClass
* Actual entity controller class.
*
* @throws \InvalidArgumentException
*/
public function __construct(EntityManagerInterface $entityManager, $entityType, $controllerClass) {
$this->entityType = $entityType;

Expand All @@ -33,8 +59,32 @@ public function __construct(EntityManagerInterface $entityManager, $entityType,
$this->entityManager = $entityManager;
}

/**
* Factory method to provide the controller by id.
*
* @param int|null $id
* ID of the entity.
*
* @return AbstractEntityController
* Instance of the controller.
*/
public function initWithID($id) {
return new $this->controllerClass($this->entityManager, $this->entityType, $id);
}

/**
* Factory method to provide the controller by id.
*
* @param \Drupal\Core\Entity\EntityInterface $entity
* Entity.
*
* @return AbstractEntityController
* Instance of the controller.
*/
public function initWithEntity(EntityInterface $entity) {
$controller = $this->initWithID($entity->id());
$controller->setEntity($entity);
return $controller;
}

}
5 changes: 3 additions & 2 deletions tests/src/Unit/Controller/AbstractEntityControllerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

namespace Drupal\Tests\cw_tool\Unit\Controller;

use Drupal\KernelTests\KernelTestBase;
use Drupal\Tests\UnitTestCase;
use Drupal\Tests\cw_tool\Fixtures\Controller\MinimalEntityController;

/**
Expand All @@ -16,7 +16,7 @@
*
* @group cw_tool
*/
class AbstractEntityControllerTest extends KernelTestBase {
class AbstractEntityControllerTest extends UnitTestCase {

/**
* @var \PHPUnit_Framework_MockObject_MockObject
Expand All @@ -29,6 +29,7 @@ class AbstractEntityControllerTest extends KernelTestBase {
private $entityStorageMock;

public function setUp() {
include_once __DIR__ . '/../../Fixtures/Controller/MinimalEntityController.php';
$this->entityManagerMock = $this->getMock('Drupal\Core\Entity\EntityManagerInterface');
$this->entityStorageMock = $this->getMock('Drupal\Core\Entity\EntityStorageInterface');
parent::setUp();
Expand Down