Skip to content

Commit

Permalink
Merge pull request #13929 from TheCartpenter/patch-100
Browse files Browse the repository at this point in the history 
More PHPDocs work
  • Loading branch information
@danielkerr
danielkerr committed May 12, 2024
2 parents e1471cd + c9dc159 commit 43c1016
Show file tree
Hide file tree
Showing 392 changed files with 4,871 additions and 2,438 deletions.
77 changes: 42 additions & 35 deletions composer.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions upload/admin/controller/catalog/product.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -690,7 +690,7 @@ public function form(): void {
if ($category_info) {
$data['product_categories'][] = [
'category_id' => $category_info['category_id'],
'name' => ($category_info['path']) ? $category_info['path'] . ' > ' . $category_info['name'] : $category_info['name']
'name' => ($category_info['path'] ? $category_info['path'] . ' > ' . $category_info['name'] : $category_info['name'])
];
}
}
Expand Down Expand Up @@ -944,8 +944,8 @@ public function form(): void {
'quantity' => $product_discount['quantity'],
'priority' => $product_discount['priority'],
'price' => $product_discount['price'],
'date_start' => ($product_discount['date_start'] != '0000-00-00') ? $product_discount['date_start'] : '',
'date_end' => ($product_discount['date_end'] != '0000-00-00') ? $product_discount['date_end'] : ''
'date_start' => ($product_discount['date_start'] != '0000-00-00' ? $product_discount['date_start'] : ''),
'date_end' => ($product_discount['date_end'] != '0000-00-00' ? $product_discount['date_end'] : '')
];
}

Expand All @@ -963,8 +963,8 @@ public function form(): void {
'customer_group_id' => $product_special['customer_group_id'],
'priority' => $product_special['priority'],
'price' => $product_special['price'],
'date_start' => ($product_special['date_start'] != '0000-00-00') ? $product_special['date_start'] : '',
'date_end' => ($product_special['date_end'] != '0000-00-00') ? $product_special['date_end'] : ''
'date_start' => ($product_special['date_start'] != '0000-00-00' ? $product_special['date_start'] : ''),
'date_end' => ($product_special['date_end'] != '0000-00-00' ? $product_special['date_end'] : '')
];
}

Expand Down
2 changes: 1 addition & 1 deletion upload/admin/view/template/marketplace/marketplace_info.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
{% endfor %}
</div>
<ul class="nav nav-tabs">
<li class="nav-item"><a href="#tab-description" class="nav-link active" data-bs-toggle="tab">{{ tab_general }}</a></li>
<li class="nav-item"><a href="#tab-description" class="nav-link active" data-bs-toggle="tab">{{ tab_description }}</a></li>
<li class="nav-item"><a href="#tab-documentation" class="nav-link" data-bs-toggle="tab">{{ tab_documentation }}</a></li>
<li class="nav-item"><a href="#tab-download" class="nav-link" data-bs-toggle="tab">{{ tab_download }}</a></li>
<li class="nav-item"><a href="#tab-comment" class="nav-link" data-bs-toggle="tab">{{ tab_comment }} ({{ comment_total }})</a></li>
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/view/template/user/api_form.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ $('#session button').on('click', function(e) {
var element = this;
$.ajax({
url: 'index.php?route=user/api.deletesession&user_token={{ user_token }}&api_session_id=' + $(element).val(),
url: 'index.php?route=user/api.deleteSession&user_token={{ user_token }}&api_session_id=' + $(element).val(),
type: 'post',
dataType: 'json',
beforeSend: function() {
Expand Down
4 changes: 2 additions & 2 deletions upload/catalog/controller/api/order.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -666,7 +666,7 @@ public function save(): void {
if (isset($this->request->post['order_status_id'])) {
$order_status_id = (int)$this->request->post['order_status_id'];
} else {
$order_status_id = $this->config->get('config_order_status_id');
$order_status_id = (int)$this->config->get('config_order_status_id');
}

$this->model_checkout_order->addHistory($json['order_id'], $order_status_id);
Expand Down Expand Up @@ -1205,7 +1205,7 @@ public function confirm(): void {
if (isset($this->request->post['order_status_id'])) {
$order_status_id = (int)$this->request->post['order_status_id'];
} else {
$order_status_id = $this->config->get('config_order_status_id');
$order_status_id = (int)$this->config->get('config_order_status_id');
}

$this->model_checkout_order->addHistory($json['order_id'], $order_status_id);
Expand Down
2 changes: 1 addition & 1 deletion upload/system/engine/action.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public function __construct(string $route) {
}

/**
* getId
* Get Id
*
* @return string
*/
Expand Down
2 changes: 1 addition & 1 deletion upload/system/engine/config.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class Config {
private array $data = [];

/**
* addPath
* Add Path
*
* @param string $namespace
* @param string $directory
Expand Down
2 changes: 1 addition & 1 deletion upload/system/library/language.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public function __construct(string $code) {
}

/**
* addPath
* Add Path
*
* @param string $namespace
* @param string $directory
Expand Down
16 changes: 8 additions & 8 deletions upload/system/library/mail.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public function __construct(string $adaptor = 'mail', array $option = []) {
}

/**
* setTo
* Set To
*
* @param array<string>|string $to
*
Expand All @@ -49,7 +49,7 @@ public function setTo($to): void {
}

/**
* setFrom
* Set From
*
* @param string $from
*
Expand All @@ -60,7 +60,7 @@ public function setFrom(string $from): void {
}

/**
* setSender
* Set Sender
*
* @param string $sender
*
Expand All @@ -71,7 +71,7 @@ public function setSender(string $sender): void {
}

/**
* setReplyTo
* Set Reply To
*
* @param string $reply_to
*
Expand All @@ -82,7 +82,7 @@ public function setReplyTo(string $reply_to): void {
}

/**
* setSubject
* Set Subject
*
* @param string $subject
*
Expand All @@ -93,7 +93,7 @@ public function setSubject(string $subject): void {
}

/**
* setText
* Set Text
*
* @param string $text
*
Expand All @@ -104,7 +104,7 @@ public function setText(string $text): void {
}

/**
* setHtml
* Set Html
*
* @param string $html
*
Expand All @@ -115,7 +115,7 @@ public function setHtml(string $html): void {
}

/**
* addAttachment
* Add Attachment
*
* @param string $filename
*
Expand Down
2 changes: 1 addition & 1 deletion upload/system/library/template.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public function __construct(string $adaptor) {
}

/**
* addPath
* Add Path
*
* @param string $namespace
* @param string $directory
Expand Down

0 comments on commit 43c1016

Please sign in to comment.