Jingga/oms-News
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-News.git synced 2026-02-07 04:28:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

php cs autofix

Browse Source
This commit is contained in:
Dennis Eichhorn 2020-08-31 22:30:36 +02:00
parent 5d835cc9d4
commit 7992aea19e
8 changed files with 95 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/main.yml vendored
View File

@ -26,7 +26,7 @@ jobs:
- name: Setup Composer
run: composer install
- name: Autoformat
run: 'vendor/bin/php-cs-fixer fix ./ --rules=''{"array_syntax": {"syntax": "short"}, "blank_line_after_namespace": true, "cast_spaces": {"space": "single"}, "class_attributes_separation": { "elements": ["const", "method", "property"] }, "combine_consecutive_issets": true, "compact_nullable_typehint": true, "declare_strict_types": true, "elseif": true, "encoding": true, "explicit_indirect_variable": true, "explicit_string_variable": true, "function_to_constant": true, "implode_call": true, "increment_style": {"style": "pre"}, "is_null": {"use_yoda_style": false}, "line_ending": true, "logical_operators": true, "lowercase_cast": true, "lowercase_constants": true, "lowercase_keywords": true, "modernize_types_casting": true, "native_constant_invocation": true, "native_function_casing": true, "native_function_invocation": true, "new_with_braces": true, "no_alias_functions": true, "no_closing_tag": true, "no_empty_comment": true, "no_empty_phpdoc": true, "no_empty_statement": true, "no_homoglyph_names": true, "no_mixed_echo_print": {"use": "echo"}, "no_php4_constructor": true, "no_singleline_whitespace_before_semicolons": true, "no_spaces_inside_parenthesis": true, "no_trailing_whitespace": true, "no_unneeded_final_method": true, "no_unused_imports": true, "no_useless_return": true, "no_whitespace_before_comma_in_array": true, "no_whitespace_in_blank_line": true, "non_printable_character": true, "normalize_index_brace": true, "ordered_imports": {"sort_algorithm": "alpha"}, "ordered_interfaces": {"order": "alpha"}, "php_unit_construct": true, "php_unit_internal_class": true, "php_unit_ordered_covers": true, "php_unit_set_up_tear_down_visibility": true, "phpdoc_indent": true, "phpdoc_align": {"align": "vertical"}, "phpdoc_annotation_without_dot": true, "phpdoc_scalar": true, "phpdoc_return_self_reference": {"this": "self"}, "phpdoc_trim": true, "phpdoc_trim_consecutive_blank_line_separation": true, "random_api_migration": true, "self_accessor": true, "return_type_declaration": {"space_before": "one"}, "semicolon_after_instruction": true, "set_type_to_cast": true, "short_scalar_cast": true, "single_blank_line_at_eof": true, "single_line_after_imports": true, "standardize_increment": true, "trailing_comma_in_multiline_array": true, "trim_array_spaces": true, "visibility_required": true, "void_return": true}'' --allow-risky=yes'
run: 'vendor/bin/php-cs-fixer fix ./ --rules=''{"array_syntax": {"syntax": "short"}, "blank_line_after_namespace": true, "binary_operator_spaces": {"operators": {"=": "align", ".=": "align", "+=": "align", "-=": "align", "*=": "align", "/=": "align", "|=": "align", "&=": "align", "=>": "align", "??=": "align"}}, "cast_spaces": {"space": "single"}, "class_attributes_separation": { "elements": ["const", "method", "property"] }, "combine_consecutive_issets": true, "compact_nullable_typehint": true, "declare_strict_types": true, "elseif": true, "encoding": true, "explicit_indirect_variable": true, "explicit_string_variable": true, "function_to_constant": true, "implode_call": true, "increment_style": {"style": "pre"}, "is_null": {"use_yoda_style": false}, "line_ending": true, "logical_operators": true, "lowercase_cast": true, "lowercase_constants": true, "lowercase_keywords": true, "modernize_types_casting": true, "native_constant_invocation": true, "native_function_casing": true, "native_function_invocation": true, "new_with_braces": true, "no_alias_functions": true, "no_closing_tag": true, "no_empty_comment": true, "no_empty_phpdoc": true, "no_empty_statement": true, "no_homoglyph_names": true, "no_mixed_echo_print": {"use": "echo"}, "no_php4_constructor": true, "no_singleline_whitespace_before_semicolons": true, "no_spaces_inside_parenthesis": true, "no_trailing_whitespace": true, "no_unneeded_final_method": true, "no_unused_imports": true, "no_useless_return": true, "no_whitespace_before_comma_in_array": true, "no_whitespace_in_blank_line": true, "non_printable_character": true, "normalize_index_brace": true, "ordered_imports": {"sort_algorithm": "alpha"}, "ordered_interfaces": {"order": "alpha"}, "php_unit_construct": true, "php_unit_internal_class": true, "php_unit_ordered_covers": true, "php_unit_set_up_tear_down_visibility": true, "phpdoc_indent": true, "phpdoc_align": {"align": "vertical"}, "phpdoc_annotation_without_dot": true, "phpdoc_scalar": true, "phpdoc_return_self_reference": {"this": "self"}, "phpdoc_trim": true, "phpdoc_trim_consecutive_blank_line_separation": true, "random_api_migration": true, "self_accessor": true, "return_type_declaration": {"space_before": "one"}, "semicolon_after_instruction": true, "set_type_to_cast": true, "short_scalar_cast": true, "single_blank_line_at_eof": true, "single_line_after_imports": true, "standardize_increment": true, "trailing_comma_in_multiline_array": true, "trim_array_spaces": true, "visibility_required": true, "void_return": true}'' --allow-risky=yes'
- name: Check for modified files
id: git-check
run: echo ::set-output name=modified::$(if git diff-index --quiet HEAD --; then echo "false"; else echo "true"; fi)

