Skip to content
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.

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

Fix CI #34

Merged
merged 2 commits into from
Jun 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 Editor.php
Original file line number Diff line number Diff line change
Expand Up @@ -1673,7 +1673,7 @@ private function _ssp_sort($query, $http)
// Paging makes little sense without an ordering clause, so if there is
// no order to apply (possible in DT2 on the third click of a header)
// we apply the primary key as the ordering value.
if (! isset($http['order']) || count($http['order']) === 0) {
if (!isset($http['order']) || count($http['order']) === 0) {
$query->order($this->_pkey[0] . ' asc');
}
}
Expand Down
8 changes: 4 additions & 4 deletions Editor/Join.php
Original file line number Diff line number Diff line change
Expand Up @@ -483,10 +483,10 @@ public function whereSet($_ = null)
/**
* Get data.
*
* @param Editor $editor Host Editor instance
* @param string[] $data Data from the parent table's get and were we need
* to add out output.
* @param array $options options array for fields
* @param Editor $editor Host Editor instance
* @param mixed[] $data Data from the parent table's get and were we need
* to add out output.
* @param array $options options array for fields
*
* @internal
*/
Expand Down
4 changes: 1 addition & 3 deletions Editor/Upload.php
Original file line number Diff line number Diff line change
Expand Up @@ -699,10 +699,8 @@ private function _dbExec($upload, $db)
$q->set($column, $webPath);
} elseif ($type === self::DB_SYSTEM_PATH) {
$q->set($column, $path);
} elseif (is_string($type)) {
$q->set($column, str_replace('__ID__', $id, $type));
} else {
$q->set($column, $type);
$q->set($column, str_replace('__ID__', $id, $type));
}
}

Expand Down
15 changes: 0 additions & 15 deletions phpstan-baseline.neon
Original file line number Diff line number Diff line change
Expand Up @@ -340,26 +340,11 @@ parameters:
count: 1
path: Editor/Join.php

-
message: "#^Offset 'DT_RowId' does not exist on string\\.$#"
count: 1
path: Editor/Join.php

-
message: "#^Parameter \\#1 \\$order of method DataTables\\\\Database\\\\Query\\:\\:order\\(\\) expects array\\<string\\>\\|string, DataTables\\\\Editor\\\\Join given\\.$#"
count: 1
path: Editor/Join.php

-
message: "#^Parameter \\#2 \\$data of method DataTables\\\\Ext\\:\\:_propExists\\(\\) expects array, string given\\.$#"
count: 2
path: Editor/Join.php

-
message: "#^Parameter \\#2 \\$data of method DataTables\\\\Ext\\:\\:_readProp\\(\\) expects array, string given\\.$#"
count: 1
path: Editor/Join.php

-
message: "#^Parameter \\#2 \\$val of method DataTables\\\\Database\\\\Query\\:\\:set\\(\\) expects string\\|null, int given\\.$#"
count: 2
Expand Down
1 change: 0 additions & 1 deletion phpstan.neon.dist
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,3 @@ parameters:
- '~has no return type specified~'
- '~return type has no value type specified~'
- '~no value type specified in iterable type array~'
- 'Call to function is_string() with non-falsy-string will always evaluate to true.'
Loading