Skip to content

Commit 26f014c

Browse files
committed
Merge branch 'master' of github.com:yireo/Yireo_TaxRatesManager2
2 parents e5479ef + 080b4f7 commit 26f014c

File tree

12 files changed

+98
-148
lines changed

12 files changed

+98
-148
lines changed

.github/workflows/extdn-integration-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ jobs:
3333
MODULE_NAME: ${{ secrets.MODULE_NAME }}
3434
COMPOSER_NAME: ${{ secrets.COMPOSER_NAME }}
3535
steps:
36-
- uses: actions/checkout@v2
36+
- uses: actions/checkout@v4
3737
- name: Cache Composer dependencies
38-
uses: actions/cache@v2
38+
uses: actions/cache@v4
3939
with:
4040
path: /tmp/composer-cache
4141
key: ${{ runner.os }}-${{ hashFiles('**/composer.lock') }}

.github/workflows/extdn-phpstan.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@ jobs:
66
name: PHPStan
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v2
9+
- uses: actions/checkout@v4
1010

1111
- name: "Determine composer cache directory"
1212
id: "determine-composer-cache-directory"
1313
run: "echo \"::set-output name=directory::$(composer config cache-dir)\""
1414

1515
- name: Cache Composer dependencies
16-
uses: actions/cache@v2
16+
uses: actions/cache@v4
1717
with:
1818
path: "${{ steps.determine-composer-cache-directory.outputs.directory }}"
1919
key: ${{ runner.os }}-${{ hashFiles('**/composer.lock') }}
2020

2121
- uses: extdn/github-actions-m2/magento-phpstan/8.3@master
2222
env:
23-
MAGENTO_VERSION: '2.4.7-p1'
23+
MAGENTO_VERSION: '2.4.7-p3'
2424
COMPOSER_VERSION: 2
2525
with:
2626
composer_name: ${{ secrets.COMPOSER_NAME }}

.github/workflows/extdn-unit-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@ jobs:
1111
MODULE_NAME: ${{ secrets.MODULE_NAME }}
1212
COMPOSER_NAME: ${{ secrets.COMPOSER_NAME }}
1313
steps:
14-
- uses: actions/checkout@v2
14+
- uses: actions/checkout@v3
1515

1616
- name: Cache Composer dependencies
17-
uses: actions/cache@v2
17+
uses: actions/cache@v3
1818
with:
1919
path: /tmp/composer-cache
2020
key: ${{ runner.os }}-${{ hashFiles('**/composer.lock') }}
2121

2222
- uses: extdn/github-actions-m2/magento-unit-tests/8.3@master
2323
env:
24-
MAGENTO_VERSION: '2.4.7-p2'
24+
MAGENTO_VERSION: '2.4.7-p3'
2525
COMPOSER_VERSION: 2
2626
with:
2727
magento_pre_install_script: .github/workflows/extdn-phpstan-pre-install.sh

.gitlab-ci.env

Lines changed: 0 additions & 4 deletions
This file was deleted.

.gitlab-ci.yml

Lines changed: 0 additions & 130 deletions
This file was deleted.

.module.ini

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
EXTENSION_VENDOR=Yireo
2+
EXTENSION_NAME=TaxRatesManager2
3+
COMPOSER_NAME=yireo/magento2-taxratesmanager2
4+
PHP_VERSIONS=("8.1", "8.2", "8.3", "8.4")
5+
PHPSTAN_LEVEL=1

CHANGELOG.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [Unreleased]
88

9-
## [1.2.11] - 19 July 2025
9+
## [1.2.13] - 19 July 2025
1010
### Fixed
1111
- Fix possible error with empty postcode
1212

13+
## [1.2.12] - 06 May 2025
14+
### Fixed
15+
- Fix PHP 8.4 issue
16+
- Fix compat with PHPUnit
17+
- Remove `setup_version` and add `Magento_Config` dep
18+
19+
## [1.2.11] - 24 October 2024
20+
### Fixed
21+
- Add funding
22+
1323
## [1.2.10] - 2 October 2024
1424
### Fixed
1525
- Send mail by using the configured email address

Check/Check.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public function __construct(
9292
Comparer $comparer,
9393
VatModel $vatModel,
9494
UrlInterface $url,
95-
int $verbosity = null
95+
?int $verbosity = null
9696
) {
9797
$this->config = $config;
9898
$this->logger = $logger;

Config/Frontend/Funding.php

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?php declare(strict_types=1);
2+
3+
namespace Yireo\TaxRatesManager2\Config\Frontend;
4+
5+
use Magento\Config\Block\System\Config\Form\Field;
6+
use Magento\Framework\Data\Form\Element\AbstractElement;
7+
8+
class Funding extends Field
9+
{
10+
protected $_template = 'Yireo_TaxRatesManager2::funding.phtml';
11+
12+
public function render(AbstractElement $element)
13+
{
14+
return $this->toHtml();
15+
}
16+
}
17+

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
"autoload": {
3131
"psr-4": {
3232
"Yireo\\TaxRatesManager2\\": ""
33-
},
34-
"files": [
35-
"registration.php"
36-
]
33+
},
34+
"files": [
35+
"registration.php"
36+
]
3737
}
3838
}

0 commit comments

Comments
 (0)