Refactor(web-twig): Apply more stricter comparison

* @see: https://twig.symfony.com/doc/2.x/tests/sameas.html
lmc-eu · Jun 11, 2023 · 75548bb · 75548bb
1 parent cd1927c
commit 75548bb
Show file tree

Hide file tree

Showing 21 changed files with 23 additions and 23 deletions.
diff --git a/packages/web-twig/src/Resources/components/Accordion/Accordion.twig b/packages/web-twig/src/Resources/components/Accordion/Accordion.twig
@@ -12,7 +12,7 @@
 {# Miscellaneous #}
 {%- set _styleProps = useStyleProps(props) -%}
 {%- set _classNames = [ _rootClassName, _styleProps.className ] -%}
-{%- set _mainPropsWithoutId = props | filter((value, prop) => prop != 'id') -%}
+{%- set _mainPropsWithoutId = props | filter((value, prop) => prop is not same as('id')) -%}
 
 <{{ _elementType }}
     {{ mainProps(_mainPropsWithoutId) }}

diff --git a/packages/web-twig/src/Resources/components/Accordion/AccordionContent.twig b/packages/web-twig/src/Resources/components/Accordion/AccordionContent.twig
@@ -20,7 +20,7 @@
 {%- set _styleProps = useStyleProps(props) -%}
 {%- set _collapseClassNames = [ _rootClassName, _isOpenClassName ] -%}
 {%- set _contentClassNames = [ _accordionClassName, _styleProps.className ] -%}
-{%- set _mainPropsWithoutId = props | filter((value, prop) => prop != 'id') -%}
+{%- set _mainPropsWithoutId = props | filter((value, prop) => prop is not same as('id')) -%}
 
 <div
     {{ mainProps(_mainPropsWithoutId) }}

diff --git a/packages/web-twig/src/Resources/components/Accordion/AccordionHeader.twig b/packages/web-twig/src/Resources/components/Accordion/AccordionHeader.twig
@@ -21,7 +21,7 @@
 {%- set _styleProps = useStyleProps(props) -%}
 {%- set _ariaExpanded = _isOpen ? 'true' : 'false' -%}
 {%- set _classNames = [ _rootClassName, _styleProps.className ] -%}
-{%- set _mainPropsWithoutId = props | filter((value, prop) => prop != 'id') -%}
+{%- set _mainPropsWithoutId = props | filter((value, prop) => prop is not same as('id')) -%}
 
 <{{ _elementType }}
     {{ mainProps(_mainPropsWithoutId) }}

diff --git a/packages/web-twig/src/Resources/components/Accordion/AccordionItem.twig b/packages/web-twig/src/Resources/components/Accordion/AccordionItem.twig
@@ -12,7 +12,7 @@
 {# Miscellaneous #}
 {%- set _styleProps = useStyleProps(props) -%}
 {%- set _classNames = [ _rootClassName, _styleProps.className ] -%}
-{%- set _mainPropsWithoutId = props | filter((value, prop) => prop != 'id') -%}
+{%- set _mainPropsWithoutId = props | filter((value, prop) => prop is not same as('id')) -%}
 
 <{{ _elementType }}
     {{ mainProps(_mainPropsWithoutId) }}

diff --git a/packages/web-twig/src/Resources/components/Breadcrumbs/Breadcrumbs.twig b/packages/web-twig/src/Resources/components/Breadcrumbs/Breadcrumbs.twig
@@ -16,20 +16,20 @@
     {%- if _items|length > 0 -%}
         <ol>
             {% for item in _items %}
-                {% if loop.index is same as(_items|length - 1) and _goBackTitle != '' %}
+                {% if loop.index is same as(_items|length - 1) and _goBackTitle is not same as('') %}
                     <li class="d-tablet-none">
                         <Icon name="chevron-left" />
                         <Link href="{{ item.url }}" color="primary" isUnderlined>{{ _goBackTitle }}</Link>
                     </li>
                 {% endif %}
                 <li class="d-none d-tablet-flex">
-                    {% if loop.index0 != 0 %}
+                    {% if loop.index0 is not same as(0) %}
                         <Icon name="chevron-right" />
                     {% endif %}
                     <Link
                         href="{{ item.url }}"
                         color="{{ loop.last ? 'secondary' : 'primary' }}"
-                        isUnderlined="{{ loop.last != true }}"
+                        isUnderlined="{{ loop.last is not same as(true) }}"
                         aria-current="{{ loop.last ? 'page' : 'false' }}"
                     >
                         {{ item.title }}

diff --git a/packages/web-twig/src/Resources/components/CheckboxField/CheckboxField.twig b/packages/web-twig/src/Resources/components/CheckboxField/CheckboxField.twig
@@ -39,7 +39,7 @@
 {%- set _styleProps = useStyleProps(props) -%}
 {%- set _classNames = [ _rootClassName, _rootDisabledClassName, _rootItemClassName, _rootValidationStateClassName, _styleProps.className ] -%}
 {%- set _labelClassName = [ _labelClassName, _labelHiddenClassName, _labelRequiredClassName ] -%}
-{%- set _mainPropsWithoutId = props | filter((value, prop) => prop != 'id') -%}
+{%- set _mainPropsWithoutId = props | filter((value, prop) => prop is not same as('id')) -%}
 
 {# Deprecations #}
 {% if _validationState is same as('error') %}

diff --git a/packages/web-twig/src/Resources/components/Collapse/Collapse.twig b/packages/web-twig/src/Resources/components/Collapse/Collapse.twig
@@ -19,7 +19,7 @@
 {# Miscellaneous #}
 {%- set _styleProps = useStyleProps(props) -%}
 {%- set _classNames = [ _rootClassName, _isOpenClassName, _styleProps.className ] -%}
-{%- set _mainPropsWithoutId = props | filter((value, prop) => prop != 'id') -%}
+{%- set _mainPropsWithoutId = props | filter((value, prop) => prop is not same as('id')) -%}
 
 <{{ _elementType }}
     {{ mainProps(_mainPropsWithoutId) }}

diff --git a/packages/web-twig/src/Resources/components/FileUploader/FileUploaderAttachment.twig b/packages/web-twig/src/Resources/components/FileUploader/FileUploaderAttachment.twig
@@ -11,7 +11,7 @@
 {# Miscellaneous #}
 {%- set _styleProps = useStyleProps(props) -%}
 {%- set _classNames = [ _rootClassName, _styleProps.className ] -%}
-{%- set _mainPropsWithoutReservedAttributes = props | filter((value, prop) => prop != 'data-spirit-populate-field') -%}
+{%- set _mainPropsWithoutReservedAttributes = props | filter((value, prop) => prop is not same as('data-spirit-populate-field')) -%}
 
 <li
     {{ mainProps(_mainPropsWithoutReservedAttributes) }}

diff --git a/packages/web-twig/src/Resources/components/Icon/Icon.twig b/packages/web-twig/src/Resources/components/Icon/Icon.twig
@@ -9,7 +9,7 @@
 
 {# Miscellaneous #}
 {%- set _styleProps = useStyleProps(props) -%}
-{%- set _mainProps = props | filter((value, prop) => prop != 'ariaHidden') | merge({
+{%- set _mainProps = props | filter((value, prop) => prop is not same as('ariaHidden')) | merge({
     'aria-hidden': _ariaHidden ? 'true' : 'false',
 }) -%}
 

diff --git a/packages/web-twig/src/Resources/components/Modal/Modal.twig b/packages/web-twig/src/Resources/components/Modal/Modal.twig
@@ -16,7 +16,7 @@
 {# Miscellaneous #}
 {%- set _styleProps = useStyleProps(props) -%}
 {%- set _classNames = [ _rootClassName, _styleProps.className ] -%}
-{%- set _mainPropsWithoutId = props | filter((value, prop) => prop != 'id') -%}
+{%- set _mainPropsWithoutId = props | filter((value, prop) => prop is not same as('id')) -%}
 
 {# Deprecations #}
 {% deprecated 'Modal: The "Modal" component is deprecated, it will be replaced by implementation of "ModalComposed".' %}

diff --git a/packages/web-twig/src/Resources/components/Modal/ModalComposed.twig b/packages/web-twig/src/Resources/components/Modal/ModalComposed.twig
@@ -14,7 +14,7 @@
 {# Miscellaneous #}
 {%- set _styleProps = useStyleProps(props) -%}
 {%- set _classNames = [ _rootClassName, _rootComposedClassName, _styleProps.className ] -%}
-{%- set _mainPropsWithoutId = props | filter((value, prop) => prop != 'id') -%}
+{%- set _mainPropsWithoutId = props | filter((value, prop) => prop is not same as('id')) -%}
 
 {# Deprecations #}
 {% deprecated 'ModalComposed: The "ModalComposed" component is deprecated, it will be renamed to "Modal".' %}

diff --git a/packages/web-twig/src/Resources/components/RadioField/RadioField.twig b/packages/web-twig/src/Resources/components/RadioField/RadioField.twig
@@ -35,7 +35,7 @@
 {%- set _styleProps = useStyleProps(props) -%}
 {%- set _classNames = [ _rootClassName, _rootDisabledClassName, _rootItemClassName, _rootValidationStateClassName, _styleProps.className ] -%}
 {%- set _labelClassName = [ _labelClassName, _labelHiddenClassName ] -%}
-{%- set _mainPropsWithoutId = props | filter((value, prop) => prop != 'id') -%}
+{%- set _mainPropsWithoutId = props | filter((value, prop) => prop is not same as('id')) -%}
 {%- set _allowedInputAttributes = [ 'autocomplete' ] -%}
 
 <label {{ _labelForAttr | raw }} {{ mainProps(_mainPropsWithoutId) }} {{ styleProp(_styleProps) }} {{ classProp(_classNames) }}>

diff --git a/packages/web-twig/src/Resources/components/ScrollView/ScrollView.twig b/packages/web-twig/src/Resources/components/ScrollView/ScrollView.twig
@@ -18,7 +18,7 @@
 {%- set _styleProps = useStyleProps(props) -%}
 {%- set _classNames = [ _rootClassName, _rootDirectionClassName, _rootScrollbarDisabledClassName, _styleProps.className ] -%}
 {%- set _indicatorsClassNames = [ _indicatorsClassName, _indicatorsShadowsClassName, _indicatorsBordersClassName ] -%}
-{%- set _mainPropsWithoutReservedAttributes = props | filter((value, prop) => prop != 'data-spirit-direction') -%}
+{%- set _mainPropsWithoutReservedAttributes = props | filter((value, prop) => prop is not same as('data-spirit-direction')) -%}
 
 <div
     {{ mainProps(_mainPropsWithoutReservedAttributes) }}

diff --git a/packages/web-twig/src/Resources/components/Select/Select.twig b/packages/web-twig/src/Resources/components/Select/Select.twig
@@ -35,7 +35,7 @@
 {%- set _styleProps = useStyleProps(props) -%}
 {%- set _classNames = [ _rootClassName, _rootFluidClassName, _rootDisabledClassName, _rootValidationStateClassName, _styleProps.className ] -%}
 {%- set _labelClassName = [ _labelClassName, _labelHiddenClassName, _labelRequiredClassName ] -%}
-{%- set _mainPropsWithoutId = props | filter((value, prop) => prop != 'id') -%}
+{%- set _mainPropsWithoutId = props | filter((value, prop) => prop is not same as('id')) -%}
 
 <div {{ mainProps(_mainPropsWithoutId) }} {{ styleProp(_styleProps) }} {{ classProp(_classNames) }}>
     <label for="{{ _id }}" {{ classProp(_labelClassName) }}>{{ _label }}</label>

diff --git a/packages/web-twig/src/Resources/components/Spinner/Spinner.twig b/packages/web-twig/src/Resources/components/Spinner/Spinner.twig
@@ -10,7 +10,7 @@
 {# Miscellaneous #}
 {%- set _styleProps = useStyleProps(props) -%}
 {%- set _classNames = [ _rootClassName, _rootAnimationClassName, _styleProps.className ] -%}
-{%- set _mainPropsWithoutLocal = props | filter((value, prop) => prop != 'color' and prop != 'class') -%}
+{%- set _mainPropsWithoutLocal = props | filter((value, prop) => prop is not same as('color') and prop is not same as('class')) -%}
 
 {% embed "@spirit/icon.twig" with { props: {
     name: 'spinner',

diff --git a/packages/web-twig/src/Resources/components/Tooltip/Tooltip.twig b/packages/web-twig/src/Resources/components/Tooltip/Tooltip.twig
@@ -20,7 +20,7 @@
 {# Miscellaneous #}
 {%- set _styleProps = useStyleProps(props) -%}
 {%- set _classNames = [ _rootClassName, _rootPlacementClassName, _rootDismissibleClassName, _styleProps.className ] -%}
-{%- set _mainPropsWithoutId = props | filter((value, prop) => prop != 'id') -%}
+{%- set _mainPropsWithoutId = props | filter((value, prop) => prop is not same as('id')) -%}
 
 <div
     {{ mainProps(_mainPropsWithoutId) }}

diff --git a/packages/web-twig/src/Resources/partials/inputProps.twig b/packages/web-twig/src/Resources/partials/inputProps.twig
@@ -1 +1 @@
-{%- for propName, propValue in transferringAttributes  %}{%- if propValue is not null and propValue != '' %} {{ propName }}="{{ propValue }}"{% endif -%}{% endfor -%}
+{%- for propName, propValue in transferringAttributes  %}{%- if propValue is not null and propValue is not same as('') %} {{ propName }}="{{ propValue }}"{% endif -%}{% endfor -%}
diff --git a/packages/web-twig/src/Resources/partials/mainProps.twig b/packages/web-twig/src/Resources/partials/mainProps.twig
@@ -1 +1 @@
-{%- if id != null %} id="{{ id }}"{% endif -%}{%- for propName, propValue in transferringAttributes %}{%- if propValue is not null and propValue != '' %} {{ propName }}="{{ propValue }}"{% endif -%}{% endfor -%}
+{%- if id is not same as(null) %} id="{{ id }}"{% endif -%}{%- for propName, propValue in transferringAttributes %}{%- if propValue is not null and propValue is not same as('') %} {{ propName }}="{{ propValue }}"{% endif -%}{% endfor -%}
diff --git a/packages/web-twig/src/Resources/partials/props.twig b/packages/web-twig/src/Resources/partials/props.twig
@@ -1 +1 @@
-{%- if id != null %} id="{{ id }}"{% endif -%}{%- for dataPropName, dataPropValue in dataAttributes  %} {{ dataPropName }}="{{ dataPropValue }}"{% endfor -%}
+{%- if id is not same as(null) %} id="{{ id }}"{% endif -%}{%- for dataPropName, dataPropValue in dataAttributes  %} {{ dataPropName }}="{{ dataPropValue }}"{% endfor -%}
diff --git a/packages/web-twig/src/Resources/partials/styleProp.twig b/packages/web-twig/src/Resources/partials/styleProp.twig
@@ -1 +1 @@
-{%- if style != null %}style="{{ style }}"{% endif -%}
+{%- if style is not same as(null) %}style="{{ style }}"{% endif -%}
diff --git a/packages/web-twig/tests/components-fixtures/breadcrumbsCustom.twig b/packages/web-twig/tests/components-fixtures/breadcrumbsCustom.twig
@@ -30,7 +30,7 @@
                     <Link
                         href="{{ item.url }}"
                         color="{{ loop.last ? 'secondary' : 'primary' }}"
-                        isUnderlined="{{ loop.last != true }}"
+                        isUnderlined="{{ loop.last is not same as(true) }}"
                         aria-current="{{ loop.last ? 'page' : 'false' }}"
                     >{{ item.title }}</Link>
                 </li>