Skip to content

Commit

Permalink
Fix issues
Browse files Browse the repository at this point in the history
  • Loading branch information
Hlavtox committed Nov 22, 2023
1 parent 636118a commit 896f56b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion controllers/admin/AdminCartsController.php
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ public function renderList()
*
* @throws PrestaShopException
*/
protected function getOrderByClause(string|null $orderBy, string|null $orderDirection)
protected function getOrderByClause($orderBy, $orderDirection)
{
$this->_orderBy = $this->checkOrderBy($orderBy);
$this->_orderWay = $this->checkOrderDirection($orderDirection);
Expand Down
8 changes: 4 additions & 4 deletions controllers/admin/AdminImportController.php
Original file line number Diff line number Diff line change
Expand Up @@ -793,7 +793,7 @@ public function initToolbar()
}
}

protected function generateContentTable(int $current_table, int $nb_column, resource $handle, string $separator)
protected function generateContentTable(int $current_table, int $nb_column, $handle, string $separator)
{
$html = '<table id="table' . $current_table . '" style="display: none;" class="table table-bordered"><thead><tr>';
// Header
Expand Down Expand Up @@ -3745,7 +3745,7 @@ public function utf8EncodeArray($array)
return is_array($array) ? array_map('utf8_encode', $array) : utf8_encode($array);
}

protected function getNbrColumn(resource $handle, string $separator)
protected function getNbrColumn($handle, string $separator)
{
if (!is_resource($handle)) {
return false;
Expand All @@ -3765,7 +3765,7 @@ protected static function usortFiles($a, $b)
return ($b < $a) ? 1 : -1;
}

protected function openCsvFile(bool $offset = false)
protected function openCsvFile(bool|int $offset = false)
{
$file = $this->excelToCsvFile(Tools::getValue('csv'));
$handle = false;
Expand Down Expand Up @@ -3798,7 +3798,7 @@ protected function openCsvFile(bool $offset = false)
return $handle;
}

protected function closeCsvFile(resource $handle)
protected function closeCsvFile($handle)
{
fclose($handle);
}
Expand Down
2 changes: 1 addition & 1 deletion controllers/admin/AdminStoresController.php
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ public function postProcess()
}
}

protected function postImage(int $id)
protected function postImage($id)
{
$ret = parent::postImage($id);

Expand Down

0 comments on commit 896f56b

Please sign in to comment.