Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Migration 5.0 #12

Merged
merged 11 commits into from
Apr 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,13 @@ root = true
[*]
charset = utf-8
end_of_line = LF
indent_size = 2
indent_size = 4
trim_trailing_whitespace = true
insert_final_newline = true
indent_style = tab

[*.md]
trim_trailing_whitespace = false

[*.{yml,yaml,php,html,twig,js,mjs,cjs,ts,css,json}]
indent_size = 4

[*.{yml,yaml}]
[*.{yml,yaml,php,twig,js}]
indent_style = space
9 changes: 8 additions & 1 deletion .github/workflows/coding-standards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: "8.1"
tools: phpunit-bridge
extensions: mbstring, xml, ctype, iconv, intl
- name: Cache Composer dependencies
uses: actions/cache@v2
with:
Expand All @@ -21,8 +27,9 @@ jobs:
- name: Install PHP dependencies (composer install)
uses: php-actions/composer@v6
with:
php_version: "8.0"
php_version: "8.1"
php_extensions: xsl intl
memory_limit: -1
- name: Remove auth.json file
run: rm -f $GITHUB_WORKSPACE/auth.json
- name: Restore configs overwritten by the eckinox/eckinox-cs install
Expand Down
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
/vendor/
.php-cs-fixer.cache
node_modules
.php-cs-fixer.cache
.DS_Store
composer.lock
.twig-cs-fixer.cache
28 changes: 17 additions & 11 deletions .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,29 @@
->exclude('var')
->exclude('vendor')
->exclude('node_modules')
->notName('Configuration.php')
->in(__DIR__);

$config = new PhpCsFixer\Config();
return $config->setRules([
'@PhpCsFixer' => true,
'@Symfony' => true,
'@PER-CS' => true,
'@DoctrineAnnotation' => true,
'php_unit_test_class_requires_covers' => false,
'php_unit_internal_class' => false,
'heredoc_to_nowdoc' => false,
'string_implicit_backslashes' => false,
'explicit_indirect_variable' => false,
'explicit_string_variable' => false,
'combine_consecutive_issets' => false,
'combine_consecutive_unsets' => false,
'doctrine_annotation_array_assignment' => false,
'yoda_style' => ['equal' => false, 'identical' => false],
'increment_style' => ['style' => 'post'],
'return_assignment' => false,
'heredoc_to_nowdoc' => false,
'php_unit_internal_class' => false,
'php_unit_test_class_requires_covers' => false,
'multiline_whitespace_before_semicolons' => false,
'method_argument_space' => false,
'single_quote' => false,
'escape_implicit_backslashes' => false,
'explicit_indirect_variable' => false,
'method_chaining_indentation' => false,
'concat_space' => false,
'single_quote' => false,
'method_argument_space' => ['on_multiline' => 'ignore'],
'trailing_comma_in_multiline' => ['elements' => ['arrays']],
])
->setIndent("\t")
->setFinder($finder);
114 changes: 51 additions & 63 deletions .phpmd.xml
Original file line number Diff line number Diff line change
@@ -1,72 +1,60 @@
<?xml version="1.0"?>
<ruleset name="Eckinox PHPMD"
xmlns="http://pmd.sf.net/ruleset/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0
<ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
name="Eckinox PHPMD"
xmlns="http://pmd.sf.net/ruleset/1.0.0"
xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0
http://pmd.sf.net/ruleset_xml_schema.xsd"
xsi:noNamespaceSchemaLocation="
xsi:noNamespaceSchemaLocation="
http://pmd.sf.net/ruleset_xml_schema.xsd">
<description>
Eckinox's PHPMD Ruleset
</description>
<description>
Eckinox's PHPMD Ruleset
</description>

<!-- Import entire rulesets -->
<rule ref="rulesets/controversial.xml" />
<rule ref="rulesets/unusedcode.xml" />
<!-- Import entire rulesets -->
<rule ref="rulesets/controversial.xml"/>

<!-- Import codesize ruleset with common configs for Symfony entities -->
<rule ref="rulesets/codesize.xml">
<exclude name="TooManyMethods" />
<exclude name="TooManyPublicMethods" />
</rule>
<rule ref="rulesets/codesize.xml/TooManyMethods">
<properties>
<property name="ignorepattern" value="(^(set|get|add|remove))i" />
</properties>
</rule>
<rule ref="rulesets/codesize.xml/TooManyPublicMethods">
<properties>
<property name="ignorepattern" value="(^(set|get|add|remove))i" />
</properties>
</rule>
<rule ref="rulesets/unusedcode.xml">
<exclude name="UnusedFormalParameter"/>
</rule>

