From a5a4ab762111c0ac8a647da2791c87358761ef37 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Fri, 10 Dec 2010 22:46:40 +0100 Subject: [PATCH] removed unused token overhead --- backend/lib/Model/Entity.php | 6 ------ .../lib/Model/Proxy/VolkszaehlerModelAggregatorProxy.php | 2 +- backend/lib/Model/Proxy/VolkszaehlerModelChannelProxy.php | 2 +- backend/lib/Model/Proxy/VolkszaehlerModelEntityProxy.php | 2 +- 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/backend/lib/Model/Entity.php b/backend/lib/Model/Entity.php index 46084c7..e3a8e97 100644 --- a/backend/lib/Model/Entity.php +++ b/backend/lib/Model/Entity.php @@ -60,11 +60,6 @@ abstract class Entity { /** @Column(type="string", nullable=false) */ protected $type; - /** - * @OneToMany(targetEntity="Token", mappedBy="entity", cascade={"remove", "persist"}) - */ - protected $tokens = NULL; - /** * @OneToMany(targetEntity="Property", mappedBy="entity", cascade={"remove", "persist"}) * @OrderBy({"key" = "ASC"}) @@ -89,7 +84,6 @@ abstract class Entity { $this->type = $type; $this->uuid = (string) Util\UUID::mint(); - $this->tokens = new Collections\ArrayCollection(); $this->properties = new Collections\ArrayCollection(); $this->parents = new Collections\ArrayCollection(); } diff --git a/backend/lib/Model/Proxy/VolkszaehlerModelAggregatorProxy.php b/backend/lib/Model/Proxy/VolkszaehlerModelAggregatorProxy.php index c7dd050..251c866 100644 --- a/backend/lib/Model/Proxy/VolkszaehlerModelAggregatorProxy.php +++ b/backend/lib/Model/Proxy/VolkszaehlerModelAggregatorProxy.php @@ -108,6 +108,6 @@ class VolkszaehlerModelAggregatorProxy extends \Volkszaehler\Model\Aggregator im public function __sleep() { - return array('__isInitialized__', 'id', 'uuid', 'type', 'tokens', 'properties', 'parents', 'children'); + return array('__isInitialized__', 'id', 'uuid', 'type', 'properties', 'parents', 'children'); } } \ No newline at end of file diff --git a/backend/lib/Model/Proxy/VolkszaehlerModelChannelProxy.php b/backend/lib/Model/Proxy/VolkszaehlerModelChannelProxy.php index 6db8f44..9909ece 100644 --- a/backend/lib/Model/Proxy/VolkszaehlerModelChannelProxy.php +++ b/backend/lib/Model/Proxy/VolkszaehlerModelChannelProxy.php @@ -96,6 +96,6 @@ class VolkszaehlerModelChannelProxy extends \Volkszaehler\Model\Channel implemen public function __sleep() { - return array('__isInitialized__', 'id', 'uuid', 'type', 'tokens', 'properties', 'parents', 'data'); + return array('__isInitialized__', 'id', 'uuid', 'type', 'properties', 'parents', 'data'); } } \ No newline at end of file diff --git a/backend/lib/Model/Proxy/VolkszaehlerModelEntityProxy.php b/backend/lib/Model/Proxy/VolkszaehlerModelEntityProxy.php index 83171ca..b4ddffa 100644 --- a/backend/lib/Model/Proxy/VolkszaehlerModelEntityProxy.php +++ b/backend/lib/Model/Proxy/VolkszaehlerModelEntityProxy.php @@ -90,6 +90,6 @@ class VolkszaehlerModelEntityProxy extends \Volkszaehler\Model\Entity implements public function __sleep() { - return array('__isInitialized__', 'id', 'uuid', 'type', 'tokens', 'properties', 'parents'); + return array('__isInitialized__', 'id', 'uuid', 'type', 'properties', 'parents'); } } \ No newline at end of file