Merge branch 'Sylius:2.0' into 2.0

CHANGELOG-2.0.md

@@ -1,5 +1,48 @@
 # CHANGELOG FOR `2.0.X`
 
+## v2.0.3 (2025-01-13)
+
+#### Details
+
+- [#17572](https://github.com/Sylius/Sylius/issues/17572) [Admin] Remove pagination selector if there are no other limits ([@loic425](https://github.com/loic425))
+- [#17573](https://github.com/Sylius/Sylius/issues/17573) Chore: Bump Twig hooks and extra to 0.6 version ([@loic425](https://github.com/loic425))
+- [#17566](https://github.com/Sylius/Sylius/issues/17566) Allow grid action button's link URL to be defined without defining a … ([@JeanDavidDaviet](https://github.com/JeanDavidDaviet))
+- [#17575](https://github.com/Sylius/Sylius/issues/17575) Fix path to crud in resource config in documentation ([@JanPalen](https://github.com/JanPalen))
+- [#17567](https://github.com/Sylius/Sylius/issues/17567) Move mobile taxon menu into drawer ([@bartek-sek](https://github.com/bartek-sek))
+- [#17579](https://github.com/Sylius/Sylius/issues/17579) Add an optional icon and description to the page title ([@kulczy](https://github.com/kulczy))
+- [#17581](https://github.com/Sylius/Sylius/issues/17581) Update system-requirements.md ([@tomkalon](https://github.com/tomkalon))
+- [#17577](https://github.com/Sylius/Sylius/issues/17577) Center the labels in the variant table ([@kulczy](https://github.com/kulczy))
+- [#17582](https://github.com/Sylius/Sylius/issues/17582) [PaymentRequest] Rename properties ([@Prometee](https://github.com/Prometee))
+- [#17585](https://github.com/Sylius/Sylius/issues/17585) [AdminUser][Customer] Improve Twig hook structure by adding `left` and `right` sections ([@Wojdylak](https://github.com/Wojdylak))
+- [#17586](https://github.com/Sylius/Sylius/issues/17586) General UI improvements #3 ([@kulczy](https://github.com/kulczy))
+- [#17576](https://github.com/Sylius/Sylius/issues/17576) General UI improvements #2 ([@kulczy](https://github.com/kulczy))
+- [#17599](https://github.com/Sylius/Sylius/issues/17599) docs  Update customizing-api.md ([@gigabites19](https://github.com/gigabites19))
+- [#17598](https://github.com/Sylius/Sylius/issues/17598) [Bug] Fix statistics tests in new year ([@mpysiak](https://github.com/mpysiak))
+- [#17590](https://github.com/Sylius/Sylius/issues/17590) Fix Migrations With Custom Table Name ([@Rafikooo](https://github.com/Rafikooo))
+- [#17595](https://github.com/Sylius/Sylius/issues/17595) Add missing changed InventoryBundle service to UPGRADE-2.0 ([@diimpp](https://github.com/diimpp))
+- [#17603](https://github.com/Sylius/Sylius/issues/17603) [CS][DX] Refactor
+- [#17602](https://github.com/Sylius/Sylius/issues/17602) [CS][DX] Refactor
+- [#17594](https://github.com/Sylius/Sylius/issues/17594) fix  Update select attribute in AdminBundle to use the proper base template ([@t-richard](https://github.com/t-richard))
+- [#17605](https://github.com/Sylius/Sylius/issues/17605) [CS][DX] Refactor
+- [#17571](https://github.com/Sylius/Sylius/issues/17571) Fonts loading optimization ([@kulczy](https://github.com/kulczy))
+- [#17611](https://github.com/Sylius/Sylius/issues/17611) [Maintenance][OrderProcessing] Extract adjustment types to be cleared to a parameter ([@NoResponseMate](https://github.com/NoResponseMate))
+- [#17607](https://github.com/Sylius/Sylius/issues/17607) [Bug] Fix missing variable ([@mpysiak](https://github.com/mpysiak))
+- [#17610](https://github.com/Sylius/Sylius/issues/17610) Revert skipped phpunit test ([@mpysiak](https://github.com/mpysiak))
+- [#17574](https://github.com/Sylius/Sylius/issues/17574) SYL-3939: Eslint ([@bartek-sek](https://github.com/bartek-sek))
+- [#17587](https://github.com/Sylius/Sylius/issues/17587) SYL-4220: Implement twig hooks for product variant ([@bartek-sek](https://github.com/bartek-sek))
+- [#17556](https://github.com/Sylius/Sylius/issues/17556) [Login] remove loader login page in safari when loading page from cache ([@zairigimad](https://github.com/zairigimad))
+- [#17613](https://github.com/Sylius/Sylius/issues/17613) [Inventory] Fix availability checker aliases ([@GSadee](https://github.com/GSadee))
+- [#17589](https://github.com/Sylius/Sylius/issues/17589) SYL-4221: Fix taxon tree styles ([@bartek-sek](https://github.com/bartek-sek))
+- [#17612](https://github.com/Sylius/Sylius/issues/17612) Add help on channel pricing when product is simple ([@ehibes](https://github.com/ehibes))
+- [#17591](https://github.com/Sylius/Sylius/issues/17591) Fix form template without resource factory ([@loic425](https://github.com/loic425))
+- [#17570](https://github.com/Sylius/Sylius/issues/17570) [DOCUMENTATION] Synchronize 2.0-docs -> 2.0 ([@SyliusBot](https://github.com/SyliusBot))
+- [#17592](https://github.com/Sylius/Sylius/issues/17592) [Admin] Define title icon and subheader on Twig hooks configuration ([@loic425](https://github.com/loic425))
+- [#17614](https://github.com/Sylius/Sylius/issues/17614) [Admin] Order UI improvements ([@kulczy](https://github.com/kulczy))
+- [#17619](https://github.com/Sylius/Sylius/issues/17619) Fix phpspec namespace ([@mpysiak](https://github.com/mpysiak))
+- [#17617](https://github.com/Sylius/Sylius/issues/17617) [Admin] Fix services imports not to import integrations every time ([@GSadee](https://github.com/GSadee))
+- [#17622](https://github.com/Sylius/Sylius/issues/17622) [DOCUMENTATION] Synchronize 2.0-docs -> 2.0 ([@SyliusBot](https://github.com/SyliusBot))
+- [#17597](https://github.com/Sylius/Sylius/issues/17597) SYL-4224: UI improvements ([@bartek-sek](https://github.com/bartek-sek))
+
 ## v2.0.2 (2024-12-11)
 
 #### Details

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "sylius/sylius",
     "type": "library",
-    "version": "v2.0.3-dev",
+    "version": "v2.0.4-dev",
     "description": "E-Commerce platform for PHP, based on Symfony framework.",
     "homepage": "https://sylius.com",
     "license": "MIT",

docs/SUMMARY.md

@@ -6,7 +6,7 @@
     * [Release Cycle](sylius-2.0-documentation/organization/release-cycle.md)
     * [Backwards Compatibility Promise](sylius-2.0-documentation/organization/backwards-compatibility-promise.md)
     * [Sylius Team](https://sylius.com/team/)
-    * [Sylius Roadmap](https://sylius.com/roadmap/?utm\_source=docs)
+    * [Sylius Roadmap](https://sylius.com/roadmap/?utm_source=docs)
 
 ## Getting Started with Sylius
 
@@ -101,6 +101,7 @@
     * [Sylius License and Trademark](the-book/contributing/contributing-code/sylius-license-and-trademark.md)
   * [Contributing Documentation](the-book/contributing/contributing-documentation.md)
   * [Contributing Translations](the-book/contributing/contributing-translations.md)
+  * [Key Contributors](the-book/contributing/key-contributors.md)
 
 ## The Customization Guide
 

docs/the-book/contributing/key-contributors.md

@@ -0,0 +1,81 @@
+# Key Contributors
+
+### Introduction
+
+The Sylius Key Contributors program is an initiative designed to actively engage and recognize community members who contribute significantly to the Sylius ecosystem. This program replaces previous structures to create a more inclusive, transparent, and rewarding experience for contributors.
+
+The program's goal is to encourage collaboration, celebrate contributions, and ensure a thriving open-source ecosystem around Sylius.
+
+### What Does Being a Key Contributor Mean?
+
+Key Contributors are community members whose efforts have a significant impact on the Sylius project. As a Key Contributor, you’ll receive:
+
+* **Permissions**:
+  * “Write” access to public Sylius repositories.
+  * “Triage” access to private repositories, like Sylius/Plus.
+* **Recognition**:
+  * An online certificate acknowledging your contributions.
+  * Exclusive Sylius Key Contributor merchandise.
+* **Collaboration Opportunities**:
+  * Regular meetings with the Sylius Development Team.
+  * Access to the private `#key-contributors` Slack channel.
+  * Influence on project decisions.
+* **Support**:
+  * Assistance from the Sylius Development Team on coding or presentations.
+  * Approval to showcase your role as a Key Contributor on your LinkedIn profile.
+
+### How to Qualify as a Key Contributor
+
+Key Contributors are selected quarterly based on their activities and contributions. Here's what we evaluate:
+
+* Submitted Pull Requests.
+* Reviews of Pull Requests.
+* Filed GitHub issues.
+* Engagement in GitHub and Slack discussions.
+* Resolving community support requests on Slack (#support), StackOverflow, and GitHub.
+* Writing blog posts for the Sylius website.
+* Presenting Sylius-focused talks at conferences.
+
+Active contributors who meet these criteria are invited to join the program for a three-month term, with reevaluation occurring after the end of each quarter.
+
+### Current Key Contributors
+
+Below is the list of current Key Contributors (as of January 2025) who have demonstrated exceptional dedication and contributions to the Sylius project:
+
+* Loïc Frémont (@[loic425](https://github.com/loic425)), 
+* Francis Hilaire (@[Prometee](https://github.com/Prometee)), 
+* Dmitri Perunov (@[diimpp](https://github.com/diimpp)), 
+* Gracjan Józefczyk (@[GracjanJozefczyk](https://github.com/GracjanJozefczyk)), 
+* Valentin Silvestre (@[vasilvestre](https://github.com/vasilvestre)), 
+* Krzysztof Odważny (@[christopherhero](https://github.com/christopherhero)),
+* Stephane Decock (@[Roshyo](https://github.com/Roshyo)).
+
+This list is updated quarterly to reflect the latest Key Contributors.
+
+***
+
+### Supporting Open-Source Contributions
+
+The Sylius Key Contributors program is not just about individual efforts—it’s a testament to the incredible support of companies that encourage their developers to contribute to open-source projects. Sylius Solution and Technology Partners play a significant role by fostering environments where their developers can actively engage with the community.
+
+Companies that endorse open-source contributions not only strengthen Sylius but also demonstrate leadership in the tech industry. To learn more about becoming a Sylius partner, visit [Sylius Partners](https://sylius.com/find-a-partner/).
+
+***
+
+### FAQs
+
+#### Can I apply to become a Key Contributor?
+
+No, Key Contributors are selected based on activity. However, all community members are encouraged to contribute in any capacity to be considered.
+
+#### What happens after the three-month term?
+
+After the end of each quarter, contributions are reassessed, and membership is renewed for those who remain active.
+
+#### Does the program have tiers?
+
+No, all Key Contributors share equal status within the program.
+
+#### How can my company support Sylius?
+
+Companies can support Sylius by allocating time for their developers to contribute and by becoming a Sylius Solution or Technology Partner.

src/Sylius/Bundle/AdminBundle/Resources/config/services.xml

@@ -17,7 +17,9 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"
 >
     <imports>
-        <import resource="services/**/*.xml" />
+        <import resource="services/*.xml" />
+        <import resource="services/product/*.xml" />
+        <import resource="services/twig/*.xml" />
     </imports>
 
     <parameters>

src/Sylius/Bundle/AdminBundle/templates/product/form/sections/taxonomy/product_taxons.html.twig

@@ -6,23 +6,29 @@
         {{ form_widget(product_taxons_form, {attr: {'data-product-taxon-tree-target': 'productTaxons'}}) }}
 
         <div class="pb-5">
-            <div class="d-flex align-items-center mb-4">
-                <div class="input-group input-group-flat">
-                    <input class="form-control" placeholder="{{ 'sylius.ui.filter'|trans }}" type="text"
-                           data-product-taxon-tree-target="filter"
-                           data-action="input->product-taxon-tree#filter"
-                           {{ sylius_test_html_attribute('product-taxons-filter') }}
-                    />
-                    <span class="input-group-text">
+            <div class="input-group input-group-flat mb-4">
+                <input class="form-control" placeholder="{{ 'sylius.ui.filter'|trans }}" type="text"
+                       data-product-taxon-tree-target="filter"
+                       data-action="input->product-taxon-tree#filter"
+                    {{ sylius_test_html_attribute('product-taxons-filter') }}
+                />
+                <span class="input-group-text">
                         <a class="input-group-link link-reset" type="button" data-action="product-taxon-tree#clearFilter" >{{ 'sylius.ui.clear'|trans }}</a>
                     </span>
+            </div>
+            <div class="d-flex flex-column gap-1">
+                <div class="d-flex gap-3 align-items-center">
+                    <a class="d-flex align-items-center gap-1 text-nowrap link-reset fs-5" type="button" data-action="product-taxon-tree#checkAll" {{ sylius_test_html_attribute('product-taxons-check-all') }}>
+                        {{ ux_icon('tabler:copy-check', {'class': 'icon m-0'}) }}
+                        {{ 'sylius.ui.check_all'|trans }}
+                    </a>
+                    <a class="d-flex align-items-center gap-1 text-nowrap link-reset fs-5" type="button" data-action="product-taxon-tree#uncheckAll" {{ sylius_test_html_attribute('product-taxons-uncheck-all') }}>
+                        {{ ux_icon('tabler:copy-x', {'class': 'icon m-0'}) }}
+                        {{ 'sylius.ui.uncheck_all'|trans }}
+                    </a>
                 </div>
-                <div class="d-flex gap-3 align-items-center ms-4 me-2">
-                    <a class="fs-5 text-nowrap link-reset" type="button" data-action="product-taxon-tree#checkAll" {{ sylius_test_html_attribute('product-taxons-check-all') }}>{{ 'sylius.ui.check_all'|trans }}</a>
-                    <a class="fs-5 text-nowrap link-reset" type="button" data-action="product-taxon-tree#uncheckAll" {{ sylius_test_html_attribute('product-taxons-uncheck-all') }}>{{ 'sylius.ui.uncheck_all'|trans }}</a>
-                </div>
+                <div data-product-taxon-tree-target="tree"></div>
             </div>
-            <div data-product-taxon-tree-target="tree"></div>
         </div>
     </div>
 </div>

src/Sylius/Bundle/AdminBundle/templates/product/show/content/page_body/attributes/translatable.html.twig

@@ -4,15 +4,13 @@
 
     <div id="translation-{{ locale_code }}" class="accordion-collapse collapse" data-bs-parent="#attribute-translations">
         <div class="accordion-body bg-gray-400">
-            <div class="py-3 px-5">
-                <div class="card mb-3">
-                    <div class="card-header">
-                        <div class="card-title">{{ 'sylius.ui.content'|trans }}</div>
-                    </div>
-                    <div class="card-body">
-                        <div class="row" {{ sylius_test_html_attribute('attribute-with-locale', '%s'|format(locale_code)) }}>
-                            {% hook 'translatable' with { 'attributes': attributes, locale_code } %}
-                        </div>
+            <div class="card mb-3 mx-md-5">
+                <div class="card-header">
+                    <div class="card-title">{{ 'sylius.ui.content'|trans }}</div>
+                </div>
+                <div class="card-body">
+                    <div class="row" {{ sylius_test_html_attribute('attribute-with-locale', '%s'|format(locale_code)) }}>
+                        {% hook 'translatable' with { 'attributes': attributes, locale_code } %}
                     </div>
                 </div>
             </div>

src/Sylius/Bundle/AdminBundle/templates/product/show/content/page_body/general/configurable_product.html.twig

@@ -17,10 +17,8 @@
                     </tr>
                     <tr class="bg-gray-400">
                         <td colspan="9" class="p-0 border-0">
-                            <div class="px-5 collapse" id="product-variant-details-{{ variant.code }}">
-                                <div class="py-3">
-                                    {% hook 'configurable_product#details' with { variant } %}
-                                </div>
+                            <div class="px-3 px-md-5 py-3 collapse" id="product-variant-details-{{ variant.code }}">
+                                {% hook 'configurable_product#details' with { variant } %}
                             </div>
                         </td>
                     </tr>

src/Sylius/Bundle/AdminBundle/templates/product/show/content/page_body/translations.html.twig

@@ -18,15 +18,13 @@
                 </h2>
                 <div id="translation-{{ locale }}" class="accordion-collapse collapse" data-bs-parent="#product-translations">
                     <div class="accordion-body bg-gray-400">
-                        <div class="py-3 px-5">
-                            <div class="card mb-3">
-                                <div class="card-header">
-                                    <div class="card-title">{{ 'sylius.ui.content'|trans }}</div>
-                                </div>
-                                <div class="card-body">
-                                    <div class="divide-y">
-                                        {% hook 'translations' with { product_translation } %}
-                                    </div>
+                        <div class="card mb-3 mx-md-5">
+                            <div class="card-header">
+                                <div class="card-title">{{ 'sylius.ui.content'|trans }}</div>
+                            </div>
+                            <div class="card-body">
+                                <div class="divide-y">
+                                    {% hook 'translations' with { product_translation } %}
                                 </div>
                             </div>
                         </div>

src/Sylius/Bundle/CoreBundle/SyliusCoreBundle.php

@@ -40,15 +40,15 @@
 
 final class SyliusCoreBundle extends AbstractResourceBundle
 {
-    public const VERSION = '2.0.3-DEV';
+    public const VERSION = '2.0.4-DEV';
 
-    public const VERSION_ID = '20002';
+    public const VERSION_ID = '20003';
 
     public const MAJOR_VERSION = '2';
 
     public const MINOR_VERSION = '0';
 
-    public const RELEASE_VERSION = '3';
+    public const RELEASE_VERSION = '4';
 
     public const EXTRA_VERSION = 'DEV';
 

src/Sylius/Bundle/OrderBundle/spec/Resetter/CartChangesResetterSpec.php

@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace spec\Sylius\Bundle\OrderBundle\ChangesResetter;
+namespace spec\Sylius\Bundle\OrderBundle\Resetter;
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;