Skip to content

Commit 31db35c

Browse files
rimi-itkrimi-itk
authored
Merge pull request #4 from itk-dev/feature/composer-install
Updated composer stuff
2 parents 3c137df + 6e1b887 commit 31db35c

11 files changed

Lines changed: 75 additions & 23 deletions

‎.github/workflows/composer.yaml‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ on:
3232
pull_request:
3333
paths: &paths
3434
- "composer.json"
35-
- "composer.lock"
36-
- "docker-compose.yml"
35+
- "compose.yaml"
3736
push:
3837
branches:
3938
- main
@@ -62,8 +61,17 @@ jobs:
6261
run: |
6362
docker network create frontend
6463
65-
- run: |
64+
- &composer_install
65+
name: Composer install
66+
run: |
67+
# Create a temporary composer file to install https://github.com/mglaman/composer-drupal-lenient before the real install needs it.
68+
docker compose run --rm --env COMPOSER=composer.lenient.json phpfpm composer init --no-interaction
69+
docker compose run --rm --env COMPOSER=composer.lenient.json phpfpm composer config --no-plugins allow-plugins.mglaman/composer-drupal-lenient true
70+
docker compose run --rm --env COMPOSER=composer.lenient.json phpfpm composer require mglaman/composer-drupal-lenient
71+
docker compose run --rm --env COMPOSER=composer.lenient.json phpfpm rm composer.lenient.*
6672
docker compose run --rm phpfpm composer install
73+
74+
- run: |
6775
docker compose run --rm phpfpm composer normalize --dry-run
6876
6977
composer-audit:
@@ -75,5 +83,7 @@ jobs:
7583
run: |
7684
docker network create frontend
7785
86+
- *composer_install
87+
7888
- run: |
7989
docker compose run --rm phpfpm composer audit

‎.github/workflows/php.yaml‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ on:
4141
paths: &paths
4242
- "**/*.php"
4343
- "composer.json"
44-
- "composer.lock"
45-
- "docker-compose.yml"
44+
- "compose.yaml"
4645
push:
4746
branches:
4847
- main
@@ -60,6 +59,15 @@ jobs:
6059
run: |
6160
docker network create frontend
6261
63-
- run: |
62+
- &composer_install
63+
name: Composer install
64+
run: |
65+
# Create a temporary composer file to install https://github.com/mglaman/composer-drupal-lenient before the real install needs it.
66+
docker compose run --rm --env COMPOSER=composer.lenient.json phpfpm composer init --no-interaction
67+
docker compose run --rm --env COMPOSER=composer.lenient.json phpfpm composer config --no-plugins allow-plugins.mglaman/composer-drupal-lenient true
68+
docker compose run --rm --env COMPOSER=composer.lenient.json phpfpm composer require mglaman/composer-drupal-lenient
69+
docker compose run --rm --env COMPOSER=composer.lenient.json phpfpm rm composer.lenient.*
6470
docker compose run --rm phpfpm composer install
71+
72+
- run: |
6573
docker compose run --rm phpfpm vendor/bin/phpcs

‎.github/workflows/twig.yaml‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@ on:
3131
paths: &paths
3232
- "**/*.twig"
3333
- "composer.json"
34-
- "composer.lock"
35-
- "docker-compose.yml"
34+
- "compose.yaml"
3635
push:
3736
branches:
3837
- main
@@ -50,6 +49,15 @@ jobs:
5049
run: |
5150
docker network create frontend
5251
53-
- run: |
52+
- &composer_install
53+
name: Composer install
54+
run: |
55+
# Create a temporary composer file to install https://github.com/mglaman/composer-drupal-lenient before the real install needs it.
56+
docker compose run --rm --env COMPOSER=composer.lenient.json phpfpm composer init --no-interaction
57+
docker compose run --rm --env COMPOSER=composer.lenient.json phpfpm composer config --no-plugins allow-plugins.mglaman/composer-drupal-lenient true
58+
docker compose run --rm --env COMPOSER=composer.lenient.json phpfpm composer require mglaman/composer-drupal-lenient
59+
docker compose run --rm --env COMPOSER=composer.lenient.json phpfpm rm composer.lenient.*
5460
docker compose run --rm phpfpm composer install
61+
62+
- run: |
5563
docker compose run --rm phpfpm vendor/bin/twig-cs-fixer lint

‎Taskfile.yml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -104,12 +104,8 @@ tasks:
104104

105105
test:
106106
cmds:
107-
- docker compose run --env PHP_XDEBUG_MODE --env PHP_XDEBUG_WITH_REQUEST
108-
--env PHP_IDE_CONFIG --rm phpfpm vendor/bin/phpunit {{.CLI_ARGS}}
107+
- docker compose run --env PHP_XDEBUG_MODE --env PHP_XDEBUG_WITH_REQUEST --env PHP_IDE_CONFIG --rm phpfpm vendor/bin/phpunit {{.CLI_ARGS}}
109108

110109
xdebug:test:
111110
cmds:
112-
- PHP_XDEBUG_MODE=debug PHP_XDEBUG_WITH_REQUEST=yes
113-
PHP_IDE_CONFIG=serverName=localhost docker compose run --env
114-
PHP_XDEBUG_MODE --env PHP_XDEBUG_WITH_REQUEST --env PHP_IDE_CONFIG --rm
115-
phpfpm vendor/bin/phpunit {{.CLI_ARGS}}
111+
- PHP_XDEBUG_MODE=debug PHP_XDEBUG_WITH_REQUEST=yes PHP_IDE_CONFIG=serverName=localhost docker compose run --env PHP_XDEBUG_MODE --env PHP_XDEBUG_WITH_REQUEST --env PHP_IDE_CONFIG --rm phpfpm vendor/bin/phpunit {{.CLI_ARGS}}

