From 593cc1c1051149ae1c2400a235bb64228b150d25 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Mon, 31 Aug 2020 22:54:13 +0200 Subject: [PATCH] fix extra blank lines --- .github/workflows/main.yml | 2 +- Auth/OAuth2/Provider/GeneralProvider.php | 1 - Auth/OAuth2/Provider/ProviderAbstract.php | 1 - DataStorage/Database/DataMapperAbstract.php | 2 -- DataStorage/Database/Schema/Grammar/GrammarInterface.php | 1 - Message/Mail/Mail.php | 4 ---- Message/Mail/Pop3.php | 1 - Module/ModuleManager.php | 1 - Stdlib/Map/MultiMap.php | 1 - System/File/Ftp/Directory.php | 1 - System/File/Local/Directory.php | 2 -- tests/DataStorage/Database/TestModel/BaseModel.php | 1 - tests/Message/Mail/ImapTest.php | 1 - tests/Stdlib/Base/AddressTest.php | 1 - tests/Uri/ArgumentTest.php | 1 - tests/Utils/TaskSchedule/TaskAbstractTest.php | 1 - 16 files changed, 1 insertion(+), 21 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 65ab8efb4..a5f51c68a 100644 --- 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, "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' + 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_extra_blank_lines": ["break", "case", "continue", "curly_brace_block", "extra", "return", "switch", "throw", "use"], "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/Auth/OAuth2/Provider/GeneralProvider.php b/Auth/OAuth2/Provider/GeneralProvider.php index dce3d0156..dfbf6b6ca 100644 --- a/Auth/OAuth2/Provider/GeneralProvider.php +++ b/Auth/OAuth2/Provider/GeneralProvider.php @@ -45,7 +45,6 @@ final class GeneralProvider public function __construct(array $options = [], array $collaborators = []) { - } public function getDefaultScopes() : array diff --git a/Auth/OAuth2/Provider/ProviderAbstract.php b/Auth/OAuth2/Provider/ProviderAbstract.php index e8802a9fb..a024a6595 100644 --- a/Auth/OAuth2/Provider/ProviderAbstract.php +++ b/Auth/OAuth2/Provider/ProviderAbstract.php @@ -27,6 +27,5 @@ abstract class ProviderAbstract { public function __construct(array $options = [], array $collaborators = []) { - } } diff --git a/DataStorage/Database/DataMapperAbstract.php b/DataStorage/Database/DataMapperAbstract.php index 4d4c33259..1428a53f3 100644 --- a/DataStorage/Database/DataMapperAbstract.php +++ b/DataStorage/Database/DataMapperAbstract.php @@ -1731,7 +1731,6 @@ class DataMapperAbstract implements DataMapperInterface */ return $mapper::delete($obj); - } /** @@ -1756,7 +1755,6 @@ class DataMapperAbstract implements DataMapperInterface $mapper = static::$belongsTo[$propertyName]['mapper']; return $mapper::delete($obj); - } /** diff --git a/DataStorage/Database/Schema/Grammar/GrammarInterface.php b/DataStorage/Database/Schema/Grammar/GrammarInterface.php index f242b2260..cfc000dd2 100644 --- a/DataStorage/Database/Schema/Grammar/GrammarInterface.php +++ b/DataStorage/Database/Schema/Grammar/GrammarInterface.php @@ -24,5 +24,4 @@ namespace phpOMS\DataStorage\Database\Schema\Grammar; */ interface GrammarInterface { - } diff --git a/Message/Mail/Mail.php b/Message/Mail/Mail.php index b3e110780..0744cc7fe 100644 --- a/Message/Mail/Mail.php +++ b/Message/Mail/Mail.php @@ -872,7 +872,6 @@ class Mail */ public function createHtmlMsg() : void { - } /** @@ -1391,8 +1390,6 @@ class Mail // @todo: only if createBody impements sign / #tempheader = $this->header $this->mimeHeader = $this->createHeader(); - - // set mime body // set mime header // ... @@ -1400,6 +1397,5 @@ class Mail private function addrAppend(string $type, array $addr) : string { - } } diff --git a/Message/Mail/Pop3.php b/Message/Mail/Pop3.php index e30480466..eda51f325 100644 --- a/Message/Mail/Pop3.php +++ b/Message/Mail/Pop3.php @@ -46,6 +46,5 @@ class Pop3 extends EmailAbstract */ public function send() : bool { - } } diff --git a/Module/ModuleManager.php b/Module/ModuleManager.php index 38314b8c0..aca844666 100644 --- a/Module/ModuleManager.php +++ b/Module/ModuleManager.php @@ -212,7 +212,6 @@ final class ModuleManager $this->active[$json['name']['internal']] = $json === false ? [] : $json; } - } return $this->active; diff --git a/Stdlib/Map/MultiMap.php b/Stdlib/Map/MultiMap.php index c7ca8c644..77e22efb0 100644 --- a/Stdlib/Map/MultiMap.php +++ b/Stdlib/Map/MultiMap.php @@ -465,7 +465,6 @@ final class MultiMap implements \Countable } return $this->getSiblingsSingle($key); - } /** diff --git a/System/File/Ftp/Directory.php b/System/File/Ftp/Directory.php index b432621a9..143c4331f 100644 --- a/System/File/Ftp/Directory.php +++ b/System/File/Ftp/Directory.php @@ -537,7 +537,6 @@ class Directory extends FileAbstract implements DirectoryInterface, FtpContainer public function createNode() : bool { return self::create($this->con, $this->path, $this->permission, true); - /** * @todo Orange-Management/phpOMS#??? [p:low] [t:todo] [d:medium] * Add node to node list diff --git a/System/File/Local/Directory.php b/System/File/Local/Directory.php index 9855a7324..e3f9129c3 100644 --- a/System/File/Local/Directory.php +++ b/System/File/Local/Directory.php @@ -426,7 +426,6 @@ final class Directory extends FileAbstract implements DirectoryInterface, LocalC public function createNode() : bool { return self::create($this->path, $this->permission, true); - /** * @todo Orange-Management/phpOMS#??? [p:low] [t:todo] [d:medium] * Add node to current node list @@ -619,7 +618,6 @@ final class Directory extends FileAbstract implements DirectoryInterface, LocalC public function deleteNode() : bool { return self::delete($this->path); - /** * @todo Orange-Management/phpOMS#??? [p:low] [t:todo] [d:medium] * Remove node from node list diff --git a/tests/DataStorage/Database/TestModel/BaseModel.php b/tests/DataStorage/Database/TestModel/BaseModel.php index 6dc7523d1..eebe53d33 100644 --- a/tests/DataStorage/Database/TestModel/BaseModel.php +++ b/tests/DataStorage/Database/TestModel/BaseModel.php @@ -73,7 +73,6 @@ class BaseModel public function unserialize($data) : void { - } }; diff --git a/tests/Message/Mail/ImapTest.php b/tests/Message/Mail/ImapTest.php index 0258249e8..5dfdaae3d 100644 --- a/tests/Message/Mail/ImapTest.php +++ b/tests/Message/Mail/ImapTest.php @@ -25,7 +25,6 @@ class ImapTest extends \PHPUnit\Framework\TestCase { self::markTestIncomplete(); return; - $email = new Imap( $GLOBALS['CONFIG']['mail']['imap']['host'], $GLOBALS['CONFIG']['mail']['imap']['port'], diff --git a/tests/Stdlib/Base/AddressTest.php b/tests/Stdlib/Base/AddressTest.php index 48774c7c0..f0c8432fb 100644 --- a/tests/Stdlib/Base/AddressTest.php +++ b/tests/Stdlib/Base/AddressTest.php @@ -105,7 +105,6 @@ class AddressTest extends \PHPUnit\Framework\TestCase $this->address->setLocation(new Location()); self::assertInstanceOf('\phpOMS\Stdlib\Base\Location', $this->address->getLocation()); - } /** diff --git a/tests/Uri/ArgumentTest.php b/tests/Uri/ArgumentTest.php index 9efd82110..d4ac2c8c3 100644 --- a/tests/Uri/ArgumentTest.php +++ b/tests/Uri/ArgumentTest.php @@ -114,7 +114,6 @@ class ArgumentTest extends \PHPUnit\Framework\TestCase self::assertEquals('?para1=abc ?para2=2', $obj->getQuery()); self::assertEquals(['para1' => 'abc', 'para2' => '2'], $obj->getQueryArray()); self::assertEquals('2', $obj->getQuery('para2')); - } /** diff --git a/tests/Utils/TaskSchedule/TaskAbstractTest.php b/tests/Utils/TaskSchedule/TaskAbstractTest.php index b18b987c5..bf55bc882 100644 --- a/tests/Utils/TaskSchedule/TaskAbstractTest.php +++ b/tests/Utils/TaskSchedule/TaskAbstractTest.php @@ -35,7 +35,6 @@ class TaskAbstractTest extends \PHPUnit\Framework\TestCase public static function createWith(array $jobData) : TaskAbstract { - } }; }