Skip to content

Commit 280f0e9

Browse files
authored
Merge pull request #593 from deguif/guard-file-link-filter
Use file_link filter only when available
2 parents d1f7e18 + 42526ed commit 280f0e9

File tree

4 files changed

+34
-33
lines changed

4 files changed

+34
-33
lines changed

.github/workflows/ci.yaml

+2-7
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,14 @@ jobs:
1818
fail-fast: false
1919
matrix:
2020
symfony-version:
21-
- '^4.4'
2221
- '^5.4'
2322
- '^6.4'
2423
php-version:
25-
- "7.4"
26-
- "8.0"
27-
- "8.1"
24+
- "8.3"
25+
- "8.4"
2826
dependencies:
2927
- "lowest"
3028
- "highest"
31-
exclude:
32-
- symfony-version: '^6.4'
33-
php-version: '7.4'
3429
steps:
3530
- name: "Checkout"
3631
uses: "actions/checkout@v2"

.github/workflows/coding-standards.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
matrix:
1616
php-version:
17-
- "7.4"
17+
- "8.4"
1818

1919
steps:
2020
- name: "Checkout"

Resources/views/Translate/messages.html.twig

+10-4
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,16 @@
3434
<h6>Sources</h6>
3535
<ul>
3636
{% for source in message.sources %}
37-
{%- set link = source.path|file_link(source.line) %}
38-
{%- if link %}<a href="{{ link }}" title="{{ source }}">{% else %}<span>{% endif %}
39-
<li class="jms-sources-list-item truncate-left">{{ source }}</li>
40-
{%- if link %}</a>{% else %}</span>{% endif %}
37+
{% guard filter file_link %}
38+
{%- set link = source.path|file_link(source.line) %}
39+
{%- if link %}<a href="{{ link }}" title="{{ source }}">{% else %}<span>{% endif %}
40+
<li class="jms-sources-list-item truncate-left">{{ source }}</li>
41+
{%- if link %}</a>{% else %}</span>{% endif %}
42+
{% else %}
43+
<span>
44+
<li class="jms-sources-list-item truncate-left">{{ source }}</li>
45+
</span>
46+
{% endguard %}
4147
{% endfor %}
4248
</ul>
4349
{% endif %}

composer.json

+21-21
Original file line numberDiff line numberDiff line change
@@ -21,35 +21,35 @@
2121
}
2222
],
2323
"require": {
24-
"php": "^7.4 || ^8.0",
25-
"nikic/php-parser": "^4.9 || ^5",
26-
"symfony/console": "^4.3 || ^5.4 || ^6.0",
27-
"symfony/expression-language": "^4.3 || ^5.4 || ^6.0",
28-
"symfony/framework-bundle": "^4.3 || ^5.4 || ^6.0",
29-
"symfony/config": "^4.3 || ^5.4 || ^6.2",
30-
"symfony/translation": "^4.3 || ^5.4 || ^6.0",
31-
"symfony/translation-contracts": "^1.1 || ^2.0 || ^3.0",
32-
"symfony/validator": "^4.3 || ^5.4 || ^6.0",
33-
"twig/twig": "^2.13.1 || ^3.0",
24+
"php": "^8.1",
25+
"nikic/php-parser": "^5",
26+
"symfony/console": "^5.4 || ^6.4",
27+
"symfony/expression-language": "^5.4 || ^6.4",
28+
"symfony/framework-bundle": "^5.4 || ^6.4",
29+
"symfony/config": "^5.4 || ^6.4",
30+
"symfony/translation": "^5.4 || ^6.4",
31+
"symfony/translation-contracts": "^2.0 || ^3.0",
32+
"symfony/validator": "^5.4 || ^6.4",
33+
"twig/twig": "^3.15",
3434
"psr/log": "^1.0 || ^2.0"
3535
},
3636
"require-dev": {
3737
"doctrine/annotations": "^1.11",
3838
"doctrine/coding-standard": "^8.2.1",
3939
"matthiasnoback/symfony-dependency-injection-test": "^4.1",
4040
"nyholm/nsa": "^1.0.1",
41-
"symfony/phpunit-bridge": "^4.4 || ^5.4 || ^6.4",
41+
"symfony/phpunit-bridge": "^5.4 || ^6.4",
4242
"sensio/framework-extra-bundle": "^6.2.4",
43-
"symfony/asset": "^4.4 || ^5.4 || ^6.4",
44-
"symfony/browser-kit": "^4.4 || ^5.4 || ^6.4",
45-
"symfony/css-selector": "^4.4 || ^5.4 || ^6.4",
46-
"symfony/filesystem": "^4.4 || ^5.4 || ^6.4",
47-
"symfony/form": "^4.4 || ^5.4 || ^6.4",
48-
"symfony/security-csrf": "^4.4 || ^5.4 || ^6.4",
49-
"symfony/templating": "^4.4 || ^5.4 || ^6.4",
50-
"symfony/property-access": "^4.4 || ^5.4 || ^6.4",
51-
"symfony/routing": "^4.4.15 || ^5.4 || ^6.4",
52-
"symfony/twig-bundle": "^4.4 || ^5.4 || ^6.4",
43+
"symfony/asset": "^5.4 || ^6.4",
44+
"symfony/browser-kit": "^5.4 || ^6.4",
45+
"symfony/css-selector": "^5.4 || ^6.4",
46+
"symfony/filesystem": "^5.4 || ^6.4",
47+
"symfony/form": "^5.4 || ^6.4",
48+
"symfony/security-csrf": "^5.4 || ^6.4",
49+
"symfony/templating": "^5.4 || ^6.4",
50+
"symfony/property-access": "^5.4 || ^6.4",
51+
"symfony/routing": "^5.4 || ^6.4",
52+
"symfony/twig-bundle": "^5.4 || ^6.4",
5353
"symfony/flex": "^1.19 || ^2.0"
5454
},
5555
"config": {

0 commit comments

Comments
 (0)