32
Admin/Routes/Web/Api.php
View File

@ -8,39 +8,39 @@ use phpOMS\Router\RouteVerb;
return [
'^.*/news.*$' => [
[
'dest' => '\Modules\News\Controller\ApiController:apiNewsCreate',
'verb' => RouteVerb::PUT,
'dest' => '\Modules\News\Controller\ApiController:apiNewsCreate',
'verb' => RouteVerb::PUT,
'permission' => [
'module' => ApiController::MODULE_NAME,
'type' => PermissionType::CREATE,
'state' => PermissionState::NEWS,
'type' => PermissionType::CREATE,
'state' => PermissionState::NEWS,
],
],
[
'dest' => '\Modules\News\Controller\ApiController:apiNewsUpdate',
'verb' => RouteVerb::SET,
'dest' => '\Modules\News\Controller\ApiController:apiNewsUpdate',
'verb' => RouteVerb::SET,
'permission' => [
'module' => ApiController::MODULE_NAME,
'type' => PermissionType::MODIFY,
'state' => PermissionState::NEWS,
'type' => PermissionType::MODIFY,
'state' => PermissionState::NEWS,
],
],
[
'dest' => '\Modules\News\Controller\ApiController:apiNewsGet',
'verb' => RouteVerb::GET,
'dest' => '\Modules\News\Controller\ApiController:apiNewsGet',
'verb' => RouteVerb::GET,
'permission' => [
'module' => ApiController::MODULE_NAME,
'type' => PermissionType::READ,
'state' => PermissionState::NEWS,
'type' => PermissionType::READ,
'state' => PermissionState::NEWS,
],
],
[
'dest' => '\Modules\News\Controller\ApiController:apiNewsDelete',
'verb' => RouteVerb::DELETE,
'dest' => '\Modules\News\Controller\ApiController:apiNewsDelete',
'verb' => RouteVerb::DELETE,
'permission' => [
'module' => ApiController::MODULE_NAME,
'type' => PermissionType::DELETE,
'state' => PermissionState::NEWS,
'type' => PermissionType::DELETE,
'state' => PermissionState::NEWS,
],
],
],

64
Admin/Routes/Web/Backend.php
View File

@ -8,85 +8,85 @@ use phpOMS\Router\RouteVerb;
return [
'^.*/news/dashboard.*$' => [
[
'dest' => '\Modules\News\Controller\BackendController:viewNewsDashboard',
'verb' => RouteVerb::GET,
'dest' => '\Modules\News\Controller\BackendController:viewNewsDashboard',
'verb' => RouteVerb::GET,
'permission' => [
'module' => BackendController::MODULE_NAME,
'type' => PermissionType::READ,
'state' => PermissionState::NEWS,
'type' => PermissionType::READ,
'state' => PermissionState::NEWS,
],
],
],
'^.*/news/article.*$' => [
[
'dest' => '\Modules\News\Controller\BackendController:viewNewsArticle',
'verb' => RouteVerb::GET,
'dest' => '\Modules\News\Controller\BackendController:viewNewsArticle',
'verb' => RouteVerb::GET,
'permission' => [
'module' => BackendController::MODULE_NAME,
'type' => PermissionType::READ,
'state' => PermissionState::NEWS,
'type' => PermissionType::READ,
'state' => PermissionState::NEWS,
],
],
],
'^.*/news/archive.*$' => [
[
'dest' => '\Modules\News\Controller\BackendController:viewNewsArchive',
'verb' => RouteVerb::GET,
'dest' => '\Modules\News\Controller\BackendController:viewNewsArchive',
'verb' => RouteVerb::GET,
'permission' => [
'module' => BackendController::MODULE_NAME,
'type' => PermissionType::READ,
'state' => PermissionState::NEWS,
'type' => PermissionType::READ,
'state' => PermissionState::NEWS,
],
],
],
'^.*/news/draft/list.*$' => [
[
'dest' => '\Modules\News\Controller\BackendController:viewNewsDraftList',
'verb' => RouteVerb::GET,
'dest' => '\Modules\News\Controller\BackendController:viewNewsDraftList',
'verb' => RouteVerb::GET,
'permission' => [
'module' => BackendController::MODULE_NAME,
'type' => PermissionType::MODIFY,
'state' => PermissionState::NEWS,
'type' => PermissionType::MODIFY,
'state' => PermissionState::NEWS,
],
],
],
'^.*/news/create.*$' => [
[
'dest' => '\Modules\Editor\Controller\BackendController:setUpEditorEditor',
'verb' => RouteVerb::GET,
'dest' => '\Modules\Editor\Controller\BackendController:setUpEditorEditor',
'verb' => RouteVerb::GET,
'permission' => [
'module' => BackendController::MODULE_NAME,
'type' => PermissionType::CREATE,
'state' => PermissionState::NEWS,
'type' => PermissionType::CREATE,
'state' => PermissionState::NEWS,
],
],
[
'dest' => '\Modules\News\Controller\BackendController:viewNewsCreate',
'verb' => RouteVerb::GET,
'dest' => '\Modules\News\Controller\BackendController:viewNewsCreate',
'verb' => RouteVerb::GET,
'permission' => [
'module' => BackendController::MODULE_NAME,
'type' => PermissionType::CREATE,
'state' => PermissionState::NEWS,
'type' => PermissionType::CREATE,
'state' => PermissionState::NEWS,
],
],
],
'^.*/news/edit.*$' => [
[
'dest' => '\Modules\Editor\Controller\BackendController:setUpEditorEditor',
'verb' => RouteVerb::GET,
'dest' => '\Modules\Editor\Controller\BackendController:setUpEditorEditor',
'verb' => RouteVerb::GET,
'permission' => [
'module' => BackendController::MODULE_NAME,
'type' => PermissionType::MODIFY,
'state' => PermissionState::NEWS,
'type' => PermissionType::MODIFY,
'state' => PermissionState::NEWS,
],
],
[
'dest' => '\Modules\News\Controller\BackendController:viewNewsEdit',
'verb' => RouteVerb::GET,
'dest' => '\Modules\News\Controller\BackendController:viewNewsEdit',
'verb' => RouteVerb::GET,
'permission' => [
'module' => BackendController::MODULE_NAME,
'type' => PermissionType::MODIFY,
'state' => PermissionState::NEWS,
'type' => PermissionType::MODIFY,
'state' => PermissionState::NEWS,
],
],
],

50
Theme/Backend/Lang/de.lang.php
View File

@ -13,30 +13,30 @@
declare(strict_types=1);
return ['News' => [
'Accounts/Groups' => 'Benutyer/Gruppen',
'Additional' => 'Zusätzlich',
'Accounts/Groups' => 'Benutyer/Gruppen',
'Additional' => 'Zusätzlich',
'AllowComments' => 'Kommentare erlauben',
'Archive' => 'Archiv',
'Author' => 'Autor',
'Categories' => 'Kategorien',
'Date' => 'Datum',
'Draft' => 'Entwurf',
'Featured' => 'Featured',
'Groups' => 'Gruppen',
'Headline' => 'Headline',
'Headlines' => 'Headlines',
'Langauge' => 'Sprache',
'Link' => 'Link',
'News' => 'News',
'Plain' => 'Plain',
'Preview' => 'Vorschau',
'Publish' => 'Veröffentlichen',
'Settings' => 'Einstellung',
'Status' => 'Status',
'Title' => 'Titel',
'Type' => 'Typ',
'TYPE0' => 'Artikel',
'TYPE1' => 'Link',
'TYPE2' => 'Headline',
'Visible' => 'Sichtbar',
'Archive' => 'Archiv',
'Author' => 'Autor',
'Categories' => 'Kategorien',
'Date' => 'Datum',
'Draft' => 'Entwurf',
'Featured' => 'Featured',
'Groups' => 'Gruppen',
'Headline' => 'Headline',
'Headlines' => 'Headlines',
'Langauge' => 'Sprache',
'Link' => 'Link',
'News' => 'News',
'Plain' => 'Plain',
'Preview' => 'Vorschau',
'Publish' => 'Veröffentlichen',
'Settings' => 'Einstellung',
'Status' => 'Status',
'Title' => 'Titel',
'Type' => 'Typ',
'TYPE0' => 'Artikel',
'TYPE1' => 'Link',
'TYPE2' => 'Headline',
'Visible' => 'Sichtbar',
]];

10
Theme/Backend/dashboard-news.tpl.php
View File

@ -28,12 +28,12 @@ $newsList = $this->getData('news') ?? [];
<td><?= $this->getHtml('Type', 'News'); ?>
<td class="wf-100"><?= $this->getHtml('Title', 'News'); ?>
<tbody>
<?php $count = 0; foreach ($newsList as $key => $news) : ++$count;
$url = \phpOMS\Uri\UriFactory::build('{/prefix}news/article?{?}&id=' . $news->getId());
$color = 'darkred';
if ($news->getType() === \Modules\News\Models\NewsType::ARTICLE) { $color = 'green'; }
<?php $count = 0; foreach ($newsList as $key => $news) : ++$count;
$url = \phpOMS\Uri\UriFactory::build('{/prefix}news/article?{?}&id=' . $news->getId());
$color = 'darkred';
if ($news->getType() === \Modules\News\Models\NewsType::ARTICLE) { $color = 'green'; }
elseif ($news->getType() === \Modules\News\Models\NewsType::HEADLINE) { $color = 'purple'; }
elseif ($news->getType() === \Modules\News\Models\NewsType::LINK) { $color = 'yellow'; }
elseif ($news->getType() === \Modules\News\Models\NewsType::LINK) { $color = 'yellow'; }
?>
<tr data-href="<?= $url; ?>">
<td data-label="">

8
Theme/Backend/news-archive.tpl.php
View File

@ -36,11 +36,11 @@ echo $this->getData('nav')->render(); ?>
<td><?= $this->getHtml('Author'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
<td><?= $this->getHtml('Date'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
<tbody>
<?php $count = 0; foreach ($articles as $key => $news) : ++$count; $url = UriFactory::build('{/prefix}news/article?{?}&id=' . $news->getId());
$color = 'darkred';
if ($news->getType() === NewsType::ARTICLE) { $color = 'green'; }
<?php $count = 0; foreach ($articles as $key => $news) : ++$count; $url = UriFactory::build('{/prefix}news/article?{?}&id=' . $news->getId());
$color = 'darkred';
if ($news->getType() === NewsType::ARTICLE) { $color = 'green'; }
elseif ($news->getType() === NewsType::HEADLINE) { $color = 'purple'; }
elseif ($news->getType() === NewsType::LINK) { $color = 'yellow'; }
elseif ($news->getType() === NewsType::LINK) { $color = 'yellow'; }
?>
<tr tabindex="0" data-href="<?= $url; ?>">
<td><span class="tag <?= $this->printHtml($color); ?>"><?= $this->getHtml('TYPE' . $news->getType()); ?></span></a>

8
Theme/Backend/news-draft.tpl.php
View File

@ -36,11 +36,11 @@ echo $this->getData('nav')->render(); ?>
<td><?= $this->getHtml('Author'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
<td><?= $this->getHtml('Date'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
<tbody>
<?php $count = 0; foreach ($articles as $key => $news) : ++$count; $url = UriFactory::build('{/prefix}news/edit?{?}&id=' . $news->getId());
$color = 'darkred';
if ($news->getType() === NewsType::ARTICLE) { $color = 'green'; }
<?php $count = 0; foreach ($articles as $key => $news) : ++$count; $url = UriFactory::build('{/prefix}news/edit?{?}&id=' . $news->getId());
$color = 'darkred';
if ($news->getType() === NewsType::ARTICLE) { $color = 'green'; }
elseif ($news->getType() === NewsType::HEADLINE) { $color = 'purple'; }
elseif ($news->getType() === NewsType::LINK) { $color = 'yellow'; }
elseif ($news->getType() === NewsType::LINK) { $color = 'yellow'; }
?>
<tr tabindex="0" data-href="<?= $url; ?>">
<td><span class="tag <?= $this->printHtml($color); ?>"><?= $this->getHtml('TYPE' . $news->getType()); ?></span></a>

16
tests/Models/NewsArticleTest.php
View File

@ -172,14 +172,14 @@ class NewsArticleTest extends \PHPUnit\Framework\TestCase
$this->news->setType(NewsType::HEADLINE);
$arr = [
'id' => 0,
'title' => $this->news->getTitle(),
'plain' => $this->news->getPlain(),
'content' => $this->news->getContent(),
'type' => $this->news->getType(),
'status' => $this->news->getStatus(),
'featured' => $this->news->isFeatured(),
'publish' => $this->news->getPublish(),
'id' => 0,
'title' => $this->news->getTitle(),
'plain' => $this->news->getPlain(),
'content' => $this->news->getContent(),
'type' => $this->news->getType(),
'status' => $this->news->getStatus(),
'featured' => $this->news->isFeatured(),
'publish' => $this->news->getPublish(),
'createdAt' => $this->news->getCreatedAt(),
'createdBy' => $this->news->getCreatedBy(),
];