diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6dcd721..e8d598e 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, "global_namespace_import": {"import_classes": false, "import_constants": false, "import_functions": false}, "binary_operator_spaces": {"operators": {"=": "align", ".=": "align", "+=": "align", "-=": "align", "*=": "align", "/=": "align", "|=": "align", "&=": "align", "=>": "align", "??=": "align"}}, "cast_spaces": {"space": "single"}, "class_attributes_separation": { "elements": {"const": "one", "method": "one", "property": "one"} }, "combine_consecutive_issets": true, "compact_nullable_typehint": true, "declare_strict_types": true, "declare_equal_normalize": {"space": "none"}, "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": true, "yoda_style": {"equal": false, "identical": false, "less_and_greater": false}, "line_ending": true, "logical_operators": true, "lowercase_cast": true, "constant_case": {"case": "lower"}, "lowercase_keywords": true, "modernize_types_casting": true, "native_constant_invocation": true, "native_function_casing": true, "native_function_invocation": {"include": ["@all"]}, "new_with_braces": true, "no_extra_blank_lines": {"tokens": ["break", "case", "continue", "curly_brace_block", "extra", "return", "switch", "throw", "use"]}, "no_spaces_after_function_name": 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_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": {"replacements": {"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": 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, "global_namespace_import": {"import_classes": false, "import_constants": false, "import_functions": false}, "binary_operator_spaces": {"operators": {"=": "align", ".=": "align", "+=": "align", "-=": "align", "*=": "align", "/=": "align", "|=": "align", "&=": "align", "=>": "align", "??=": "align", ">>=": "align", "<<=": "align"}}, "cast_spaces": {"space": "single"}, "class_attributes_separation": { "elements": {"const": "one", "method": "one", "property": "one"} }, "combine_consecutive_issets": true, "compact_nullable_typehint": true, "declare_strict_types": true, "declare_equal_normalize": {"space": "none"}, "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": true, "yoda_style": {"equal": false, "identical": false, "less_and_greater": false}, "line_ending": true, "logical_operators": true, "lowercase_cast": true, "constant_case": {"case": "lower"}, "lowercase_keywords": true, "modernize_types_casting": true, "native_constant_invocation": true, "native_function_casing": true, "native_function_invocation": {"include": ["@all"]}, "new_with_braces": true, "no_extra_blank_lines": {"tokens": ["break", "case", "continue", "curly_brace_block", "extra", "return", "switch", "throw", "use"]}, "no_spaces_after_function_name": 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_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": {"replacements": {"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": 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/Installer.php b/Admin/Installer.php index 68a6f0e..56e40b9 100755 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -158,7 +158,7 @@ final class Installer extends InstallerAbstract return $result; } - /** + /** * Create collection. * * @param ApplicationAbstract $app Application diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 33694ca..1f854d6 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -175,7 +175,7 @@ final class ApiController extends Controller * * @param array $files Files * @param array $media Media files to update - * @param bool $sameNameIfPossible Use exact same file name as original file name if the extension is the same. + * @param bool $sameNameIfPossible use exact same file name as original file name if the extension is the same * * @return Media[] * @@ -438,7 +438,7 @@ final class ApiController extends Controller self::NAME, (string) $media->id, '', - $ip + $ip, ] ); @@ -1139,14 +1139,14 @@ final class ApiController extends Controller private function prepareEncryptedMedia(Media $media, RequestAbstract $request) : Media { - $path = ''; + $path = ''; $absolutePath = ''; $counter = 0; do { $randomName = \sha1(\random_bytes(32)); - $path = '../../../Temp/' . $randomName . '.' . $media->getExtension(); + $path = '../../../Temp/' . $randomName . '.' . $media->getExtension(); $absolutePath = __DIR__ . '/' . $path; } while(!\is_file($absolutePath) && $counter < 1000); diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 193679b..564eb57 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -14,7 +14,6 @@ declare(strict_types=1); namespace Modules\Media\Controller; -use Model\NullSetting; use Model\SettingMapper; use Modules\Admin\Models\Account; use Modules\Admin\Models\PermissionAbstractMapper; @@ -25,7 +24,6 @@ use Modules\Media\Models\MediaClass; use Modules\Media\Models\MediaMapper; use Modules\Media\Models\MediaTypeL11nMapper; use Modules\Media\Models\MediaTypeMapper; -use Modules\Media\Models\NullCollection; use Modules\Media\Models\NullMedia; use Modules\Media\Models\PermissionCategory; use Modules\Media\Theme\Backend\Components\Media\ElementView; diff --git a/Models/Media.php b/Models/Media.php index 09f95a5..2171231 100755 --- a/Models/Media.php +++ b/Models/Media.php @@ -238,7 +238,7 @@ class Media implements \JsonSerializable /** * Encrypt the media file * - * @param string $key Password to encrypt the file with + * @param string $key Password to encrypt the file with * @param null|string $outputPath Output path of the encryption (null = replace file) * * @return bool @@ -253,7 +253,7 @@ class Media implements \JsonSerializable /** * Decrypt the media file * - * @param string $key Password to encrypt the file with + * @param string $key Password to encrypt the file with * @param null|string $outputPath Output path of the encryption (null = replace file) * * @return bool diff --git a/Models/MediaMapper.php b/Models/MediaMapper.php index ddaf4f5..b627a07 100755 --- a/Models/MediaMapper.php +++ b/Models/MediaMapper.php @@ -39,27 +39,27 @@ class MediaMapper extends DataMapperFactory * @since 1.0.0 */ public const COLUMNS = [ - 'media_id' => ['name' => 'media_id', 'type' => 'int', 'internal' => 'id'], - 'media_name' => ['name' => 'media_name', 'type' => 'string', 'internal' => 'name', 'autocomplete' => true], - 'media_description' => ['name' => 'media_description', 'type' => 'string', 'internal' => 'description', 'autocomplete' => true], - 'media_description_raw' => ['name' => 'media_description_raw', 'type' => 'string', 'internal' => 'descriptionRaw'], - 'media_content' => ['name' => 'media_content', 'type' => 'int', 'internal' => 'content'], - 'media_versioned' => ['name' => 'media_versioned', 'type' => 'bool', 'internal' => 'isVersioned'], - 'media_status' => ['name' => 'media_status', 'type' => 'int', 'internal' => 'status'], - 'media_file' => ['name' => 'media_file', 'type' => 'string', 'internal' => 'path', 'autocomplete' => true], - 'media_virtual' => ['name' => 'media_virtual', 'type' => 'string', 'internal' => 'virtualPath', 'autocomplete' => true], - 'media_absolute' => ['name' => 'media_absolute', 'type' => 'bool', 'internal' => 'isAbsolute'], + 'media_id' => ['name' => 'media_id', 'type' => 'int', 'internal' => 'id'], + 'media_name' => ['name' => 'media_name', 'type' => 'string', 'internal' => 'name', 'autocomplete' => true], + 'media_description' => ['name' => 'media_description', 'type' => 'string', 'internal' => 'description', 'autocomplete' => true], + 'media_description_raw' => ['name' => 'media_description_raw', 'type' => 'string', 'internal' => 'descriptionRaw'], + 'media_content' => ['name' => 'media_content', 'type' => 'int', 'internal' => 'content'], + 'media_versioned' => ['name' => 'media_versioned', 'type' => 'bool', 'internal' => 'isVersioned'], + 'media_status' => ['name' => 'media_status', 'type' => 'int', 'internal' => 'status'], + 'media_file' => ['name' => 'media_file', 'type' => 'string', 'internal' => 'path', 'autocomplete' => true], + 'media_virtual' => ['name' => 'media_virtual', 'type' => 'string', 'internal' => 'virtualPath', 'autocomplete' => true], + 'media_absolute' => ['name' => 'media_absolute', 'type' => 'bool', 'internal' => 'isAbsolute'], 'media_encrypted' => ['name' => 'media_encrypted', 'type' => 'bool', 'internal' => 'isEncrypted'], - 'media_password' => ['name' => 'media_password', 'type' => 'string', 'internal' => 'password'], - 'media_extension' => ['name' => 'media_extension', 'type' => 'string', 'internal' => 'extension'], - 'media_size' => ['name' => 'media_size', 'type' => 'int', 'internal' => 'size'], - 'media_source' => ['name' => 'media_source', 'type' => 'int', 'internal' => 'source'], - 'media_class' => ['name' => 'media_class', 'type' => 'int', 'internal' => 'class'], - 'media_language' => ['name' => 'media_language', 'type' => 'string', 'internal' => 'language'], - 'media_country' => ['name' => 'media_country', 'type' => 'string', 'internal' => 'country'], - 'media_unit' => ['name' => 'media_unit', 'type' => 'int', 'internal' => 'unit', 'readonly' => true], - 'media_created_by' => ['name' => 'media_created_by', 'type' => 'int', 'internal' => 'createdBy', 'readonly' => true], - 'media_created_at' => ['name' => 'media_created_at', 'type' => 'DateTimeImmutable', 'internal' => 'createdAt', 'readonly' => true], + 'media_password' => ['name' => 'media_password', 'type' => 'string', 'internal' => 'password'], + 'media_extension' => ['name' => 'media_extension', 'type' => 'string', 'internal' => 'extension'], + 'media_size' => ['name' => 'media_size', 'type' => 'int', 'internal' => 'size'], + 'media_source' => ['name' => 'media_source', 'type' => 'int', 'internal' => 'source'], + 'media_class' => ['name' => 'media_class', 'type' => 'int', 'internal' => 'class'], + 'media_language' => ['name' => 'media_language', 'type' => 'string', 'internal' => 'language'], + 'media_country' => ['name' => 'media_country', 'type' => 'string', 'internal' => 'country'], + 'media_unit' => ['name' => 'media_unit', 'type' => 'int', 'internal' => 'unit', 'readonly' => true], + 'media_created_by' => ['name' => 'media_created_by', 'type' => 'int', 'internal' => 'createdBy', 'readonly' => true], + 'media_created_at' => ['name' => 'media_created_at', 'type' => 'DateTimeImmutable', 'internal' => 'createdAt', 'readonly' => true], ]; /** diff --git a/Theme/Backend/Components/Media/invalidPassword.tpl.php b/Theme/Backend/Components/Media/invalidPassword.tpl.php index 1ed44af..8f4e654 100755 --- a/Theme/Backend/Components/Media/invalidPassword.tpl.php +++ b/Theme/Backend/Components/Media/invalidPassword.tpl.php @@ -13,6 +13,7 @@ declare(strict_types=1); use phpOMS\Uri\UriFactory; + ?>
diff --git a/Theme/Backend/Components/Media/pdf.tpl.php b/Theme/Backend/Components/Media/pdf.tpl.php index 853999f..d4f9c5c 100755 --- a/Theme/Backend/Components/Media/pdf.tpl.php +++ b/Theme/Backend/Components/Media/pdf.tpl.php @@ -26,7 +26,7 @@ use \phpOMS\Uri\UriFactory;
- +
diff --git a/Theme/Backend/Components/Media/powerpoint.tpl.php b/Theme/Backend/Components/Media/powerpoint.tpl.php index 8b68021..fbe503e 100755 --- a/Theme/Backend/Components/Media/powerpoint.tpl.php +++ b/Theme/Backend/Components/Media/powerpoint.tpl.php @@ -13,8 +13,5 @@ declare(strict_types=1); use phpOMS\Autoloader; -use phpOMS\Uri\UriFactory; -use phpOMS\Utils\Parser\Presentation\PresentationParser; Autoloader::addPath(__DIR__ . '/../../../../../../Resources/'); -?> diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php index c7fd55e..50a11e8 100755 --- a/tests/Controller/ApiControllerTest.php +++ b/tests/Controller/ApiControllerTest.php @@ -48,15 +48,15 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase protected string $appName = 'Api'; }; - $this->app->dbPool = $GLOBALS['dbpool']; + $this->app->dbPool = $GLOBALS['dbpool']; $this->app->unitId = 1; - $this->app->appName = 'Api'; - $this->app->accountManager = new AccountManager($GLOBALS['session']); - $this->app->appSettings = new CoreSettings(); - $this->app->moduleManager = new ModuleManager($this->app, __DIR__ . '/../../../Modules/'); - $this->app->dispatcher = new Dispatcher($this->app); - $this->app->eventManager = new EventManager($this->app->dispatcher); - $this->app->l11nManager = new L11nManager(); + $this->app->appName = 'Api'; + $this->app->accountManager = new AccountManager($GLOBALS['session']); + $this->app->appSettings = new CoreSettings(); + $this->app->moduleManager = new ModuleManager($this->app, __DIR__ . '/../../../Modules/'); + $this->app->dispatcher = new Dispatcher($this->app); + $this->app->eventManager = new EventManager($this->app->dispatcher); + $this->app->l11nManager = new L11nManager(); $this->app->eventManager->importFromFile(__DIR__ . '/../../../Web/Api/Hooks.php'); $this->app->router = new WebRouter();