Skip to content
Snippets Groups Projects
Commit 74c8d180 authored by Sviatoslav Smovdyr's avatar Sviatoslav Smovdyr
Browse files

Merge branch '3483831-2.0.0-rc1-adopt-vincentlanglettwig-cs-fixer' into '2.0.x'

Issue #3483831 by smovs, pdureau: Adopt vincentlanglet/twig-cs-fixer for Twig coding standards

See merge request !298
parents 24b163c2 14ed309d
No related branches found
No related tags found
No related merge requests found
Pipeline #366551 passed
......@@ -39,8 +39,32 @@ include:
paths:
- phpmd-quality-report.json
.twig-lint-base:
stage: validate
before_script:
- composer require --dev vincentlanglet/twig-cs-fixer
script:
- vendor/bin/twig-cs-fixer lint --config=$_WEB_ROOT/modules/custom/$CI_PROJECT_NAME/.twig-cs-fixer.php $_WEB_ROOT/modules/custom/$CI_PROJECT_NAME
rules:
- changes:
- "**/*.twig"
- if: '$CI_PIPELINE_SOURCE == "push"'
allow_failure: false
artifacts:
expose_as: twig-lint
when: always
expire_in: 6 mos
reports:
codequality: twig-lint-quality-report.xml
name: artifacts-$CI_PIPELINE_ID-$CI_JOB_NAME_SLUG
paths:
- twig-lint-quality-report.xml
phpmd:
extends: .phpmd-base
twig-lint:
extends: .twig-lint-base
composer-lint:
allow_failure: false
cspell:
......
<?php
$ruleset = new TwigCsFixer\Ruleset\Ruleset();
// Add a default standard.
$ruleset->addStandard(new TwigCsFixer\Standard\TwigCsFixer());
// Add some specific rules.
$ruleset->addRule(new TwigCsFixer\Rules\File\FileExtensionRule());
$config = new TwigCsFixer\Config\Config();
$config->setRuleset($ruleset);
return $config;
......@@ -5,7 +5,7 @@
*/
#}
{% if groups is not empty %}
{{ include('ui-patterns-overview-quicklinks.html.twig', {groups: groups}, with_context=false) }}
{{ include('ui-patterns-overview-quicklinks.html.twig', {groups: groups}, with_context: false) }}
<hr>
{% for components in groups %}
{% for component in components %}
......@@ -14,10 +14,10 @@
<a href="{{ url('ui_patterns_library.single', {provider: component.provider, machineName: component.machineName}) }}"
class="component__link">{{ component.name }}</a>
</h2>
{{ include('ui-patterns-component-metadata.html.twig', {component: component}, with_context=false) }}
{{ include('ui-patterns-component-table.html.twig', {component: component}, with_context=false) }}
{{ include('ui-patterns-component-metadata.html.twig', {component: component}, with_context: false) }}
{{ include('ui-patterns-component-table.html.twig', {component: component}, with_context: false) }}
{% if component.stories %}
{{ include('ui-patterns-stories-compact.html.twig', {component: component}, with_context=false) }}
{{ include('ui-patterns-stories-compact.html.twig', {component: component}, with_context: false) }}
{% endif %}
</div>
{% endfor %}
......
......@@ -6,10 +6,10 @@
#}
{% if component is not empty %}
<div class="ui_patterns_component">
{{ include('ui-patterns-component-metadata.html.twig', {component: component}, with_context=false) }}
{{ include('ui-patterns-component-table.html.twig', {component: component}, with_context=false) }}
{{ include('ui-patterns-component-metadata.html.twig', {component: component}, with_context: false) }}
{{ include('ui-patterns-component-table.html.twig', {component: component}, with_context: false) }}
{% if component.stories %}
{{ include('ui-patterns-stories-full.html.twig', {component: component}, with_context=false) }}
{{ include('ui-patterns-stories-full.html.twig', {component: component}, with_context: false) }}
{% endif %}
</div>
{% endif %}
{% set variant = variant|default('') %}
<div{{ attributes.addClass(['ui-patterns-test-component', 'ui-patterns-test-component-variant-' ~ variant ]) }}>
<div{{ attributes.addClass(['ui-patterns-test-component', 'ui-patterns-test-component-variant-' ~ variant]) }}>
<div class="ui-patterns-props-string">
{{ string }}
</div>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment