Skip to content

Commit 64369d3

Browse files
committed
Merge branch 'master' into feat-djlint-twig-formatter
2 parents ba8db0e + ee434aa commit 64369d3

File tree

21 files changed

+326
-127
lines changed

21 files changed

+326
-127
lines changed

.github/workflows/djlint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Twig Linting and Formatting
1+
name: Twig Linting
22

33
on:
44
pull_request:
@@ -16,7 +16,7 @@ on:
1616

1717
jobs:
1818
djlint:
19-
name: djLint - Twig Linter & Formatter
19+
name: djLint - Twig Linter
2020
runs-on: ubuntu-latest
2121

2222
steps:

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494
- name: Setup PHP with PECL extension
9595
uses: shivammathur/setup-php@v2
9696
with:
97-
php-version: ${{ matrix.php-version }}
97+
php-version: '8.3'
9898
extensions: curl
9999

100100
- name: Install

composer.lock

Lines changed: 82 additions & 68 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/SDK/Language.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,10 @@ abstract public function getParamDefault(array $param): string;
7070

7171
/**
7272
* @param array $param
73+
* @param string $lang Optional language variant (for multi-language SDKs)
7374
* @return string
7475
*/
75-
abstract public function getParamExample(array $param): string;
76+
abstract public function getParamExample(array $param, string $lang = ''): string;
7677

7778
/**
7879
* @param string $key

src/SDK/Language/CLI.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,9 +377,10 @@ public function getTypeName(array $parameter, array $spec = []): string
377377

378378
/**
379379
* @param array $param
380+
* @param string $lang
380381
* @return string
381382
*/
382-
public function getParamExample(array $param): string
383+
public function getParamExample(array $param, string $lang = ''): string
383384
{
384385
$type = $param['type'] ?? '';
385386
$example = $param['example'] ?? '';

src/SDK/Language/Dart.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,9 +234,10 @@ public function getParamDefault(array $param): string
234234

235235
/**
236236
* @param array $param
237+
* @param string $lang
237238
* @return string
238239
*/
239-
public function getParamExample(array $param): string
240+
public function getParamExample(array $param, string $lang = ''): string
240241
{
241242
$type = $param['type'] ?? '';
242243
$example = $param['example'] ?? '';

src/SDK/Language/Deno.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,9 +181,10 @@ public function getTypeName(array $parameter, array $spec = []): string
181181

182182
/**
183183
* @param array $param
184+
* @param string $lang
184185
* @return string
185186
*/
186-
public function getParamExample(array $param): string
187+
public function getParamExample(array $param, string $lang = ''): string
187188
{
188189
$type = $param['type'] ?? '';
189190
$example = $param['example'] ?? '';

src/SDK/Language/DotNet.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,9 +261,10 @@ public function getParamDefault(array $param): string
261261

262262
/**
263263
* @param array $param
264+
* @param string $lang
264265
* @return string
265266
*/
266-
public function getParamExample(array $param): string
267+
public function getParamExample(array $param, string $lang = ''): string
267268
{
268269
$type = $param['type'] ?? '';
269270
$example = $param['example'] ?? '';

src/SDK/Language/Go.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,9 +238,10 @@ public function getParamDefault(array $param): string
238238

239239
/**
240240
* @param array $param
241+
* @param string $lang
241242
* @return string
242243
*/
243-
public function getParamExample(array $param): string
244+
public function getParamExample(array $param, string $lang = ''): string
244245
{
245246
$type = $param['type'] ?? '';
246247
$example = $param['example'] ?? '';

src/SDK/Language/GraphQL.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,10 @@ public function getParamDefault(array $param): string
128128

129129
/**
130130
* @param array $param
131+
* @param string $lang
131132
* @return string
132133
*/
133-
public function getParamExample(array $param): string
134+
public function getParamExample(array $param, string $lang = ''): string
134135
{
135136
$type = $param['type'] ?? '';
136137
$example = $param['example'] ?? '';

0 commit comments

Comments
 (0)