mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 12:05:37 +00:00
3873e4ba00
See https://github.com/silverstripe/silverstripe-framework/pull/7037 and https://github.com/silverstripe/silverstripe-framework/issues/6681 Squashed commit of the following: commit 8f65e5653211240650eaa4fa65bb83b45aae6d58 Author: Ingo Schommer <me@chillu.com> Date: Thu Jun 22 22:25:50 2017 +1200 Fixed upgrade guide spelling commit 76f95944fa89b0b540704b8d744329f690f9698c Author: Damian Mooyman <damian@silverstripe.com> Date: Thu Jun 22 16:38:34 2017 +1200 BUG Fix non-test class manifest including sapphiretest / functionaltest commit 9379834cb4b2e5177a2600049feec05bf111c16b Author: Damian Mooyman <damian@silverstripe.com> Date: Thu Jun 22 15:50:47 2017 +1200 BUG Fix nesting bug in Kernel commit 188ce35d82599360c40f0f2de29579c56fb90761 Author: Damian Mooyman <damian@silverstripe.com> Date: Thu Jun 22 15:14:51 2017 +1200 BUG fix db bootstrapping issues commit 7ed4660e7a63915e8e974deeaba9807bc4d38b0d Author: Damian Mooyman <damian@silverstripe.com> Date: Thu Jun 22 14:49:07 2017 +1200 BUG Fix issue in DetailedErrorFormatter commit 738f50c497166f81ccbe3f40fbcff895ce71f82f Author: Damian Mooyman <damian@silverstripe.com> Date: Thu Jun 22 11:49:19 2017 +1200 Upgrading notes on mysite/_config.php commit 6279d28e5e455916f902a2f963c014d8899f7fc7 Author: Damian Mooyman <damian@silverstripe.com> Date: Thu Jun 22 11:43:28 2017 +1200 Update developer documentation commit 5c90d53a84ef0139c729396949a7857fae60436f Author: Damian Mooyman <damian@silverstripe.com> Date: Thu Jun 22 10:48:44 2017 +1200 Update installer to not use global databaseConfig commit f9b2ba4755371f08bd95f6908ac612fcbb7ca205 Author: Damian Mooyman <damian@silverstripe.com> Date: Wed Jun 21 21:04:39 2017 +1200 Fix behat issues commit 5b59a912b60282b4dad4ef10ed3b97c5d0a761ac Author: Damian Mooyman <damian@silverstripe.com> Date: Wed Jun 21 17:07:11 2017 +1200 Move HTTPApplication to SilverStripe\Control namespace commit e2c4a18f637bdd3d276619554de60ee8b4d95ced Author: Damian Mooyman <damian@silverstripe.com> Date: Wed Jun 21 16:29:03 2017 +1200 More documentation Fix up remaining tests Refactor temp DB into TempDatabase class so it’s available outside of unit tests. commit 5d235e64f341d6251bfe9f4833f15cc8593c5034 Author: Damian Mooyman <damian@silverstripe.com> Date: Wed Jun 21 12:13:15 2017 +1200 API HTTPRequestBuilder::createFromEnvironment() now cleans up live globals BUG Fix issue with SSViewer Fix Security / View tests commit d88d4ed4e48291cb65407f222f190064b1f1deeb Author: Damian Mooyman <damian@silverstripe.com> Date: Tue Jun 20 16:39:43 2017 +1200 API Refactor AppKernel into CoreKernel commit f7946aec3391139ae1b4029c353c327a36552b36 Author: Damian Mooyman <damian@silverstripe.com> Date: Tue Jun 20 16:00:40 2017 +1200 Docs and minor cleanup commit 12bd31f9366327650b5c0c0f96cd0327d44faf0a Author: Damian Mooyman <damian@silverstripe.com> Date: Tue Jun 20 15:34:34 2017 +1200 API Remove OutputMiddleware API Move environment / global / ini management into Environment class API Move getTempFolder into TempFolder class API Implement HTTPRequestBuilder / CLIRequestBuilder BUG Restore SS_ALLOWED_HOSTS check in original location API CoreKernel now requires $basePath to be passed in API Refactor installer.php to use application to bootstrap API move memstring conversion globals to Convert BUG Fix error in CoreKernel nesting not un-nesting itself properly. commit bba979114624247cf463cf2a8c9e4be9a7c3a772 Author: Damian Mooyman <damian@silverstripe.com> Date: Mon Jun 19 18:07:53 2017 +1200 API Create HTTPMiddleware and standardise middleware for request handling commit 2a10c2397bdc53001013f607b5d38087ce6c0730 Author: Damian Mooyman <damian@silverstripe.com> Date: Mon Jun 19 17:42:42 2017 +1200 Fixed ORM tests commit d75a8d1d93398af4bd0432df9e4bc6295c15a3fe Author: Damian Mooyman <damian@silverstripe.com> Date: Mon Jun 19 17:15:07 2017 +1200 FIx i18n tests commit 06364af3c379c931889c4cc34dd920fee3db204a Author: Damian Mooyman <damian@silverstripe.com> Date: Mon Jun 19 16:59:34 2017 +1200 Fix controller namespace Move states to sub namespace commit 2a278e2953d2dbb19f78d91c919048e1fc935436 Author: Damian Mooyman <damian@silverstripe.com> Date: Mon Jun 19 12:49:45 2017 +1200 Fix forms namespace commit b65c21241bee019730027071d815dbf7571197a4 Author: Damian Mooyman <damian@silverstripe.com> Date: Thu Jun 15 18:56:48 2017 +1200 Update API usages commit d1d4375c95a264a6b63cbaefc2c1d12f808bfd82 Author: Damian Mooyman <damian@silverstripe.com> Date: Thu Jun 15 18:41:44 2017 +1200 API Refactor $flush into HTPPApplication API Enforce health check in Controller::pushCurrent() API Better global backup / restore Updated Director::test() to use new API commit b220534f06732db4fa940d8724c2a85c0ba2495a Author: Damian Mooyman <damian@silverstripe.com> Date: Tue Jun 13 22:05:57 2017 +1200 Move app nesting to a test state helper commit 603704165c08d0c1c81fd5e6bb9506326eeee17b Author: Damian Mooyman <damian@silverstripe.com> Date: Tue Jun 13 21:46:04 2017 +1200 Restore kernel stack to fix multi-level nesting commit 2f6336a15bf79dc8c2edd44cec1931da2dd51c28 Author: Damian Mooyman <damian@silverstripe.com> Date: Tue Jun 13 17:23:21 2017 +1200 API Implement kernel nesting commit fc7188da7d6ad6785354bab61f08700454c81d91 Author: Damian Mooyman <damian@silverstripe.com> Date: Tue Jun 13 15:43:13 2017 +1200 Fix core tests commit a0ae7235148fffd71f2f02d1fe7fe45bf3aa39eb Author: Damian Mooyman <damian@silverstripe.com> Date: Tue Jun 13 15:23:52 2017 +1200 Fix manifest tests commit ca033952513633e182040d3d13e1caa9000ca184 Author: Damian Mooyman <damian@silverstripe.com> Date: Tue Jun 13 15:00:00 2017 +1200 API Move extension management into test state commit c66d4339777663a8a04661fea32a0cf35b95d20f Author: Damian Mooyman <damian@silverstripe.com> Date: Tue Jun 13 14:10:59 2017 +1200 API Refactor SapphireTest state management into SapphireTestState API Remove Injector::unregisterAllObjects() API Remove FakeController commit f26ae75c6ecaafa0dec1093264e0187191e6764d Author: Damian Mooyman <damian@silverstripe.com> Date: Mon Jun 12 18:04:34 2017 +1200 Implement basic CLI application object commit 001d5596621404892de0a5413392379eff990641 Author: Damian Mooyman <damian@silverstripe.com> Date: Mon Jun 12 17:39:38 2017 +1200 Remove references to SapphireTest::is_running_test() Upgrade various code commit de079c041dacd96bc4f4b66421fa2b2cc4c320f8 Author: Damian Mooyman <damian@silverstripe.com> Date: Wed Jun 7 18:07:33 2017 +1200 API Implement APP object API Refactor of Session
197 lines
6.6 KiB
PHP
197 lines
6.6 KiB
PHP
<?php
|
|
|
|
namespace SilverStripe\ORM;
|
|
|
|
use BadMethodCallException;
|
|
use InvalidArgumentException;
|
|
use SilverStripe\Core\Injector\Injector;
|
|
|
|
/**
|
|
* ManyManyList backed by a dataobject join table
|
|
*/
|
|
class ManyManyThroughList extends RelationList
|
|
{
|
|
/**
|
|
* @var ManyManyThroughQueryManipulator
|
|
*/
|
|
protected $manipulator;
|
|
|
|
/**
|
|
* Create a new ManyManyRelationList object. This relation will utilise an intermediary dataobject
|
|
* as a join table, unlike ManyManyList which scaffolds a table automatically.
|
|
*
|
|
* @param string $dataClass The class of the DataObjects that this will list.
|
|
* @param string $joinClass Class name of the joined dataobject record
|
|
* @param string $localKey The key in the join table that maps to the dataClass' PK.
|
|
* @param string $foreignKey The key in the join table that maps to joined class' PK.
|
|
*
|
|
* @example new ManyManyThroughList('Banner', 'PageBanner', 'BannerID', 'PageID');
|
|
*/
|
|
public function __construct($dataClass, $joinClass, $localKey, $foreignKey)
|
|
{
|
|
parent::__construct($dataClass);
|
|
|
|
// Inject manipulator
|
|
$this->manipulator = ManyManyThroughQueryManipulator::create($joinClass, $localKey, $foreignKey);
|
|
$this->dataQuery->pushQueryManipulator($this->manipulator);
|
|
}
|
|
|
|
/**
|
|
* Don't apply foreign ID filter until getFinalisedQuery()
|
|
*
|
|
* @param array|integer $id (optional) An ID or an array of IDs - if not provided, will use the current ids as
|
|
* per getForeignID
|
|
* @return array Condition In array(SQL => parameters format)
|
|
*/
|
|
protected function foreignIDFilter($id = null)
|
|
{
|
|
// foreignIDFilter is applied to the HasManyList via ManyManyThroughQueryManipulator, not here
|
|
return [];
|
|
}
|
|
|
|
public function createDataObject($row)
|
|
{
|
|
// Add joined record
|
|
$joinRow = [];
|
|
$joinAlias = $this->manipulator->getJoinAlias();
|
|
$prefix = $joinAlias . '_';
|
|
foreach ($row as $key => $value) {
|
|
if (strpos($key, $prefix) === 0) {
|
|
$joinKey = substr($key, strlen($prefix));
|
|
$joinRow[$joinKey] = $value;
|
|
unset($row[$key]);
|
|
}
|
|
}
|
|
|
|
// Create parent record
|
|
$record = parent::createDataObject($row);
|
|
|
|
// Create joined record
|
|
if ($joinRow) {
|
|
$joinClass = $this->manipulator->getJoinClass();
|
|
$joinQueryParams = $this->manipulator->extractInheritableQueryParameters($this->dataQuery);
|
|
$joinRecord = Injector::inst()->create($joinClass, $joinRow, false, $joinQueryParams);
|
|
$record->setJoin($joinRecord, $joinAlias);
|
|
}
|
|
|
|
return $record;
|
|
}
|
|
|
|
/**
|
|
* Remove the given item from this list.
|
|
*
|
|
* Note that for a ManyManyList, the item is never actually deleted, only
|
|
* the join table is affected.
|
|
*
|
|
* @param DataObject $item
|
|
*/
|
|
public function remove($item)
|
|
{
|
|
if (!($item instanceof $this->dataClass)) {
|
|
throw new InvalidArgumentException(
|
|
"ManyManyThroughList::remove() expecting a {$this->dataClass} object"
|
|
);
|
|
}
|
|
|
|
$this->removeByID($item->ID);
|
|
}
|
|
|
|
/**
|
|
* Remove the given item from this list.
|
|
*
|
|
* Note that for a ManyManyList, the item is never actually deleted, only
|
|
* the join table is affected
|
|
*
|
|
* @param int $itemID The item ID
|
|
*/
|
|
public function removeByID($itemID)
|
|
{
|
|
if (!is_numeric($itemID)) {
|
|
throw new InvalidArgumentException("ManyManyThroughList::removeById() expecting an ID");
|
|
}
|
|
|
|
// Find has_many row with a local key matching the given id
|
|
$hasManyList = $this->manipulator->getParentRelationship($this->dataQuery());
|
|
$records = $hasManyList->filter($this->manipulator->getLocalKey(), $itemID);
|
|
|
|
// Rather than simple un-associating the record (as in has_many list)
|
|
// Delete the actual mapping row as many_many deletions behave.
|
|
/** @var DataObject $record */
|
|
foreach ($records as $record) {
|
|
$record->delete();
|
|
}
|
|
}
|
|
|
|
public function removeAll()
|
|
{
|
|
// Empty has_many table matching the current foreign key
|
|
$hasManyList = $this->manipulator->getParentRelationship($this->dataQuery());
|
|
$hasManyList->removeAll();
|
|
}
|
|
|
|
/**
|
|
* @param mixed $item
|
|
* @param array $extraFields
|
|
*/
|
|
public function add($item, $extraFields = [])
|
|
{
|
|
// Ensure nulls or empty strings are correctly treated as empty arrays
|
|
if (empty($extraFields)) {
|
|
$extraFields = array();
|
|
}
|
|
|
|
// Determine ID of new record
|
|
$itemID = null;
|
|
if (is_numeric($item)) {
|
|
$itemID = $item;
|
|
} elseif ($item instanceof $this->dataClass) {
|
|
$itemID = $item->ID;
|
|
} else {
|
|
throw new InvalidArgumentException(
|
|
"ManyManyThroughList::add() expecting a $this->dataClass object, or ID value"
|
|
);
|
|
}
|
|
if (empty($itemID)) {
|
|
throw new InvalidArgumentException("ManyManyThroughList::add() doesn't accept unsaved records");
|
|
}
|
|
|
|
// Validate foreignID
|
|
$foreignIDs = $this->getForeignID();
|
|
if (empty($foreignIDs)) {
|
|
throw new BadMethodCallException("ManyManyList::add() can't be called until a foreign ID is set");
|
|
}
|
|
|
|
// Apply this item to each given foreign ID record
|
|
if (!is_array($foreignIDs)) {
|
|
$foreignIDs = [$foreignIDs];
|
|
}
|
|
$foreignIDsToAdd = array_combine($foreignIDs, $foreignIDs);
|
|
|
|
// Update existing records
|
|
$localKey = $this->manipulator->getLocalKey();
|
|
$foreignKey = $this->manipulator->getForeignKey();
|
|
$hasManyList = $this->manipulator->getParentRelationship($this->dataQuery());
|
|
$records = $hasManyList->filter($localKey, $itemID);
|
|
/** @var DataObject $record */
|
|
foreach ($records as $record) {
|
|
if ($extraFields) {
|
|
foreach ($extraFields as $field => $value) {
|
|
$record->$field = $value;
|
|
}
|
|
$record->write();
|
|
}
|
|
//
|
|
$foreignID = $record->$foreignKey;
|
|
unset($foreignIDsToAdd[$foreignID]);
|
|
}
|
|
|
|
// Once existing records are updated, add missing mapping records
|
|
foreach ($foreignIDsToAdd as $foreignID) {
|
|
$record = $hasManyList->createDataObject($extraFields ?: []);
|
|
$record->$foreignKey = $foreignID;
|
|
$record->$localKey = $itemID;
|
|
$record->write();
|
|
}
|
|
}
|
|
}
|