From 6dc6f924cf148b5444d421d285ce98dea5d47109 Mon Sep 17 00:00:00 2001
From: Julius Haertl <jus@bitgrid.net>
Date: Tue, 31 Jan 2017 13:43:35 +0100
Subject: [PATCH] Rename to RelationalEntity to avoid naming collission

---
 lib/Db/Acl.php                              | 2 +-
 lib/Db/Board.php                            | 2 +-
 lib/Db/Card.php                             | 2 +-
 lib/Db/CardMapper.php                       | 2 +-
 lib/Db/Label.php                            | 2 +-
 lib/Db/{Entity.php => RelationalEntity.php} | 2 +-
 lib/Db/Stack.php                            | 2 +-
 lib/Db/StackMapper.php                      | 3 ++-
 tests/unit/Db/EntityTest.php                | 4 ++--
 9 files changed, 11 insertions(+), 10 deletions(-)
 rename lib/Db/{Entity.php => RelationalEntity.php} (96%)

diff --git a/lib/Db/Acl.php b/lib/Db/Acl.php
index ea8570c9f..04be2ac4d 100644
--- a/lib/Db/Acl.php
+++ b/lib/Db/Acl.php
@@ -23,7 +23,7 @@
 
 namespace OCA\Deck\Db;
 
-class Acl extends Entity implements \JsonSerializable {
+class Acl extends RelationalEntity implements \JsonSerializable {
 
 	const PERMISSION_READ = 0;
 	const PERMISSION_EDIT = 1;
diff --git a/lib/Db/Board.php b/lib/Db/Board.php
index 8a3c02d9e..4c8455439 100644
--- a/lib/Db/Board.php
+++ b/lib/Db/Board.php
@@ -25,7 +25,7 @@ namespace OCA\Deck\Db;
 
 use JsonSerializable;
 
-class Board extends Entity implements JsonSerializable {
+class Board extends RelationalEntity implements JsonSerializable {
 
     public $id;
     protected $title;
diff --git a/lib/Db/Card.php b/lib/Db/Card.php
index ed3046bc1..3c18f6ea1 100644
--- a/lib/Db/Card.php
+++ b/lib/Db/Card.php
@@ -26,7 +26,7 @@ namespace OCA\Deck\Db;
 
 use JsonSerializable;
 
-class Card extends Entity implements JsonSerializable {
+class Card extends RelationalEntity implements JsonSerializable {
 
     public $id;
     protected $title;
diff --git a/lib/Db/CardMapper.php b/lib/Db/CardMapper.php
index 9d71bb67c..961d77866 100644
--- a/lib/Db/CardMapper.php
+++ b/lib/Db/CardMapper.php
@@ -49,7 +49,7 @@ class CardMapper extends DeckMapper implements IPermissionMapper {
 
 	/**
 	 * @param $id
-	 * @return Entity if not found
+	 * @return RelationalEntity if not found
 	 */
 	public function find($id) {
 		$sql = 'SELECT * FROM `*PREFIX*deck_cards` ' .
diff --git a/lib/Db/Label.php b/lib/Db/Label.php
index 6f8f9d09c..1e805ada8 100644
--- a/lib/Db/Label.php
+++ b/lib/Db/Label.php
@@ -26,7 +26,7 @@ namespace OCA\Deck\Db;
 
 use JsonSerializable;
 
-class Label extends Entity implements JsonSerializable {
+class Label extends RelationalEntity implements JsonSerializable {
 
     public $id;
     protected $title;
diff --git a/lib/Db/Entity.php b/lib/Db/RelationalEntity.php
similarity index 96%
rename from lib/Db/Entity.php
rename to lib/Db/RelationalEntity.php
index eabc44aba..a2da98ba5 100644
--- a/lib/Db/Entity.php
+++ b/lib/Db/RelationalEntity.php
@@ -31,7 +31,7 @@
 namespace OCA\Deck\Db;
 
 
-class Entity extends \OCP\AppFramework\Db\Entity {
+class RelationalEntity extends \OCP\AppFramework\Db\Entity {
 
 	private $_relations = array();
 
diff --git a/lib/Db/Stack.php b/lib/Db/Stack.php
index f987e5df5..4005284c7 100644
--- a/lib/Db/Stack.php
+++ b/lib/Db/Stack.php
@@ -26,7 +26,7 @@ namespace OCA\Deck\Db;
 use JsonSerializable;
 
 
-class Stack extends Entity implements JsonSerializable {
+class Stack extends RelationalEntity implements JsonSerializable {
 
     public $id;
     protected $title;
diff --git a/lib/Db/StackMapper.php b/lib/Db/StackMapper.php
index 854767c63..afb753ae4 100644
--- a/lib/Db/StackMapper.php
+++ b/lib/Db/StackMapper.php
@@ -23,6 +23,7 @@
 
 namespace OCA\Deck\Db;
 
+use OCP\AppFramework\Db\Entity;
 use OCP\IDBConnection;
 
 
@@ -53,7 +54,7 @@ class StackMapper extends DeckMapper implements IPermissionMapper {
     }
     
 
-    public function delete(\OCP\AppFramework\Db\Entity $entity) {
+    public function delete(Entity $entity) {
         // delete cards on stack
 		$this->cardMapper->deleteByStack($entity->getId());
         return parent::delete($entity);
diff --git a/tests/unit/Db/EntityTest.php b/tests/unit/Db/EntityTest.php
index 195068899..251c28c07 100644
--- a/tests/unit/Db/EntityTest.php
+++ b/tests/unit/Db/EntityTest.php
@@ -26,7 +26,7 @@ namespace OCA\Deck\Db;
 class EntityTest extends \PHPUnit_Framework_TestCase {
 
 	public function testRelation() {
-		$entity = new Entity();
+		$entity = new RelationalEntity();
 		$entity->foo = null;
 		$entity->addRelation('foo');
 		$entity->setFoo('test');
@@ -34,7 +34,7 @@ class EntityTest extends \PHPUnit_Framework_TestCase {
 	}
 	
 	public function testWithoutRelation() {
-		$entity = new Entity();
+		$entity = new RelationalEntity();
 		$entity->foo = null;
 		$entity->setFoo('test');
 		$this->assertEquals(['foo'=>true], $entity->getUpdatedFields());