Skip to content

Commit 1a6eed9

Browse files
authored
Merge pull request #4940 from z-song/analysis-or5eZ5
Apply fixes from StyleCI
2 parents aad9d30 + fa46fdf commit 1a6eed9

File tree

9 files changed

+21
-20
lines changed

9 files changed

+21
-20
lines changed

resources/lang/tr/admin.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,10 @@
9898
'filter_clear' => 'Tümünü göster',
9999
'filter_placeholder' => 'Filtrele',
100100
],
101-
'menu_titles' => [],
101+
'menu_titles' => [],
102102
'table_items_selected' => '{n} öğe seçildi',
103-
'menu_titles' => [],
104-
'prev' => 'Önceki',
105-
'next' => 'Sonraki',
106-
'quick_create' => 'Hemen oluştur',
103+
'menu_titles' => [],
104+
'prev' => 'Önceki',
105+
'next' => 'Sonraki',
106+
'quick_create' => 'Hemen oluştur',
107107
];

resources/lang/zh-CN/admin.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@
9999
'filter_placeholder' => '过滤',
100100
],
101101
'table_items_selected' => '已选择 {n} 项',
102-
'menu_titles' => [],
103-
'prev' => '上一步',
104-
'next' => '下一步',
105-
'quick_create' => '快速创建',
102+
'menu_titles' => [],
103+
'prev' => '上一步',
104+
'next' => '下一步',
105+
'quick_create' => '快速创建',
106106
];

src/Form/Field/Date.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public function disable($disabledDates = null)
9898
}
9999

100100
/**
101-
* {@inheritDoc}
101+
* {@inheritdoc}
102102
*/
103103
public function prepare($value)
104104
{
@@ -110,7 +110,7 @@ public function prepare($value)
110110
}
111111

112112
/**
113-
* {@inheritDoc}
113+
* {@inheritdoc}
114114
*/
115115
public function render()
116116
{

src/Http/Controllers/AdminController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public function create(Content $content)
106106
}
107107

108108
/**
109-
* @param Form $form
109+
* @param Form $form
110110
* @param Content $content
111111
*
112112
* @return mixed
@@ -125,7 +125,7 @@ public function renderModalForm($form, $content)
125125
$crawler->filter('form')->outerHtml(),
126126
Admin::style(),
127127
Admin::html(),
128-
Admin::script()
128+
Admin::script(),
129129
]);
130130
}
131131
}

src/Table/Actions/EditModal.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@
77
class EditModal extends Edit
88
{
99
/**
10-
* @return string
1110
* @throws \Throwable
11+
*
12+
* @return string
1213
*/
1314
public function render()
1415
{

src/Table/Displayers/DropdownActions.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ public function add(RowAction $action)
5454
protected function prependDefaultActions()
5555
{
5656
foreach ($this->defaultClass as $class) {
57-
5857
if ($this->table->modalForm && $class == Edit::class) {
5958
$class = EditModal::class;
6059
}

src/Table/Displayers/Expand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public function display($callback = null, $isExpand = false)
2727
return Admin::view('admin::components.column-expand', [
2828
'key' => $this->getKey(),
2929
'url' => $this->getLoadUrl(),
30-
'name' => str_replace('.', '-', $this->getName()) . '-' . $this->getKey(),
30+
'name' => str_replace('.', '-', $this->getName()).'-'.$this->getKey(),
3131
'html' => $html,
3232
'value' => $this->value,
3333
'async' => $async,

src/Table/Tools/CreateButton.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public function render()
3434
}
3535

3636
return Admin::view('admin::table.create-btn', [
37-
'url' => $this->table->getCreateUrl(),
37+
'url' => $this->table->getCreateUrl(),
3838
'modal' => $this->table->modalForm,
3939
]);
4040
}

src/helpers.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -403,13 +403,14 @@ function admin_login_page_backgroud()
403403

404404
/**
405405
* @param string $view
406-
* @param array $data
407-
* @return string
406+
* @param array $data
407+
*
408408
* @throws Throwable
409+
*
410+
* @return string
409411
*/
410412
function admin_view($view, $data = [])
411413
{
412414
return Admin::view($view, $data);
413415
}
414-
415416
}

0 commit comments

Comments
 (0)