‎composer.json‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,29 @@
1717
"drupal/system_stream_wrapper": "^2.1",
1818
"drush/drush": "^12 || ^13",
1919
"itk-dev/serviceplatformen": "^1.9",
20-
"os2forms/os2forms": "^5.0"
20+
"os2forms/os2forms": "dev-feature/add-first-middle-and-last-name-nemid-elements as 5.1.0",
21+
"os2web/os2web_datalookup": "dev-feature/fetch-first-middle-and-last-name as 3.1.0"
2122
},
2223
"require-dev": {
2324
"drupal/coder": "^8.3",
2425
"ergebnis/composer-normalize": "^2.50",
26+
"mglaman/composer-drupal-lenient": "^1.0",
2527
"mglaman/phpstan-drupal": "^2.0",
2628
"phpstan/extension-installer": "^1.4",
2729
"phpunit/phpunit": "^9.6",
2830
"vincentlanglet/twig-cs-fixer": "^3.13"
2931
},
3032
"repositories": [
33+
{
34+
"name": "os2web/os2web_datalookup",
35+
"type": "vcs",
36+
"url": "https://github.com/itk-dev/os2web_datalookup"
37+
},
38+
{
39+
"name": "os2forms/os2forms",
40+
"type": "vcs",
41+
"url": "https://github.com/itk-dev/os2forms"
42+
},
3143
{
3244
"type": "composer",
3345
"url": "https://packages.drupal.org/8"
@@ -45,12 +57,13 @@
4557
"allow-plugins": {
4658
"cweagans/composer-patches": true,
4759
"dealerdirect/phpcodesniffer-composer-installer": true,
60+
"drupal/core-composer-scaffold": false,
4861
"ergebnis/composer-normalize": true,
4962
"mglaman/composer-drupal-lenient": true,
5063
"phpstan/extension-installer": true,
5164
"simplesamlphp/composer-module-installer": false,
5265
"simplesamlphp/composer-xmlprovider-installer": false,
53-
"zaporylie/composer-drupal-optimizations": true
66+
"zaporylie/composer-drupal-optimizations": false
5467
}
5568
},
5669
"extra": {

‎src/Drush/Commands/ValidateXmlCommand.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
namespace Drupal\os2forms_fordelingskomponent\Drush\Commands;
66

7-
use Composer\Console\Input\InputOption;
87
use Drupal\Core\Entity\EntityTypeManagerInterface;
98
use Drupal\Core\Url;
109
use Drupal\os2forms_fordelingskomponent\Helper\FordelingskomponentHelper;
@@ -18,6 +17,7 @@
1817
use Symfony\Component\Console\Exception\InvalidArgumentException;
1918
use Symfony\Component\Console\Input\InputArgument;
2019
use Symfony\Component\Console\Input\InputInterface;
20+
use Symfony\Component\Console\Input\InputOption;
2121
use Symfony\Component\Console\Output\OutputInterface;
2222
use Symfony\Component\Console\Style\SymfonyStyle;
2323

‎src/Helper/FordelingskomponentHelper.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ public function checkFilesDelivered(
507507
}
508508
catch (\Exception $exception) {
509509
$this->logger->warning('Error checking file %filename: %message', $context + [
510-
'%filename' => $filename ?? NULL,
510+
'%filename' => $filename,
511511
'%message' => $exception->getMessage(),
512512
'exception' => $exception,
513513
]);

‎src/Helper/WebformHelperSF2900.php‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,13 @@ public function renderPreview(WebformHandlerSF2900 $handler, WebformSubmissionIn
127127
$distributionObject = NULL;
128128
$xml = new XmlRenderResult(
129129
template: '',
130-
context: [],
130+
context: [
131+
'submission' => [],
132+
'files' => [],
133+
'handler' => [
134+
'settings' => [],
135+
],
136+
],
131137
rendered: NULL,
132138
exception: NULL,
133139
);

‎src/Helper/XmlHelper.php‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,16 @@ public function render(string $template, array $context, bool $validateXml = TRU
7575

7676
/**
7777
* Get render context.
78+
*
79+
* @return array {
80+
* submission: array,
81+
* files: array,
82+
* handler: array{
83+
* settings: array
84+
* }
85+
* }
7886
*/
79-
public function getRenderContext(HandlerSettings $handlerSettings, WebformSubmissionInterface $submission, array $files) {
87+
public function getRenderContext(HandlerSettings $handlerSettings, WebformSubmissionInterface $submission, array $files): array {
8088
return [
8189
'submission' => $submission->toArray(TRUE),
8290
'files' => $files,

‎src/Model/XmlRenderResult.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,11 @@ public function __construct(
1818
* The context.
1919
*
2020
* @var array{
21-
* submission: array,
21+
* submission: array|WebformSubmissionInterface|null,
2222
* files: array,
23-
* handler: array,
23+
* handler: array{
24+
* settings: array,
25+
* },
2426
* }
2527
*/
2628
public array $context,

0 commit comments

Comments
 (0)