diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..ad5c0cc --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,48 @@ +include: + - project: ShipperHQ/DevOps/GitLabTemplates + ref: INFRA-672 + file: /magento/release.gitlab-ci.yml + +stages: + - tag + - release to GitLab + - release to GitHub + +# Denote whether to build major, minor or patch release +major release: + stage: tag + variables: + VERSION_INCREMENT: "major" + extends: + - .m2_module_release + +minor release: + stage: tag + variables: + VERSION_INCREMENT: "minor" + extends: + - .m2_module_release + +patch release: + stage: tag + variables: + VERSION_INCREMENT: "patch" + extends: + - .m2_module_release + +# Build public release +build release to GitHub: + stage: release to GitHub + variables: + GITHUB_REPO: "git@github.com:shipperhq/module-logger.git" + when: on_success + needs: + - job: major release + optional: true + - job: minor release + optional: true + - job: patch release + optional: true + extends: + - .m2_public_release + diff --git a/CHANGELOG-PUBLIC.md b/CHANGELOG-PUBLIC.md index 21e2ba9..064ca31 100644 --- a/CHANGELOG-PUBLIC.md +++ b/CHANGELOG-PUBLIC.md @@ -15,3 +15,7 @@ MNB-5 Move to declarative schema MNB-2430 M2.4.4 compatibility +## 20.7.1 (2024-06-27) +SHQ23-1281 Fix security linter warnings + + diff --git a/CHANGELOG.MD b/CHANGELOG.MD index 21e2ba9..064ca31 100755 --- a/CHANGELOG.MD +++ b/CHANGELOG.MD @@ -15,3 +15,7 @@ MNB-5 Move to declarative schema MNB-2430 M2.4.4 compatibility +## 20.7.1 (2024-06-27) +SHQ23-1281 Fix security linter warnings + + diff --git a/README.md b/README.md index 47159b4..5e3e3dd 100755 --- a/README.md +++ b/README.md @@ -15,18 +15,32 @@ Facts Compatibility ------------- -- Magento >= 2.0 (Includes 2.2) -- Supports both Magento Open Source (Community) and Magento Commerce (Enterprise) - -This library aims to support and is tested against the following PHP -implementations: - -* PHP 5.5 -* PHP 5.6 -* PHP 5.7 -* PHP 7.x (Please consult [Magento 2 requirements](http://devdocs.magento.com/magento-system-requirements.html) for any exceptions) - -Enforced in the composer.json +This module supports and is tested against the following Magento versions: + +* 2.4.7-beta1 +* 2.4.6-p1 +* 2.4.6 +* 2.4.5-p3 +* 2.4.5-p2 +* 2.4.5-p1 +* 2.4.5 +* 2.4.4-p4 +* 2.4.4-p3 +* 2.4.4-p2 +* 2.4.4-p1 +* 2.4.4 +* 2.4.3-p3 +* 2.4.3-p2 +* 2.4.3 +* 2.4.2 +* 2.4.1 +* 2.4.0 + +per the [official Magento 2 requirements](https://experienceleague.adobe.com/docs/commerce-operations/installation-guide/system-requirements.html) + +Supports both Magento Opensource (Community) and Magento Commerce (Enterprise) + +Compatibility with earlier editions is possible but not maintained. Installation Instructions ------------------------- @@ -49,14 +63,12 @@ Any contribution is highly appreciated. The best way to contribute code is to op License ------- -Copyright (c) 2015 Zowta LLC & Zowta Ltd. See [LICENSE][] for -details. - -We also dutifully respect the [Magento][] OSL license, which is included in this codebase. +Copyright (c) 2015 Zowta LLC & Zowta Ltd. See [LICENSE] for details. +We also dutifully respect the [Magento] OSL license. -[license]: LICENSE.md -[magento]: Magento2_LICENSE.md +[license]: LICENSE.txt +[Magento]: https://github.com/magento/magento2/blob/2.4-develop/LICENSE.txt Copyright --------- diff --git a/composer.json b/composer.json index 837ca90..c5130c6 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "shipperhq/module-logger", "description": "ShipperHQ Logger", "type": "magento2-module", - "version": "20.7.0", + "version": "20.7.1", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/src/view/adminhtml/templates/grid.phtml b/src/view/adminhtml/templates/grid.phtml index b0c6592..c7dc53b 100644 --- a/src/view/adminhtml/templates/grid.phtml +++ b/src/view/adminhtml/templates/grid.phtml @@ -1,23 +1,23 @@ getColumns()); @@ -124,8 +124,8 @@ $numColumns = sizeof($block->getColumns()); getUiId('current-page') ?> /> @@ -134,13 +134,13 @@ $numColumns = sizeof($block->getColumns()); ' . $block->getCollection()->getLastPageNumber() . '') ?> - - + diff --git a/src/view/adminhtml/templates/view.phtml b/src/view/adminhtml/templates/view.phtml index 299d2ff..488af22 100644 --- a/src/view/adminhtml/templates/view.phtml +++ b/src/view/adminhtml/templates/view.phtml @@ -30,19 +30,19 @@ getMessageData()): ?>
-

+

escapeHtml(__('Message Details')) ?>

-
«

+
« escapeHtml(__('Back to ShipperHQ Log')) ?>

-

getCode(); ?>

-

getSeverity(); ?>

-

getDateAdded(); ?>

-

getTitle(); ?>

-

+

escapeHtml(__('Code:')) ?> escapeHtml($messageData->getCode()); ?>

+

escapeHtml(__('Severity:')) ?> escapeHtml($messageData->getSeverity()); ?>

+

escapeHtml(__('Date Added:')) ?> escapeHtml($messageData->getDateAdded()); ?>

+

escapeHtml(__('Title:')) ?> escapeHtml($messageData->getTitle()); ?>

+

escapeHtml(__('Message:')) ?>

'.htmlentities($messageData->getDescription()).''; ?>

-
«

+
« escapeHtml(__('Back to ShipperHQ Log')) ?>