Skip to content

Commit

Permalink
feat: Update Eckinox-CS to version 3
Browse files Browse the repository at this point in the history
  • Loading branch information
Emma1987 committed Apr 17, 2024
1 parent 2200c00 commit d570f8e
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ indent_style = tab
[*.md]
trim_trailing_whitespace = false

[*.{yml,yaml,php}]
[*.{yml,yaml,php,twig,js}]
indent_style = space
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ node_modules
.php-cs-fixer.cache
.DS_Store
composer.lock
.twig-cs-fixer.cache
5 changes: 3 additions & 2 deletions .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
return $config->setRules([
'@PhpCsFixer' => true,
'@Symfony' => true,
'@PER' => true,
'@PER-CS' => true,
'@DoctrineAnnotation' => true,
'php_unit_test_class_requires_covers' => false,
'php_unit_internal_class' => false,
'heredoc_to_nowdoc' => false,
'escape_implicit_backslashes' => false,
'string_implicit_backslashes' => false,
'explicit_indirect_variable' => false,
'explicit_string_variable' => false,
'combine_consecutive_issets' => false,
Expand All @@ -27,5 +27,6 @@
'concat_space' => false,
'single_quote' => false,
'method_argument_space' => ['on_multiline' => 'ignore'],
'trailing_comma_in_multiline' => ['elements' => ['arrays']],
])
->setFinder($finder);
11 changes: 11 additions & 0 deletions .twig-cs-fixer.dist.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?php

$ruleset = new TwigCsFixer\Ruleset\Ruleset();
$ruleset->addStandard(new TwigCsFixer\Standard\TwigCsFixer());
$ruleset->removeRule(TwigCsFixer\Rules\Whitespace\BlankEOFRule::class);

$config = new TwigCsFixer\Config\Config();
$config->allowNonFixableRules();
$config->setRuleset($ruleset);

return $config;
2 changes: 1 addition & 1 deletion DEV/cs/twigcs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ if [ -d "${BASEDIR}/templates" ]; then
bin/console lint:twig templates
fi

vendor/friendsoftwig/twigcs/bin/twigcs templates
vendor/bin/twig-cs-fixer lint templates
fi
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"twig/twig": "^3.8"
},
"require-dev": {
"eckinox/eckinox-cs": "^2.0"
"eckinox/eckinox-cs": "^3.0"
},
"repositories": [
],
Expand Down
24 changes: 12 additions & 12 deletions templates/form/address_autocomplete.html.twig
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{%- block eckinox_address_autocomplete_widget -%}
<address-autocomplete class="{{ form.vars.errors|length ? 'is-invalid' : '' }}" data-api="{{ api }}" data-parent="{{ parent }}">
<input type="text" class="form-control {{ form.vars.errors|length ? 'is-invalid' : '' }}" {{ block('widget_attributes') }} {% if value is not empty %}value="{{ value }}" {% endif %}/>
<div class="autocomplete-choices-wrapper">
<div class="autocomplete-choices list-group"></div>
<div class="loading-overlay" style="display: none;">
<div class="spinner-border">
<span class="sr-only">Loading...</span>
</div>
</div>
</div>
</address-autocomplete>
<script type="module" src="{{ asset("bundles/eckinoxaddress/js/widgets/address-autocomplete.js") }}"></script>
<address-autocomplete class="{{ form.vars.errors|length ? 'is-invalid' : '' }}" data-api="{{ api }}" data-parent="{{ parent }}">
<input type="text" class="form-control {{ form.vars.errors|length ? 'is-invalid' : '' }}" {{ block('widget_attributes') }} {% if value is not empty %}value="{{ value }}" {% endif %}/>
<div class="autocomplete-choices-wrapper">
<div class="autocomplete-choices list-group"></div>
<div class="loading-overlay" style="display: none;">
<div class="spinner-border">
<span class="sr-only">Loading...</span>
</div>
</div>
</div>
</address-autocomplete>
<script type="module" src="{{ asset("bundles/eckinoxaddress/js/widgets/address-autocomplete.js") }}"></script>
{%- endblock eckinox_address_autocomplete_widget -%}

0 comments on commit d570f8e

Please sign in to comment.