<!-- Import cleancode ruleset with a few allowances -->
<rule ref="rulesets/cleancode.xml">
<exclude name="IfStatementAssignment" />
<exclude name="BooleanArgumentFlag" />
<exclude name="ElseExpression" />
<exclude name="StaticAccess" />
</rule>
<!-- Import codesize ruleset with common configs for Symfony entities -->
<rule ref="rulesets/codesize.xml">
<exclude name="CyclomaticComplexity"/>
<exclude name="NPathComplexity"/>
<exclude name="ExcessiveParameterList"/>
<exclude name="ExcessivePublicCount"/>
<exclude name="TooManyFields"/>
<exclude name="TooManyMethods"/>
<exclude name="TooManyPublicMethods"/>
<exclude name="ExcessiveClassComplexity"/>
<exclude name="ExcessiveMethodLength"/>
</rule>
<rule ref="rulesets/codesize.xml/ExcessiveMethodLength">
<properties>
<property name="minimum" value="200"/>
</properties>
</rule>

<!-- Import design ruleset with higher CouplingBetweenObjects limit -->
<rule ref="rulesets/design.xml">
<exclude name="CouplingBetweenObjects" />
</rule>
<rule ref="rulesets/design.xml/CouplingBetweenObjects">
<properties>
<property name="maximum" value="20" />
</properties>
</rule>
<!-- Import cleancode ruleset with a few allowances -->
<rule ref="rulesets/cleancode.xml">
<exclude name="IfStatementAssignment"/>
<exclude name="BooleanArgumentFlag"/>
<exclude name="ElseExpression"/>
<exclude name="StaticAccess"/>
<exclude name="MissingImport"/>
</rule>

<!-- Import naming ruleset with common configs for Symfony -->
<rule ref="rulesets/naming.xml">
<exclude name="ShortVariable"/>
<exclude name="LongVariable"/>
<exclude name="ShortMethodName"/>
</rule>
<rule ref="rulesets/naming.xml/ShortVariable">
<properties>
<property name="exceptions" value="id,i,em" />
</properties>
</rule>
<rule ref="rulesets/naming.xml/LongVariable">
<properties>
<property name="maximum" value="30" />
</properties>
</rule>
<rule ref="rulesets/naming.xml/ShortMethodName">
<properties>
<property name="exceptions" value="up,down" />
</properties>
</rule>
<!-- Import design ruleset with higher CouplingBetweenObjects limit -->
<rule ref="rulesets/design.xml">
<exclude name="NumberOfChildren"/>
<exclude name="CouplingBetweenObjects"/>
</rule>

<!-- Import naming ruleset with common configs for Symfony -->
<rule ref="rulesets/naming.xml">
<exclude name="LongClassName"/>
<exclude name="ShortVariable"/>
<exclude name="LongVariable"/>
<exclude name="ShortMethodName"/>
</rule>
</ruleset>
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
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ class MyFormType extends AbstractType
'entry_type' => AddressType::class,
'entry_options' => [
'data_class' => Address::class,
'api' => 'addressComplete',
'api' => 'addressComplete',
],
'by_reference' => false,
])
Expand All @@ -104,6 +104,7 @@ Pour utiliser le champ `AddressAutocompleteType` dans vos `FormType`, vous devez
3. Ajouter les paramètres désirés:
1. Il est recommandé de désactiver l'autocomplete du champ pour éviter que les propositions du navigateur passent par-dessus les propositions d'autocomplete. Vous n'avez qu'à ajouter l'attribut suivant au champ: `'autocomplete' => uniqid('noautocomplete')`.
2. Il est possible de passer un paramètre `api` pour choisir l'API à utiliser. Les choix disponibles sont: `addressComplete` ou `googlePlaces`. Si aucun API est spécifié, l'api de Poste Canada "Address Complete" sera utilisé par défaut.
3. Ajouter, au besoin l'option `parent` qui sert à définir un sélecteur JS valide qui sera utilisé à la place du `parentNode`. Utile si vous voulez remplir les informations de l'autocomplete sur des champs qui ne sont pas à l'intérieur du parent immédiat. Exemple: `.section-wrapper.geo.card`

Voici un exemple:
```php
Expand All @@ -124,6 +125,8 @@ class AddressType extends AbstractType
'autocomplete' => uniqid('noautocomplete'),
],
'api' => 'addressComplete', // addressComplete || googlePlaces
'parent' => '.section-wrapper.geo.card', // Optionnel, par défaut le parent immédiat

])
->add('city', TextType::class)
->add('province', TextType::class)
Expand Down
18 changes: 10 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,18 @@
],
"minimum-stability": "stable",
"require": {
"php": ">=8.0",
"symfony/form": "5.4.*",
"twig/twig": "^2.12|^3.0",
"symfony/http-client": "5.4.*",
"symfony/framework-bundle": "5.4.*",
"doctrine/orm": "^2.8",
"symfony/serializer": "5.4.*"
"php": ">=8.1.10",
"doctrine/orm": "^2.19",
"symfony/form": "^5.4|^6.0",
"symfony/framework-bundle": "^5.4|^6.0",
"symfony/http-client": "^5.4|^6.0",
"symfony/serializer": "^5.4|^6.0",
"symfony/translation": "^5.4|^6.0",
"symfony/validator": "^5.4|^6.0",
"twig/twig": "^3.8"
},
"require-dev": {
"eckinox/eckinox-cs": "^1.6"
"eckinox/eckinox-cs": "^3.0"
},
"repositories": [
],
Expand Down
Loading
Loading