Auto setter for relations with tests (thanks to Jan →).

Support for subclasses of the model specified.

null is also a valid value to be set for relations

Author: greut

lib/Model.php

@@ -446,6 +446,30 @@ public function __set($name, $value)
 				return $this->$item['to']->$delegated_name = $value;
 		}
 
+		$table = static::table();
+		if ($relationship = $table->get_relationship($name)
+		)
+		{
+			if (is_null($value))
+			{
+				$this->__relationships[$name] = $value;
+				return $this->assign_attribute($relationship->foreign_key[0], $value);
+			}
+			elseif (($value instanceof \ActiveRecord\Model) &&
+					$value instanceof $relationship->class_name)
+			{
+				$this->__relationships[$name] = $value;
+				$pk = $value->get_primary_key(0);
+				return $this->assign_attribute(
+					$relationship->foreign_key[0],
+					$value->is_new_record() ? null : $value->{$pk[0]}
+				);
+			}
+			else
+			{
+				throw new RelationshipException();
+			}
+		}
 		throw new UndefinedPropertyException(get_called_class(),$name);
 	}
 
@@ -837,7 +861,7 @@ public static function table()
 	 * @param boolean $guard_attributes Set to true to guard protected/non-accessible attributes
 	 * @return Model
 	 */
-	public static function create($attributes, $validate=true, $guard_attributes=true)
+	public static function create(array $attributes=array(), $validate=true, $guard_attributes=true)
 	{
 		$class_name = get_called_class();
 		$model = new $class_name($attributes, $guard_attributes);

test/RelationshipTest.php

@@ -726,4 +726,57 @@ public function test_dont_attempt_eager_load_when_record_does_not_exist()
 	{
 		Author::find(999999, array('include' => array('books')));
 	}
+
+	public function test_gh_125_auto_setter_for_relation()
+	{
+		$event = new Event(array(
+			'venue' => new Venue()
+		));
+
+		$this->assert_not_null($event->venue);
+		$this->assert_null($event->venue_id);
+	}
+
+	public function test_gh_125_auto_setter_for_relation_with_id()
+	{
+		$event = new Event(array(
+			'venue' => Venue::create()
+		));
+
+		$this->assert_not_null($event->venue);
+		$this->assert_not_null($event->venue_id);
+		$event->venue->delete();
+	}
+
+	/**
+	 * @expectedException ActiveRecord\RelationshipException
+	 */
+	public function test_gh_125_auto_setter_for_relation_raises_exception()
+	{
+		$event = new Event(array(
+			'venue' => new Book()
+		));
+	}
+
+	public function test_gh_125_auto_setter_for_relation_using_subclass()
+	{
+		$event = new Event(array(
+			'venue' => new SubVenue()
+		));
+
+		$this->assert_not_null($event->venue);
+		$this->assert_null($event->venue_id);
+	}
+
+	public function test_gh_125_unset_existing_relation()
+	{
+		$event = new Event(array(
+			'venue' => Venue::create()
+		));
+
+		$event->venue->delete();
+		$event->venue = null;
+		$this->assert_null($event->venue);
+		$this->assert_null($event->venue_id);
+	}
 }

test/models/SubVenue.php

@@ -0,0 +1,6 @@
+<?php
+class SubVenue extends Venue
+{
+	static $table_name = 'venues';
+}
+?>