MagicAccessors: fix incorrect handling of method names [Fixes #227] [C…

…loses #228]
Kdyby · Mar 28, 2016 · ae0f00d · ae0f00d
1 parent cc4a3e8
commit ae0f00d
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 2 deletions.
diff --git a/src/Kdyby/Doctrine/Entities/MagicAccessors.php b/src/Kdyby/Doctrine/Entities/MagicAccessors.php
@@ -133,6 +133,15 @@ public function __call($name, $args)
 
 						return $this;
 
+					} elseif (substr($prop, -1) === 's' && isset($properties[$prop = substr($prop, 0, -1) . 'ses'])) {
+						if (!$this->$prop instanceof Collection) {
+							throw UnexpectedValueException::notACollection($this, $prop);
+						}
+
+						$this->$prop->add($args[0]);
+
+						return $this;
+
 					} elseif (isset($properties[$prop])) {
 						throw UnexpectedValueException::notACollection($this, $prop);
 					}
@@ -152,6 +161,13 @@ public function __call($name, $args)
 
 						return $this->$prop->contains($args[0]);
 
+					} elseif (substr($prop, -1) === 's' && isset($properties[$prop = substr($prop, 0, -1) . 'ses'])) {
+						if (!$this->$prop instanceof Collection) {
+							throw UnexpectedValueException::notACollection($this, $prop);
+						}
+
+						return $this->$prop->contains($args[0]);
+
 					} elseif (isset($properties[$prop])) {
 						throw UnexpectedValueException::notACollection($this, $prop);
 					}
@@ -177,6 +193,15 @@ public function __call($name, $args)
 
 						return $this;
 
+					} elseif (substr($prop, -1) === 's' && isset($properties[$prop = substr($prop, 0, -1) . 'ses'])) {
+						if (!$this->$prop instanceof Collection) {
+							throw UnexpectedValueException::notACollection($this, $prop);
+						}
+
+						$this->$prop->removeElement($args[0]);
+
+						return $this;
+
 					} elseif (isset($properties[$prop])) {
 						throw UnexpectedValueException::notACollection($this, $prop);
 					}

diff --git a/tests/KdybyTests/Doctrine/MagicAccesors.phpt b/tests/KdybyTests/Doctrine/MagicAccesors.phpt
@@ -383,6 +383,23 @@ class MagicAccessorsTest extends Tester\TestCase
 		Assert::same(2, $entity->getRealSomething());
 	}
 
+
+
+	public function testPluralAccessor()
+	{
+		$entity = new BadlyNamedEntity();
+		Assert::false($entity->hasBus(1));
+
+		$entity->addBus(1);
+		$entity->addBus(2);
+		Assert::true($entity->hasBus(1));
+
+		$entity->removeBus(1);
+		Assert::false($entity->hasBus(1));
+
+		Assert::true($entity->hasBus(2));
+	}
+
 }
 
 
@@ -425,6 +442,11 @@ class BadlyNamedEntity
 	 */
 	protected $four;
 
+	/**
+	 * @var \Doctrine\Common\Collections\ArrayCollection
+	 */
+	protected $buses;
+
 	/**
 	 * @var object
 	 */
@@ -457,8 +479,6 @@ class BadlyNamedEntity
 
 
 
-	/**
-	 */
 	public function __construct()
 	{
 		$this->one = (object) ['id' => 1];
@@ -469,6 +489,8 @@ class BadlyNamedEntity
 		$this->twos = new ArrayCollection([(object) ['id' => 2]]);
 		$this->proxies = new ArrayCollection([(object) ['id' => 3]]);
 		$this->threes = new ArrayCollection([(object) ['id' => 4]]);
+
+		$this->buses = new ArrayCollection();
 	}