From 4c50d5b751e689aa773f8a3d5cd06326632389c3 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Mon, 31 Aug 2020 22:30:36 +0200 Subject: [PATCH] php cs autofix --- .github/workflows/main.yml | 2 +- Admin/Routes/Web/Api.php | 40 ++++++------- Admin/Routes/Web/Backend.php | 40 ++++++------- Theme/Backend/Components/Media/list.tpl.php | 4 +- Theme/Backend/Lang/de.lang.php | 60 +++++++++---------- Theme/Backend/Lang/en.lang.php | 60 +++++++++---------- Theme/Backend/media-single.tpl.php | 2 +- .../Api/ApiControllerCollectionTrait.php | 18 +++--- .../Api/ApiControllerMediaTrait.php | 46 +++++++------- 9 files changed, 136 insertions(+), 136 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d44f65c..e942af8 100755 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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) diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php index 74c60aa..c2def68 100755 --- a/Admin/Routes/Web/Api.php +++ b/Admin/Routes/Web/Api.php @@ -8,54 +8,54 @@ use phpOMS\Router\RouteVerb; return [ '^.*/media(\?+.*|$)' => [ [ - 'dest' => '\Modules\Media\Controller\ApiController:apiMediaUpload', - 'verb' => RouteVerb::PUT, + 'dest' => '\Modules\Media\Controller\ApiController:apiMediaUpload', + 'verb' => RouteVerb::PUT, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::CREATE, - 'state' => PermissionState::MEDIA, + 'type' => PermissionType::CREATE, + 'state' => PermissionState::MEDIA, ], ], [ - 'dest' => '\Modules\Media\Controller\ApiController:apiMediaUpdate', - 'verb' => RouteVerb::SET, + 'dest' => '\Modules\Media\Controller\ApiController:apiMediaUpdate', + 'verb' => RouteVerb::SET, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::CREATE, - 'state' => PermissionState::MEDIA, + 'type' => PermissionType::CREATE, + 'state' => PermissionState::MEDIA, ], ], ], '^.*/media/file(\?+.*|$)' => [ [ - 'dest' => '\Modules\Media\Controller\ApiController:apiMediaCreate', - 'verb' => RouteVerb::PUT, + 'dest' => '\Modules\Media\Controller\ApiController:apiMediaCreate', + 'verb' => RouteVerb::PUT, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::CREATE, - 'state' => PermissionState::MEDIA, + 'type' => PermissionType::CREATE, + 'state' => PermissionState::MEDIA, ], ], ], '^.*/media/collection(\?+.*|$)' => [ [ - 'dest' => '\Modules\Media\Controller\ApiController:apiCollectionCreate', - 'verb' => RouteVerb::PUT, + 'dest' => '\Modules\Media\Controller\ApiController:apiCollectionCreate', + 'verb' => RouteVerb::PUT, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::CREATE, - 'state' => PermissionState::MEDIA, + 'type' => PermissionType::CREATE, + 'state' => PermissionState::MEDIA, ], ], ], '^.*/media/find.*$' => [ [ - 'dest' => '\Modules\Media\Controller\ApiController:apiMediaFind', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Media\Controller\ApiController:apiMediaFind', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::MEDIA, + 'type' => PermissionType::READ, + 'state' => PermissionState::MEDIA, ], ], ], diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index ad36797..0c7f199 100755 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -8,56 +8,56 @@ use phpOMS\Router\RouteVerb; return [ '^.*/media/list.*$' => [ [ - 'dest' => '\Modules\Media\Controller\BackendController:viewMediaList', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Media\Controller\BackendController:viewMediaList', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::MEDIA, + 'type' => PermissionType::READ, + 'state' => PermissionState::MEDIA, ], ], ], '^.*/media/upload.*$' => [ [ - 'dest' => '\Modules\Media\Controller\BackendController:viewMediaUpload', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Media\Controller\BackendController:viewMediaUpload', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::CREATE, - 'state' => PermissionState::MEDIA, + 'type' => PermissionType::CREATE, + 'state' => PermissionState::MEDIA, ], ], ], '^.*/media/file/create.*$' => [ [ - 'dest' => '\Modules\Media\Controller\BackendController:viewMediaFileCreate', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Media\Controller\BackendController:viewMediaFileCreate', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::CREATE, - 'state' => PermissionState::MEDIA, + 'type' => PermissionType::CREATE, + 'state' => PermissionState::MEDIA, ], ], ], '^.*/media/collection/create.*$' => [ [ - 'dest' => '\Modules\Media\Controller\BackendController:viewMediaCollectionCreate', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Media\Controller\BackendController:viewMediaCollectionCreate', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::CREATE, - 'state' => PermissionState::MEDIA, + 'type' => PermissionType::CREATE, + 'state' => PermissionState::MEDIA, ], ], ], '^.*/media/single.*$' => [ [ - 'dest' => '\Modules\Media\Controller\BackendController:viewMediaSingle', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Media\Controller\BackendController:viewMediaSingle', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::MEDIA, + 'type' => PermissionType::READ, + 'state' => PermissionState::MEDIA, ], ], ], diff --git a/Theme/Backend/Components/Media/list.tpl.php b/Theme/Backend/Components/Media/list.tpl.php index e184540..50a8eb6 100755 --- a/Theme/Backend/Components/Media/list.tpl.php +++ b/Theme/Backend/Components/Media/list.tpl.php @@ -16,9 +16,9 @@ use phpOMS\Uri\UriFactory; getHtml('Created', 'Media'); ?> media as $key => $value) : ++$count; - $url = UriFactory::build('{/prefix}media/single?{?}&id=' . $value->getId()); + $url = UriFactory::build('{/prefix}media/single?{?}&id=' . $value->getId()); - $icon = ''; + $icon = ''; $extensionType = FileUtils::getExtensionType($value->getExtension()); if ($extensionType === ExtensionType::CODE) { diff --git a/Theme/Backend/Lang/de.lang.php b/Theme/Backend/Lang/de.lang.php index db10801..a8c5bf2 100755 --- a/Theme/Backend/Lang/de.lang.php +++ b/Theme/Backend/Lang/de.lang.php @@ -13,35 +13,35 @@ declare(strict_types=1); return ['Media' => [ - 'Account' => 'Account', - 'AddToCollection' => 'Zum Ordner hinzufügen', - 'Author' => 'Autor', - 'Back' => 'Zurück', - 'Changed' => 'Geändert', - 'Changedby' => 'Geändert by', - 'Created' => 'Erstellt', + 'Account' => 'Account', + 'AddToCollection' => 'Zum Ordner hinzufügen', + 'Author' => 'Autor', + 'Back' => 'Zurück', + 'Changed' => 'Geändert', + 'Changedby' => 'Geändert by', + 'Created' => 'Erstellt', 'CreateCollection' => 'Erstelle Ordner', - 'CreateFile' => 'Erstelle Datei', - 'Creator' => 'Ersteller', - 'Data' => 'Daten', - 'Description' => 'Beschreibung', - 'Edit' => 'Bearbeiten', - 'Editability' => 'Bearbeitung', - 'Extension' => 'Endung', - 'FilePath' => 'Dateipfad', - 'Files' => 'Dateien', - 'Media' => 'Media', - 'Name' => 'Name', - 'Path' => 'Pfad', - 'PathSettings' => 'Pfad Einstellung', - 'Permission' => 'Rechte', - 'Preview' => 'Vorschau', - 'RandomPath' => 'Zufälliger Pfad', - 'Select' => 'Auswahl', - 'Settings' => 'Einstellungen', - 'Size' => 'Größe', - 'Type' => 'Typ', - 'Upload' => 'Hochladen', - 'VirtualPath' => 'Virtueller Pfad', - 'Visibility' => 'Sichtbarkeit', + 'CreateFile' => 'Erstelle Datei', + 'Creator' => 'Ersteller', + 'Data' => 'Daten', + 'Description' => 'Beschreibung', + 'Edit' => 'Bearbeiten', + 'Editability' => 'Bearbeitung', + 'Extension' => 'Endung', + 'FilePath' => 'Dateipfad', + 'Files' => 'Dateien', + 'Media' => 'Media', + 'Name' => 'Name', + 'Path' => 'Pfad', + 'PathSettings' => 'Pfad Einstellung', + 'Permission' => 'Rechte', + 'Preview' => 'Vorschau', + 'RandomPath' => 'Zufälliger Pfad', + 'Select' => 'Auswahl', + 'Settings' => 'Einstellungen', + 'Size' => 'Größe', + 'Type' => 'Typ', + 'Upload' => 'Hochladen', + 'VirtualPath' => 'Virtueller Pfad', + 'Visibility' => 'Sichtbarkeit', ]]; diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php index ac14a23..e3b6fc7 100755 --- a/Theme/Backend/Lang/en.lang.php +++ b/Theme/Backend/Lang/en.lang.php @@ -13,35 +13,35 @@ declare(strict_types=1); return ['Media' => [ - 'Account' => 'Account', - 'AddToCollection' => 'Add to collection', - 'Author' => 'Author', - 'Back' => 'Back', - 'Changed' => 'Changed', - 'Changedby' => 'Changed by', - 'Created' => 'Created', + 'Account' => 'Account', + 'AddToCollection' => 'Add to collection', + 'Author' => 'Author', + 'Back' => 'Back', + 'Changed' => 'Changed', + 'Changedby' => 'Changed by', + 'Created' => 'Created', 'CreateCollection' => 'Create Collection', - 'CreateFile' => 'Create File', - 'Creator' => 'Creator', - 'Data' => 'Data', - 'Description' => 'Description', - 'Edit' => 'Edit', - 'Editability' => 'Editability', - 'Extension' => 'Extension', - 'FilePath' => 'File Path', - 'Files' => 'Files', - 'Media' => 'Media', - 'Name' => 'Name', - 'Path' => 'Path', - 'PathSettings' => 'Path Settings', - 'Permission' => 'Permission', - 'Preview' => 'Preview', - 'RandomPath' => 'Random Path', - 'Select' => 'Select', - 'Settings' => 'Settings', - 'Size' => 'Size', - 'Type' => 'Type', - 'Upload' => 'Upload', - 'VirtualPath' => 'Virtual Path', - 'Visibility' => 'Visibility', + 'CreateFile' => 'Create File', + 'Creator' => 'Creator', + 'Data' => 'Data', + 'Description' => 'Description', + 'Edit' => 'Edit', + 'Editability' => 'Editability', + 'Extension' => 'Extension', + 'FilePath' => 'File Path', + 'Files' => 'Files', + 'Media' => 'Media', + 'Name' => 'Name', + 'Path' => 'Path', + 'PathSettings' => 'Path Settings', + 'Permission' => 'Permission', + 'Preview' => 'Preview', + 'RandomPath' => 'Random Path', + 'Select' => 'Select', + 'Settings' => 'Settings', + 'Size' => 'Size', + 'Type' => 'Type', + 'Upload' => 'Upload', + 'VirtualPath' => 'Virtual Path', + 'Visibility' => 'Visibility', ]]; diff --git a/Theme/Backend/media-single.tpl.php b/Theme/Backend/media-single.tpl.php index 3fcbda0..236f594 100755 --- a/Theme/Backend/media-single.tpl.php +++ b/Theme/Backend/media-single.tpl.php @@ -101,7 +101,7 @@ echo $this->getData('nav')->render(); printHtml($value->getCreatedBy()->getName1()); ?> printHtml($value->getCreatedAt()->format('Y-m-d H:i:s')); ?> dirPathFunction($media, $this->request->getData('sub') ?? ''); ?> - $value) : $url = UriFactory::build('{/prefix}media/single?{?}&id=' . $media->getId() . '&sub=' . \substr($value, \strlen($media->getPath()))); $icon = $fileIconFunction(FileUtils::getExtensionType(!\is_dir($value) ? File::extension($value) : 'collection')); diff --git a/tests/Controller/Api/ApiControllerCollectionTrait.php b/tests/Controller/Api/ApiControllerCollectionTrait.php index d6ec2fc..0a28b4f 100755 --- a/tests/Controller/Api/ApiControllerCollectionTrait.php +++ b/tests/Controller/Api/ApiControllerCollectionTrait.php @@ -43,18 +43,18 @@ trait ApiControllerCollectionTrait $files = [ [ - 'error' => \UPLOAD_ERR_OK, - 'type' => 'txt', - 'name' => 'testFile1.txt', + 'error' => \UPLOAD_ERR_OK, + 'type' => 'txt', + 'name' => 'testFile1.txt', 'tmp_name' => __DIR__ . '/temp/testFile1.txt', - 'size' => \filesize(__DIR__ . '/testFile1.txt'), + 'size' => \filesize(__DIR__ . '/testFile1.txt'), ], [ - 'error' => \UPLOAD_ERR_OK, - 'type' => 'txt', - 'name' => 'testFile2.txt', + 'error' => \UPLOAD_ERR_OK, + 'type' => 'txt', + 'name' => 'testFile2.txt', 'tmp_name' => __DIR__ . '/temp/testFile2.txt', - 'size' => \filesize(__DIR__ . '/testFile2.txt'), + 'size' => \filesize(__DIR__ . '/testFile2.txt'), ], ]; @@ -66,7 +66,7 @@ trait ApiControllerCollectionTrait Directory::delete(__DIR__ . '/temp'); } - $media = []; + $media = []; $createdMedia = $response->get('')['response']; foreach ($createdMedia as $file) { $media[] = $file; diff --git a/tests/Controller/Api/ApiControllerMediaTrait.php b/tests/Controller/Api/ApiControllerMediaTrait.php index 55d6096..0cfc186 100755 --- a/tests/Controller/Api/ApiControllerMediaTrait.php +++ b/tests/Controller/Api/ApiControllerMediaTrait.php @@ -31,28 +31,28 @@ trait ApiControllerMediaTrait { $status = [ [ - 'status' => UploadStatus::OK, + 'status' => UploadStatus::OK, 'extension' => 'png', - 'filename' => 'logo.png', - 'name' => 'logo.png', - 'path' => 'Modules/tests/Media/Files/', - 'size' => 90210, + 'filename' => 'logo.png', + 'name' => 'logo.png', + 'path' => 'Modules/tests/Media/Files/', + 'size' => 90210, ], [ - 'status' => UploadStatus::FAILED_HASHING, + 'status' => UploadStatus::FAILED_HASHING, 'extension' => 'png', - 'filename' => 'logo.png', - 'name' => 'logo.png', - 'path' => 'Modules/tests/Media/Files/', - 'size' => 90210, + 'filename' => 'logo.png', + 'name' => 'logo.png', + 'path' => 'Modules/tests/Media/Files/', + 'size' => 90210, ], [ - 'status' => UploadStatus::OK, + 'status' => UploadStatus::OK, 'extension' => 'png', - 'filename' => 'logo2.png', - 'name' => 'logo2.png', - 'path' => 'Modules/tests/Media/Files/', - 'size' => 90210, + 'filename' => 'logo2.png', + 'name' => 'logo2.png', + 'path' => 'Modules/tests/Media/Files/', + 'size' => 90210, ], ]; @@ -81,18 +81,18 @@ trait ApiControllerMediaTrait $files = [ [ - 'error' => \UPLOAD_ERR_OK, - 'type' => 'txt', - 'name' => 'testFile1.txt', + 'error' => \UPLOAD_ERR_OK, + 'type' => 'txt', + 'name' => 'testFile1.txt', 'tmp_name' => __DIR__ . '/temp/testFile1.txt', - 'size' => \filesize(__DIR__ . '/testFile1.txt'), + 'size' => \filesize(__DIR__ . '/testFile1.txt'), ], [ - 'error' => \UPLOAD_ERR_OK, - 'type' => 'txt', - 'name' => 'testFile2.txt', + 'error' => \UPLOAD_ERR_OK, + 'type' => 'txt', + 'name' => 'testFile2.txt', 'tmp_name' => __DIR__ . '/temp/testFile2.txt', - 'size' => \filesize(__DIR__ . '/testFile2.txt'), + 'size' => \filesize(__DIR__ . '/testFile2.txt'), ], ];