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

FIX: Remove deprecated & non-functional default argument config

Browse Source 
This throws deprecation errors on PHP 8.

Fixes #9666
This commit is contained in:
Sam Minnee 2020-08-30 11:51:27 +12:00 committed by Garion Herman
parent 08010d5933
commit e0f3797489
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ORM/DataQueryManipulator.php
View File

@ -16,7 +16,7 @@ interface DataQueryManipulator
* @param array $queriedColumns * @param array $queriedColumns
* @param SQLSelect $sqlSelect * @param SQLSelect $sqlSelect
*/ */
public function beforeGetFinalisedQuery(DataQuery $dataQuery, $queriedColumns = [], SQLSelect $sqlSelect); public function beforeGetFinalisedQuery(DataQuery $dataQuery, $queriedColumns, SQLSelect $sqlSelect);
/** /**
* Invoked after getFinalisedQuery() * Invoked after getFinalisedQuery()
@ -25,5 +25,5 @@ interface DataQueryManipulator
* @param array $queriedColumns * @param array $queriedColumns
* @param SQLSelect $sqlQuery * @param SQLSelect $sqlQuery
*/ */
public function afterGetFinalisedQuery(DataQuery $dataQuery, $queriedColumns = [], SQLSelect $sqlQuery); public function afterGetFinalisedQuery(DataQuery $dataQuery, $queriedColumns, SQLSelect $sqlQuery);
} }

4
src/ORM/ManyManyThroughQueryManipulator.php
View File

@ -231,7 +231,7 @@ class ManyManyThroughQueryManipulator implements DataQueryManipulator
* @param array $queriedColumns * @param array $queriedColumns
* @param SQLSelect $sqlSelect * @param SQLSelect $sqlSelect
*/ */
public function beforeGetFinalisedQuery(DataQuery $dataQuery, $queriedColumns = [], SQLSelect $sqlSelect) public function beforeGetFinalisedQuery(DataQuery $dataQuery, $queriedColumns, SQLSelect $sqlSelect)
{ {
// Get metadata and SQL from join table // Get metadata and SQL from join table
$hasManyRelation = $this->getParentRelationship($dataQuery); $hasManyRelation = $this->getParentRelationship($dataQuery);
@ -281,7 +281,7 @@ class ManyManyThroughQueryManipulator implements DataQueryManipulator
* @param array $queriedColumns * @param array $queriedColumns
* @param SQLSelect $sqlQuery * @param SQLSelect $sqlQuery
*/ */
public function afterGetFinalisedQuery(DataQuery $dataQuery, $queriedColumns = [], SQLSelect $sqlQuery) public function afterGetFinalisedQuery(DataQuery $dataQuery, $queriedColumns, SQLSelect $sqlQuery)
{ {
// Inject final replacement after manipulation has been performed on the base dataquery // Inject final replacement after manipulation has been performed on the base dataquery
$joinTableSQL = $dataQuery->getQueryParam('Foreign.JoinTableSQL'); $joinTableSQL = $dataQuery->getQueryParam('Foreign.JoinTableSQL');