Skip to content

Fix CI #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gesinn-it-gea merged 1 commit into from
Mar 4, 2025
Merged

Fix CI #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build
Open in desktop
Submodule build updated 8 files
+15 −0 .gitignore
+0 −7 .vscode/settings.json
+45 −4 Dockerfile
+73 −30 Makefile
+162 −0 README.adoc
+0 −2 README.md
+6 −0 docker-compose.override.yml.SAMPLE
+16 −10 docker-compose.yml
2 changes: 2 additions & 0 deletions codecov.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
fixes:
- "/var/www/html/extensions/SemanticCompoundQueries/::"
5 changes: 3 additions & 2 deletions src/CompoundQueryProcessor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace SCQ;

use SMW\Query\QueryResult;
use SMWQueryProcessor as QueryProcessor;
use SMWQuery as Query;
use Parser;
Expand Down Expand Up @@ -168,7 +169,7 @@ protected static function getSubParams( $param ) {
* @param $context
* @param $showmode
*
* @return SMWQueryResult
* @return QueryResult
*/
protected static function getQueryResultFromFunctionParams( $rawParams, $context = QueryProcessor::INLINE_QUERY, $showMode = false ) {
list( $querystring, $params, $printouts ) = self::getComponentsFromFunctionParams( $rawParams, $showMode );
Expand Down Expand Up @@ -226,7 +227,7 @@ protected static function mergeSMWPrintRequests( $printRequests1, $printRequests
* @param $outputMode
* @param $context
*
* @return SMWQueryResult
* @return QueryResult
*/
protected static function getQueryResultFromQueryString( $querystring, array $params, $extraPrintouts, $context = QueryProcessor::INLINE_QUERY ) {

Expand Down
4 changes: 2 additions & 2 deletions src/CompoundQueryResult.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

namespace SCQ;

use SMWQueryResult as QueryResult;
use SMWResultArray as ResultArray;
use SMW\Query\QueryResult;
use SMW\Query\Result\ResultArray;

/**
* Subclass of SMWQueryResult - this class was mostly created in order to
Expand Down