Making EntityContext more intelligent by reading the entity source

src/View/Form/EntityContext.php

@@ -120,7 +120,13 @@ class EntityContext implements ContextInterface {
 			if (is_array($entity) || $entity instanceof Traversable) {
 				$entity = (new Collection($entity))->first();
 			}
-			if ($entity instanceof Entity && get_class($entity) !== 'Cake\ORM\Entity') {
+			$isEntity = $entity instanceof Entity;
+
+			if ($isEntity) {
+				$source = $entity->source();
+				$table = isset($source['alias']) ? $source['alias'] : null;
+			}
+			if (!$table && $isEntity && get_class($entity) !== 'Cake\ORM\Entity') {
 				list($ns, $entityClass) = namespaceSplit(get_class($entity));
 				$table = Inflector::pluralize($entityClass);
 			}

tests/TestCase/View/Form/EntityContextTest.php

@@ -144,6 +144,21 @@ class EntityContextTest extends TestCase {
 	}
 
 /**
+ * Tests that the table can be derived from the entity source if it is present
+ *
+ * @return void
+ */
+	public function testTableFromEntitySource() {
+		$entity = new Entity;
+		$entity->source(['alias' => 'Articles']);
+		$context = new EntityContext($this->request, [
+			'entity' => $entity,
+		]);
+		$expected = ['id', 'author_id', 'title', 'body', 'published'];
+		$this->assertEquals($expected, $context->fieldNames());
+	}
+
+/**
  * Test operations with no entity.
  *
  * @return void