Merge branch 'master' into gh101-has_many-through

lib/php-activerecord/test/AllTests.php

···
 <?php
 require_once 'PHPUnit/Framework.php';
 
-date_default_timezone_set('Europe/Zurich');
-
 foreach (glob('*Test.php') as $file)
 {
 	if ($file != 'AllValidationsTest.php')
···
 		return $suite;
 	}
 }
-?>
+?>

lib/php-activerecord/test/RelationshipTest.php

···
 		AuthorWithNonModelRelationship::first()->books;
 	}
 
-	public function test_gh93_eager_loading_respects_association_options()
+	public function test_gh93_and_gh100_eager_loading_respects_association_options()
 	{
-		Venue::$has_many = array(array('events', 'order' => 'id asc', 'conditions' => array('length(title) = ?', 14)));
+		Venue::$has_many = array(array('events', 'class_name' => 'Event', 'order' => 'id asc', 'conditions' => array('length(title) = ?', 14)));
 		$venues = Venue::find(array(2, 6), array('include' => 'events'));
 
 		$this->assert_sql_has("WHERE length(title) = ? AND venue_id IN(?,?) ORDER BY id asc",ActiveRecord\Table::load('Event')->last_sql);

lib/php-activerecord/test/helpers/config.php

···
 });
 
 error_reporting(E_ALL | E_STRICT);
-?>
+?>