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 CS v3.47.0 #2140

Merged
merged 1 commit into from
Jan 16, 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
8 changes: 4 additions & 4 deletions src/Form/Control/ScopeBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,7 @@ public function queryToScope(array $query): Scope\AbstractScope
/**
* Converts an VueQueryBuilder rule array to Condition or Scope.
*/
public function queryToCondition(array $query): Scope\Condition
public function queryToCondition(array $query): Condition
{
$key = $query['rule'];
$operator = $query['operator'];
Expand Down Expand Up @@ -566,7 +566,7 @@ public function queryToCondition(array $query): Scope\Condition

$operator = $operator ? ($operatorsMap[strtolower($operator)] ?? '=') : null;

return new Scope\Condition($key, $operator, $value);
return new Condition($key, $operator, $value);
}

/**
Expand All @@ -575,7 +575,7 @@ public function queryToCondition(array $query): Scope\Condition
public function scopeToQuery(Scope\AbstractScope $scope, array $inputsMap = []): array
{
$query = [];
if ($scope instanceof Scope\Condition) {
if ($scope instanceof Condition) {
$query = [
'type' => 'query-builder-rule',
'query' => $this->conditionToQuery($scope, $inputsMap),
Expand Down Expand Up @@ -603,7 +603,7 @@ public function scopeToQuery(Scope\AbstractScope $scope, array $inputsMap = []):
/**
* Converts a Condition to VueQueryBuilder query array.
*/
public function conditionToQuery(Scope\Condition $condition, array $inputsMap = []): array
public function conditionToQuery(Condition $condition, array $inputsMap = []): array
{
if (is_string($condition->key)) {
$rule = $condition->key;
Expand Down
4 changes: 2 additions & 2 deletions src/Grid.php
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ public function addActionButton($button, $action = null, string $confirmMsg = ''
*
* @return View
*/
public function addExecutorButton(UserAction\ExecutorInterface $executor, Button $button = null)
public function addExecutorButton(ExecutorInterface $executor, Button $button = null)
{
if ($button !== null) {
$this->add($button);
Expand Down Expand Up @@ -536,7 +536,7 @@ private function explodeSelectionValue(string $value): array
public function addBulkAction($item, \Closure $callback, $args = [])
{
$menuItem = $this->menu->addItem($item);
$menuItem->on('click', function (Js\Jquery $j, string $value) use ($callback) {
$menuItem->on('click', function (Jquery $j, string $value) use ($callback) {
return $callback($j, $this->explodeSelectionValue($value));
}, [$this->selection->jsChecked()]);

Expand Down
2 changes: 1 addition & 1 deletion src/Table/Column/FilterPopup.php
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ protected function init(): void
$this->form->onSubmit(function (Form $form) {
$form->model->save();

return new jsReload($this->reload);
return new JsReload($this->reload);
});

Button::addTo($this->form, ['Clear', 'class.clear' => true])
Expand Down
5 changes: 2 additions & 3 deletions src/UserAction/ConfirmationExecutor.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
namespace Atk4\Ui\UserAction;

use Atk4\Core\HookTrait;
use Atk4\Data\Model;
use Atk4\Data\Model\UserAction;
use Atk4\Ui\Button;
use Atk4\Ui\Exception;
Expand All @@ -26,7 +25,7 @@ class ConfirmationExecutor extends Modal implements JsExecutorInterface
use CommonExecutorTrait;
use HookTrait;

/** @var Model\UserAction|null Action to execute */
/** @var UserAction|null Action to execute */
public $action;

/** @var Loader|null Loader to add content to modal. */
Expand Down Expand Up @@ -107,7 +106,7 @@ public function getAction(): UserAction
}

#[\Override]
public function setAction(Model\UserAction $action)
public function setAction(UserAction $action)
{
$this->action = $action;
$this->afterActionInit();
Expand Down