Skip to content

Commit 12effae

Browse files
authored
Merge pull request #166 from itk-dev/hotfix/digital-post-commands
Fix digital post commands
2 parents eecb47a + 83c1a27 commit 12effae

File tree

5 files changed

+20
-21
lines changed

5 files changed

+20
-21
lines changed

.github/workflows/pr.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
fail-fast: false
99
steps:
1010
- name: Checkout
11-
uses: actions/checkout@v2
11+
uses: actions/checkout@v4
1212
with:
1313
fetch-depth: 2
1414

@@ -39,7 +39,7 @@ jobs:
3939
id: composer-cache
4040
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
4141
- name: Cache dependencies
42-
uses: actions/cache@v2
42+
uses: actions/cache@v4
4343
with:
4444
path: ${{ steps.composer-cache.outputs.dir }}
4545
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -71,7 +71,7 @@ jobs:
7171
id: composer-cache
7272
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
7373
- name: Cache dependencies
74-
uses: actions/cache@v2
74+
uses: actions/cache@v4
7575
with:
7676
path: ${{ steps.composer-cache.outputs.dir }}
7777
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -104,7 +104,7 @@ jobs:
104104
id: composer-cache
105105
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
106106
- name: Cache dependencies
107-
uses: actions/cache@v2
107+
uses: actions/cache@v4
108108
with:
109109
path: ${{ steps.composer-cache.outputs.dir }}
110110
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -118,12 +118,12 @@ jobs:
118118
name: markdownlint
119119
steps:
120120
- name: Checkout
121-
uses: actions/checkout@v2
121+
uses: actions/checkout@v4
122122
- name: Get yarn cache directory path
123123
id: yarn-cache-dir-path
124124
run: echo "::set-output name=dir::$(yarn cache dir)"
125125
- name: Cache yarn packages
126-
uses: actions/cache@v2
126+
uses: actions/cache@v4
127127
id: yarn-cache
128128
with:
129129
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}

CHANGELOG.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,16 @@ before starting to add changes. Use example [placed in the end of the page](#exa
1111

1212
## [Unreleased]
1313

14+
- [PR-166](https://github.com/OS2Forms/os2forms/pull/166)
15+
- Fix digital post commands
16+
- Updated versions in GitHub Actions `uses` steps
1417
- Updating the display of os2forms package on the status page
1518

1619
## [4.0.0] 2025-03-06
1720

18-
- This is an alias for for 3.22.2. Major change is the module removal, which can lead to lack of backward support.
19-
See full release note here:
20-
https://github.com/OS2Forms/os2forms_docs/blob/master/docs/releases/2024-Q4-Release-notes.md
21+
- This is an alias for for 3.22.2. Major change is the module removal, which can
22+
lead to lack of backward support. See full release note here:
23+
<https://github.com/OS2Forms/os2forms_docs/blob/master/docs/releases/2024-Q4-Release-notes.md>
2124

2225
## [3.22.2] 2025-02-28
2326

@@ -92,9 +95,8 @@ https://github.com/OS2Forms/os2forms_docs/blob/master/docs/releases/2024-Q4-Rele
9295
## [3.16.0] 2024-08-27
9396

9497
f/OS-115_dawa_address
95-
- [OS-115] Skipping empty maktrikula objects
96-
9798

99+
- [OS-115] Skipping empty maktrikula objects
98100

99101
[#110](https://github.com/OS2Forms/os2forms/pull/110)
100102

modules/os2forms_digital_post/drush.services.yml

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

modules/os2forms_digital_post/src/Drush/Commands/DigitalPostTestCommands.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace Drupal\os2forms_digital_post\Drush\Commands;
44

55
use Drupal\Component\Serialization\Yaml;
6+
use Drupal\Core\DependencyInjection\AutowireTrait;
67
use Drupal\Core\Utility\Token;
78
use Drupal\entity_print\Plugin\EntityPrintPluginManagerInterface;
89
use Drupal\os2forms_digital_post\Helper\DigitalPostHelper;
@@ -12,20 +13,25 @@
1213
use ItkDev\Serviceplatformen\Service\SF1601\SF1601;
1314
use Symfony\Component\Console\Exception\InvalidArgumentException;
1415
use Symfony\Component\Console\Style\SymfonyStyle;
16+
use Symfony\Component\DependencyInjection\Attribute\Autowire;
1517
use Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface;
1618

1719
/**
1820
* Test commands for digital post.
1921
*/
2022
class DigitalPostTestCommands extends DrushCommands {
23+
use AutowireTrait;
2124

2225
/**
2326
* Constructor.
2427
*/
2528
public function __construct(
29+
#[Autowire(service: DigitalPostHelper::class)]
2630
private readonly DigitalPostHelper $digitalPostHelper,
2731
private readonly Token $token,
32+
#[Autowire(service: 'plugin.manager.entity_print.print_engine')]
2833
private readonly EntityPrintPluginManagerInterface $entityPrintPluginManager,
34+
#[Autowire(service: Settings::class)]
2935
private readonly Settings $digitalPostSettings,
3036
) {
3137
}

os2forms.install

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ function os2forms_requirements($phase) {
7474
0 => t('version <strong>@version</strong> (commit: <strong>@reference</strong>)', [
7575
'@version' => $version,
7676
'@reference' => $reference,
77-
])
77+
]),
7878
],
7979
];
8080

0 commit comments

Comments
 (0)