diff --git a/backend/lib/Model/Aggregator.php b/backend/lib/Model/Aggregator.php index 2a78ee0..2abf6b5 100644 --- a/backend/lib/Model/Aggregator.php +++ b/backend/lib/Model/Aggregator.php @@ -55,7 +55,6 @@ class Aggregator extends Entity { public function __construct($properties = array()) { parent::__construct($properties); - $this->channels = new ArrayCollection(); $this->children = new ArrayCollection(); } @@ -120,4 +119,4 @@ class Aggregator extends Entity { } -?> \ No newline at end of file +?> diff --git a/backend/lib/Model/Channel.php b/backend/lib/Model/Channel.php index 0384fcd..cd3697f 100644 --- a/backend/lib/Model/Channel.php +++ b/backend/lib/Model/Channel.php @@ -40,9 +40,6 @@ class Channel extends Entity { */ protected $data = NULL; - /** @ManyToMany(targetEntity="Aggregator", mappedBy="channels") */ - protected $aggregators; - /** * Constructor */ diff --git a/backend/lib/Model/Entity.php b/backend/lib/Model/Entity.php index 0934d03..915419d 100644 --- a/backend/lib/Model/Entity.php +++ b/backend/lib/Model/Entity.php @@ -109,7 +109,7 @@ abstract class Entity { } if (count($invalidProperties) > 0) { - throw new \Exception('Propert' . ((count($invalidProperties) == 1) ? 'y' : 'ies') . ' "' . implode(', ', $unallowedProperties) . '" ' . ((count($unallowedProperties) == 1) ? 'is' : 'are') . ' not allowed for entity "' . $this->getType() . '"'); + throw new \Exception('Propert' . ((count($invalidProperties) == 1) ? 'y' : 'ies') . ' "' . implode(', ', $invalidProperties) . '" ' . ((count($invalidProperties) == 1) ? 'is' : 'are') . ' not allowed for entity "' . $this->getType() . '"'); } } diff --git a/backend/lib/Model/Proxy/VolkszaehlerModelChannelProxy.php b/backend/lib/Model/Proxy/VolkszaehlerModelChannelProxy.php index 8d8c664..6db8f44 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', 'aggregators'); + return array('__isInitialized__', 'id', 'uuid', 'type', 'tokens', 'properties', 'parents', 'data'); } } \ No newline at end of file diff --git a/backend/lib/Router.php b/backend/lib/Router.php index 7d3db11..b220e60 100644 --- a/backend/lib/Router.php +++ b/backend/lib/Router.php @@ -144,7 +144,7 @@ class Router { */ public function run() { $pathInfo = substr($this->pathInfo, 1, strrpos($this->pathInfo, '.') -1); // remove leading slash and format - $pathInfo = explode('/', $pathInfo); // split into path segments + $pathInfo = explode('/', $pathInfo); // split into path segments if (array_key_exists($pathInfo[0], self::$controllerMapping)) { $class = self::$controllerMapping[$pathInfo[0]]; @@ -226,4 +226,4 @@ class Router { } } -?> \ No newline at end of file +?>