tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

MINOR Use injector for creating Member_GroupSet object

Browse Source 
MINOR Use injector for creating many many list objects

MINOR Use injector for creating objects from within the DataList

MINOR Use Injector::inst() for creating objects; cannot rely on this->injector being present due to many classes being created with 'new', so use inst() directly

MINOR Remove injector autoset property for now; automatically setting it breaks a few test cases that don't know about it for now, and it's not needed just yet
This commit is contained in:
Marcus Nyeholt 2012-06-04 22:01:26 +10:00
parent 9898cd9a95
commit 82a1e7d282
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/Core.php
View File

@ -283,7 +283,7 @@ Debug::loadErrorHandlers();
// initialise the dependency injector // initialise the dependency injector
$default_options = array('locator' => 'SilverStripeServiceConfigurationLocator'); $default_options = array('locator' => 'SilverStripeServiceConfigurationLocator');
Injector::inst($default_options)->addAutoProperty('injector', Injector::inst()); Injector::inst($default_options);
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// HELPER FUNCTIONS // HELPER FUNCTIONS

6
dev/SapphireTest.php
View File

@ -829,17 +829,17 @@ class SapphireTest extends PHPUnit_Framework_TestCase {
*/ */
function logInWithPermission($permCode = "ADMIN") { function logInWithPermission($permCode = "ADMIN") {
if(!isset($this->cache_generatedMembers[$permCode])) { if(!isset($this->cache_generatedMembers[$permCode])) {
$group = new Group(); $group = Injector::inst()->create('Group');
$group->Title = "$permCode group"; $group->Title = "$permCode group";
$group->write(); $group->write();
$permission = new Permission(); $permission = Injector::inst()->create('Permission');
$permission->Code = $permCode; $permission->Code = $permCode;
$permission->write(); $permission->write();
$group->Permissions()->add($permission); $group->Permissions()->add($permission);
$member = DataObject::get_one('Member', sprintf('"Email" = \'%s\'', "$permCode@example.org")); $member = DataObject::get_one('Member', sprintf('"Email" = \'%s\'', "$permCode@example.org"));
if(!$member) $member = new Member(); if(!$member) $member = Injector::inst()->create('Member');
$member->FirstName = $permCode; $member->FirstName = $permCode;
$member->Surname = "User"; $member->Surname = "User";

6
model/DataList.php
View File

@ -454,9 +454,9 @@ class DataList extends ViewableData implements SS_List, SS_Filterable, SS_Sortab
// Instantiate the class mentioned in RecordClassName only if it exists, otherwise default to $this->dataClass // Instantiate the class mentioned in RecordClassName only if it exists, otherwise default to $this->dataClass
if(class_exists($row['RecordClassName'])) { if(class_exists($row['RecordClassName'])) {
$item = new $row['RecordClassName']($row, false, $this->model); $item = Injector::inst()->create($row['RecordClassName'], $row, false, $this->model);
} else { } else {
$item = new $defaultClass($row, false, $this->model); $item = Injector::inst()->create($defaultClass, $row, false, $this->model);
} }
return $item; return $item;
@ -765,7 +765,7 @@ class DataList extends ViewableData implements SS_List, SS_Filterable, SS_Sortab
*/ */
public function newObject($initialFields = null) { public function newObject($initialFields = null) {
$class = $this->dataClass; $class = $this->dataClass;
return new $class($initialFields, false, $this->model); return Injector::inst()->create($class, $initialFields, false, $this->model);
} }
/** /**

2
model/DataObject.php
View File

@ -1447,7 +1447,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
public function getManyManyComponents($componentName, $filter = "", $sort = "", $join = "", $limit = "") { public function getManyManyComponents($componentName, $filter = "", $sort = "", $join = "", $limit = "") {
list($parentClass, $componentClass, $parentField, $componentField, $table) = $this->many_many($componentName); list($parentClass, $componentClass, $parentField, $componentField, $table) = $this->many_many($componentName);
$result = new ManyManyList($componentClass, $table, $componentField, $parentField, $result = Injector::inst()->create('ManyManyList', $componentClass, $table, $componentField, $parentField,
$this->many_many_extraFields($componentName)); $this->many_many_extraFields($componentName));
if($this->model) $result->setDataModel($this->model); if($this->model) $result->setDataModel($this->model);

2
security/Member.php
View File

@ -934,7 +934,7 @@ class Member extends DataObject implements TemplateGlobalProvider {
* @todo Push all this logic into Member_GroupSet's getIterator()? * @todo Push all this logic into Member_GroupSet's getIterator()?
*/ */
public function Groups() { public function Groups() {
$groups = new Member_GroupSet('Group', 'Group_Members', 'GroupID', 'MemberID'); $groups = Injector::inst()->create('Member_GroupSet', 'Group', 'Group_Members', 'GroupID', 'MemberID');
$groups->setForeignID($this->ID); $groups->setForeignID($this->ID);
$this->extend('updateGroups', $groups); $this->extend('updateGroups', $groups);