jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/392610 )
Change subject: BSFoundation: Used ReaderParams for PrimarayDataProvider
......................................................................
BSFoundation: Used ReaderParams for PrimarayDataProvider
* this makes sorting limit etc. also avaiable for pre-filtering
Change-Id: Ib1fd5d45f11338408774329987b590b8fba83ad5
---
M src/Data/IPrimaryDataProvider.php
M src/Data/Reader.php
M src/Data/Settings/PrimaryDataProvider.php
M src/Data/Watchlist/PrimaryDataProvider.php
4 files changed, 11 insertions(+), 16 deletions(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/Data/IPrimaryDataProvider.php
b/src/Data/IPrimaryDataProvider.php
index 5871aab..4f390f7 100644
--- a/src/Data/IPrimaryDataProvider.php
+++ b/src/Data/IPrimaryDataProvider.php
@@ -6,12 +6,9 @@
/**
*
- * @param string $query Special simple filter that aims at one specific
- * field that the DataProvider needs to define.
- * @param Filter[] $preFilters Complete set of filters that will also be
- * applied later during the process by the "Filterer" step. Having it
here
- * allows us to prefilter and tweak performance
- * @return \BlueSpice\Data\Record[]
+ * @param ReaderParams $params Having it here allows us to prefilter and
+ * tweak performance
+ * @return Record[]
*/
- public function makeData( $query = '', $preFilters = [] );
+ public function makeData( $params );
}
\ No newline at end of file
diff --git a/src/Data/Reader.php b/src/Data/Reader.php
index 5e1d519..98a2d90 100644
--- a/src/Data/Reader.php
+++ b/src/Data/Reader.php
@@ -58,7 +58,7 @@
*/
public function read( $params ) {
$primaryDataProvider = $this->makePrimaryDataProvider( $params
);
- $dataSets = $primaryDataProvider->makeData(
$params->getQuery(), $params->getFilter() );
+ $dataSets = $primaryDataProvider->makeData( $params );
$filterer = $this->makeFilterer( $params );
$dataSets = $filterer->filter( $dataSets );
@@ -78,7 +78,7 @@
$dataSets = $secondaryDataProvider->extend( $dataSets );
}
- $resultSet = new ResultSet( $dataSets, $total );
+ $resultSet = new ResultSet( $dataSets, $total );
return $resultSet;
}
diff --git a/src/Data/Settings/PrimaryDataProvider.php
b/src/Data/Settings/PrimaryDataProvider.php
index df98328..c3cf5b8 100644
--- a/src/Data/Settings/PrimaryDataProvider.php
+++ b/src/Data/Settings/PrimaryDataProvider.php
@@ -28,10 +28,9 @@
/**
*
- * @param string $query
- * @param type $preFilters
+ * @param \BlueSpice\Data\ReaderParams $params
*/
- public function makeData( $query = '', $preFilters = [] ) {
+ public function makeData( $params ) {
$this->data = [];
//workaround for the upgrade process. The new settings cannot be
//accessed before they are migrated
diff --git a/src/Data/Watchlist/PrimaryDataProvider.php
b/src/Data/Watchlist/PrimaryDataProvider.php
index 1de86d5..aa1f8b6 100644
--- a/src/Data/Watchlist/PrimaryDataProvider.php
+++ b/src/Data/Watchlist/PrimaryDataProvider.php
@@ -42,14 +42,13 @@
/**
*
- * @param string $query
- * @param type $preFilters
+ * @param \BlueSpice\Data\ReaderParams $params
*/
- public function makeData( $query = '', $preFilters = [] ) {
+ public function makeData( $params ) {
$res = $this->db->select(
'watchlist',
'*',
- $this->makePreFilterConds( $preFilters )
+ $this->makePreFilterConds( $params->getFilter() )
);
$distinctUserIds = [];
--
To view, visit https://gerrit.wikimedia.org/r/392610
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib1fd5d45f11338408774329987b590b8fba83ad5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Pwirth <[email protected]>
Gerrit-Reviewer: Ljonka <[email protected]>
Gerrit-Reviewer: Mglaser <[email protected]>
Gerrit-Reviewer: Robert Vogel <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
