kenaug74/Sylius
1
0
Fork 0
mirror of https://github.com/Sylius/Sylius.git synced 2026-07-14 17:10:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5
29826 commits 61 branches 355 tags 443 MiB
Commit graph

29826 commits

This branch
This branch
All branches
Author SHA1 Message Date
TheMilek
fb47f6de1a
Update upgrade file from 1.12 with PriceHistoryPlugin to Sylius 1.13 2023-06-22 14:40:00 +02:00
Kamil Grygierzec
324d69073c
bug #15087 [Maintenance][API] Fix ChangedItemQuantityInCart validator alias (NoResponseMate, jakubtobiasz) 
This PR was merged into the 1.13 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.13 |
| Bug fix?        | somewhat                                                       |
| New feature?    | no                                                       |
| BC breaks?      | no?                                                       |
| Deprecations?   | no |
| Related tickets | -                      |
| License         | MIT                                                          |

Commits
-------

3f3e18c31c [Maintenance][API] Fix ChangedItemQuantityInCart validator alias
22d187c4a8 Add a note about changed constraint validator's alias
 2023-06-22 14:10:12 +02:00
Jakub Tobiasz
22d187c4a8
Add a note about changed constraint validator's alias 2023-06-22 08:47:23 +02:00
Jacob Tobiasz
baa1311a89
minor #15112 [Scenarios] Add @no-api tag for Addressing an order and sign in scenario (Rafikooo) 
This PR was merged into the 1.13 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.13 <!-- see the comment below -->                  |
| Bug fix?        | no                                                      |
| New feature?    | no                                                      |
| BC breaks?      | no                                                      |
| Deprecations?   | no<!-- don't forget to update the UPGRADE-*.md file --> |
| License         | MIT                                                          |

<!--
 - Bug fixes must be submitted against the 1.12 branch
 - Features and deprecations must be submitted against the 1.13 branch
 - Make sure that the correct base branch is set

 To be sure you are not breaking any Backward Compatibilities, check the documentation:
 https://docs.sylius.com/en/latest/book/organization/backward-compatibility-promise.html
-->


Commits
-------
  [Scenarios] Add @no-api tag for Addressing an order and sign in scenario
 2023-06-22 08:19:55 +02:00
Kamil Grygierzec
8223e61104
minor #15113 Fix auto upmerge workflow (jakubtobiasz) 
This PR was merged into the 1.13 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.13
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | n/a
| License         | MIT

![CleanShot 2023-06-22 at 07 27 30](https://github.com/Sylius/Sylius/assets/80641364/94ba3905-9713-4c3e-aff5-73b8033b8566)


Commits
-------

715824cdb3 Fix auto upmerge workflow
 2023-06-22 08:03:42 +02:00
Jakub Tobiasz
715824cdb3
Fix auto upmerge workflow 2023-06-22 07:25:23 +02:00
Rafikooo
15b306d060
[Scenarios] Add @no-api tag for Addressing an order and sign in scenario 2023-06-22 05:25:17 +02:00
Kamil Grygierzec
0b050fdcc0
minor #15109 Add workflow for automatic upmerge PR creating (jakubtobiasz) 
This PR was merged into the 1.13 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.13
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | n/a
| License         | MIT                                                          |



Commits
-------

249d8d110f Add workflow for automatic upmerge PR creating
 2023-06-21 10:52:31 +02:00
Jakub Tobiasz
249d8d110f
Add workflow for automatic upmerge PR creating 2023-06-21 10:20:06 +02:00
Jacob Tobiasz
91237184e7
minor #15106 [Maintenance] Update the remaining copyright blocks (Rafikooo) 
This PR was merged into the 1.13 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.13 <!-- see the comment below -->                  |
| Bug fix?        | no                                                      |
| New feature?    | no                                                      |
| BC breaks?      | no                                                      |
| Deprecations?   | no<!-- don't forget to update the UPGRADE-*.md file --> |
| License         | MIT                                                          |

Continuation of https://github.com/Sylius/Sylius/pull/15101 and https://github.com/Sylius/Sylius/pull/15101

Commits
-------
  [Maintenance] Update the remaining copyright blocks again
 2023-06-21 08:20:24 +02:00
Rafikooo
a182858d28
[Maintenance] Update the remaining copyright blocks again 2023-06-19 22:00:30 +02:00
Grzegorz Sadowski
c4bacdfb4e
minor #15105 [Maintenance] Update the remaining copyright blocks (Rafikooo) 
This PR was merged into the 1.13 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.13 <!-- see the comment below -->                  |
| Bug fix?        | no                                                      |
| New feature?    | no                                                      |
| BC breaks?      | no                                                      |
| Deprecations?   | no<!-- don't forget to update the UPGRADE-*.md file --> |
| License         | MIT                                                          |

Continuation of https://github.com/Sylius/Sylius/pull/15101

Commits
-------

30b16592c8 [Maintenance] Update the remaining copyright blocks
 2023-06-16 10:28:50 +02:00
Grzegorz Sadowski
79fc2d3a3c
feature #15085 [API][Products] Viewing diagonal variants options (Rafikooo) 
This PR was merged into the 1.13 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.13 <!-- see the comment below -->                  |
| Bug fix?        | no                                                      |
| New feature?    | no                                                      |
| BC breaks?      | no                                                      |
| Deprecations?   | no<!-- don't forget to update the UPGRADE-*.md file --> |
| License         | MIT                                                          |

<!--
 - Bug fixes must be submitted against the 1.12 branch
 - Features and deprecations must be submitted against the 1.13 branch
 - Make sure that the correct base branch is set

 To be sure you are not breaking any Backward Compatibilities, check the documentation:
 https://docs.sylius.com/en/latest/book/organization/backward-compatibility-promise.html
-->


Commits
-------

41274eb8d7 [Scenarios] Add scenario for not seeing disabled variants
debb53d38f [Behat][API] Add step implementation for not seeing disabled variants
 2023-06-16 08:57:45 +02:00
Rafikooo
debb53d38f
[Behat][API] Add step implementation for not seeing disabled variants 2023-06-16 03:12:57 +02:00
Rafikooo
41274eb8d7
[Scenarios] Add scenario for not seeing disabled variants 2023-06-15 23:44:08 +02:00
Rafikooo
30b16592c8
[Maintenance] Update the remaining copyright blocks 2023-06-15 20:55:46 +02:00
Grzegorz Sadowski
560b64c7a7
minor #15104 Fixes after reviews (TheMilek) 
This PR was merged into the 1.13 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.13 <!-- see the comment below -->                  |
| Bug fix?        | no                                                    |
| New feature?    | no                                                      |
| BC breaks?      | no                                                    |
| License         | MIT                                                          |

<!--
 - Bug fixes must be submitted against the 1.12 branch
 - Features and deprecations must be submitted against the 1.13 branch
 - Make sure that the correct base branch is set

 To be sure you are not breaking any Backward Compatibilities, check the documentation:
 https://docs.sylius.com/en/latest/book/organization/backward-compatibility-promise.html
-->

fixes of https://github.com/Sylius/Sylius/pull/15068 and https://github.com/Sylius/Sylius/pull/15092 comments

Commits
-------

fc0969c6de Fixes after reviews
 2023-06-15 15:39:27 +02:00
TheMilek
fc0969c6de
Fixes after reviews 2023-06-15 14:28:38 +02:00
Grzegorz Sadowski
025df951b5
feature #15092 Cover Seeing payment method instructions behat API scenario (TheMilek) 
This PR was merged into the 1.13 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.13 <!-- see the comment below -->                  |
| Bug fix?        | no                                                       |
| New feature?    | no                                                       |
| BC breaks?      | no                                                     |
| License         | MIT                                                          |

<!--
 - Bug fixes must be submitted against the 1.12 branch
 - Features and deprecations must be submitted against the 1.13 branch
 - Make sure that the correct base branch is set

 To be sure you are not breaking any Backward Compatibilities, check the documentation:
 https://docs.sylius.com/en/latest/book/organization/backward-compatibility-promise.html
-->


Commits
-------

3c6002b63f Cover Seeing payment method instructions behat scenario
 2023-06-15 14:19:23 +02:00
Grzegorz Sadowski
79fba64c17
feature #15068 View only available associations for product (TheMilek) 
This PR was merged into the 1.13 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.13 <!-- see the comment below -->                  |
| Bug fix?        | yes                                                       |
| New feature?    | no                                                       |
| BC breaks?      | no                                                      |
| Deprecations?   | no <!-- don't forget to update the UPGRADE-*.md file --> |
| License         | MIT                                                          |

<!--
 - Bug fixes must be submitted against the 1.12 branch
 - Features and deprecations must be submitted against the 1.13 branch
 - Make sure that the correct base branch is set

 To be sure you are not breaking any Backward Compatibilities, check the documentation:
 https://docs.sylius.com/en/latest/book/organization/backward-compatibility-promise.html
-->


Commits
-------

ebc7d88b08 View only available associations for product
 2023-06-15 14:14:49 +02:00
Grzegorz Sadowski
5856691866
feature #15098 Add @no-api tag to preventing to pay for cancelled order scenario (TheMilek) 
This PR was merged into the 1.13 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.13 <!-- see the comment below -->                  |
| Bug fix?        | no                                                      |
| New feature?    | no                                                       |
| BC breaks?      | no                                                      |
| License         | MIT                                                          |

<!--
 - Bug fixes must be submitted against the 1.12 branch
 - Features and deprecations must be submitted against the 1.13 branch
 - Make sure that the correct base branch is set

 To be sure you are not breaking any Backward Compatibilities, check the documentation:
 https://docs.sylius.com/en/latest/book/organization/backward-compatibility-promise.html
-->


Commits
-------

200b4409f5 Add @no-api tag to preventing to pay for cancelled order scenario
 2023-06-15 14:13:48 +02:00
Grzegorz Sadowski
1c1f02ae5a
feature #15103 Seeing order locale API scenario coverage (TheMilek) 
This PR was merged into the 1.13 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.13 <!-- see the comment below -->                  |
| Bug fix?        | no                                                     |
| New feature?    | no                                                      |
| BC breaks?      | no                                                    |
| License         | MIT                                                          |

<!--
 - Bug fixes must be submitted against the 1.12 branch
 - Features and deprecations must be submitted against the 1.13 branch
 - Make sure that the correct base branch is set

 To be sure you are not breaking any Backward Compatibilities, check the documentation:
 https://docs.sylius.com/en/latest/book/organization/backward-compatibility-promise.html
-->


Commits
-------

8162a55854 Seeing order locale API scenario coverage
 2023-06-15 13:55:53 +02:00
TheMilek
3c6002b63f
Cover Seeing payment method instructions behat scenario 2023-06-15 13:46:11 +02:00
TheMilek
8162a55854
Seeing order locale API scenario coverage 2023-06-15 08:08:34 +02:00
Grzegorz Sadowski
aba91d8c1d
feature #15095 Viewing children taxons API scenario ceverage (TheMilek) 
This PR was merged into the 1.13 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.13 <!-- see the comment below -->                  |
| Bug fix?        | no                                                     |
| New feature?    | no                                                       |
| BC breaks?      | no                                                      |
| License         | MIT                                                          |

<!--
 - Bug fixes must be submitted against the 1.12 branch
 - Features and deprecations must be submitted against the 1.13 branch
 - Make sure that the correct base branch is set

 To be sure you are not breaking any Backward Compatibilities, check the documentation:
 https://docs.sylius.com/en/latest/book/organization/backward-compatibility-promise.html
-->


Commits
-------

7d2b1c07ad Viewing children taxons API scenario ceverage
 2023-06-15 07:50:10 +02:00
Rafikooo
5ccd65c1d3 [Maintenance] Update the copyright block 2023-06-15 07:06:38 +02:00
Rafikooo
367f29cfbe [Docs] Update Vision role 2023-06-15 07:06:38 +02:00
Jan Goralski
cd2d566207 [Fixture] Improve LazyOption performance 2023-06-15 07:06:38 +02:00
Jacob Tobiasz
34c7f9b611
refactor #15091 [CS][DX] Refactor (github-actions[bot]) 
This PR was merged into the 1.13 branch.

Discussion
----------

This PR has been generated automatically.
For more details see [refactor.yaml](/Sylius/Sylius/blob/1.12/.github/workflows/refactor.yaml).

Commits
-------
  [CS][DX] Refactor
 2023-06-14 13:53:44 +02:00
Sylius Bot
48100055c3 [CS][DX] Refactor 2023-06-14 13:53:00 +02:00
TheMilek
200b4409f5
Add @no-api tag to preventing to pay for cancelled order scenario 2023-06-14 13:23:12 +02:00
Jacob Tobiasz
667c720a6d
minor #15071 Update vimeo/psalm requirement from 5.9.* to 5.12.* (dependabot[bot]) 
This PR was merged into the 1.13 branch.

Discussion
----------

Updates the requirements on [vimeo/psalm](https://github.com/vimeo/psalm) to permit the latest version.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/vimeo/psalm/releases">vimeo/psalm's releases</a>.</em></p>
<blockquote>
<h2>5.12.0</h2>
<!-- raw HTML omitted -->
<h2>What's Changed</h2>
<h3>Features</h3>
<ul>
<li>WIP - Limit inheritance to a subset of classes <a href="https://redirect.github.com/vimeo/psalm/issues/1450">#1450</a> by <a href="https://github.com/robchett"><code>@​robchett</code></a> in <a href="https://redirect.github.com/vimeo/psalm/pull/9687">vimeo/psalm#9687</a></li>
<li>UnsupportedPropertyReferenceUsage by <a href="https://github.com/jack-worman"><code>@​jack-worman</code></a> in <a href="https://redirect.github.com/vimeo/psalm/pull/9769">vimeo/psalm#9769</a></li>
<li>Improve return types of pow() by <a href="https://github.com/robchett"><code>@​robchett</code></a> in <a href="https://redirect.github.com/vimeo/psalm/pull/9795">vimeo/psalm#9795</a></li>
<li>Narrow the type of $haystack when strpos(...) !== false by <a href="https://github.com/robchett"><code>@​robchett</code></a> in <a href="https://redirect.github.com/vimeo/psalm/pull/9788">vimeo/psalm#9788</a></li>
<li>allow using more than 8G of memory in psalter by <a href="https://github.com/orklah"><code>@​orklah</code></a> in <a href="https://redirect.github.com/vimeo/psalm/pull/9805">vimeo/psalm#9805</a></li>
</ul>
<h3>Fixes</h3>
<ul>
<li>Fix missing global class type when scanning cached files by <a href="https://github.com/tscni"><code>@​tscni</code></a> in <a href="https://redirect.github.com/vimeo/psalm/pull/9735">vimeo/psalm#9735</a></li>
<li>Fix union argument type check against templated param by <a href="https://github.com/klimick"><code>@​klimick</code></a> in <a href="https://redirect.github.com/vimeo/psalm/pull/9750">vimeo/psalm#9750</a></li>
<li>Allow dynamic properties from PHPDoc by <a href="https://github.com/fluffycondor"><code>@​fluffycondor</code></a> in <a href="https://redirect.github.com/vimeo/psalm/pull/9742">vimeo/psalm#9742</a></li>
<li>improve glob stubs by <a href="https://github.com/kkmuffme"><code>@​kkmuffme</code></a> in <a href="https://redirect.github.com/vimeo/psalm/pull/9752">vimeo/psalm#9752</a></li>
<li>Removed return type false from date and gmdate by <a href="https://github.com/Alkisum"><code>@​Alkisum</code></a> in <a href="https://redirect.github.com/vimeo/psalm/pull/9761">vimeo/psalm#9761</a></li>
<li>methods and vars cannot be falsy by <a href="https://github.com/kkmuffme"><code>@​kkmuffme</code></a> in <a href="https://redirect.github.com/vimeo/psalm/pull/9796">vimeo/psalm#9796</a></li>
<li>fix offset for type param changes by <a href="https://github.com/orklah"><code>@​orklah</code></a> in <a href="https://redirect.github.com/vimeo/psalm/pull/9803">vimeo/psalm#9803</a></li>
</ul>
<h3>Docs</h3>
<ul>
<li>Documented suggestions for HTML user input by <a href="https://github.com/mmcev106"><code>@​mmcev106</code></a> in <a href="https://redirect.github.com/vimeo/psalm/pull/9780">vimeo/psalm#9780</a></li>
<li>Document array shape unsealing syntax by <a href="https://github.com/robchett"><code>@​robchett</code></a> in <a href="https://redirect.github.com/vimeo/psalm/pull/9784">vimeo/psalm#9784</a></li>
</ul>
<h3>Internal changes</h3>
<ul>
<li>Enable opcache if it is installed by <a href="https://github.com/danog"><code>@​danog</code></a> in <a href="https://redirect.github.com/vimeo/psalm/pull/9779">vimeo/psalm#9779</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a href="https://github.com/tscni"><code>@​tscni</code></a> made their first contribution in <a href="https://redirect.github.com/vimeo/psalm/pull/9735">vimeo/psalm#9735</a></li>
<li><a href="https://github.com/Alkisum"><code>@​Alkisum</code></a> made their first contribution in <a href="https://redirect.github.com/vimeo/psalm/pull/9761">vimeo/psalm#9761</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a href="https://github.com/vimeo/psalm/compare/5.11.0...5.12.0">https://github.com/vimeo/psalm/compare/5.11.0...5.12.0</a></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="f90118cdea"><code>f90118c</code></a> Merge pull request <a href="https://redirect.github.com/vimeo/psalm/issues/9805">#9805</a> from orklah/memory-psalter</li>
<li><a href="f65d53f32e"><code>f65d53f</code></a> fix CS</li>
<li><a href="d23616cafa"><code>d23616c</code></a> allow using more than 8G of memory in psalter</li>
<li><a href="cb34901246"><code>cb34901</code></a> Merge pull request <a href="https://redirect.github.com/vimeo/psalm/issues/9803">#9803</a> from orklah/zefzef</li>
<li><a href="ed94de5146"><code>ed94de5</code></a> fix offset for type param changes</li>
<li><a href="22fd6fb9db"><code>22fd6fb</code></a> Merge pull request <a href="https://redirect.github.com/vimeo/psalm/issues/9788">#9788</a> from robchett/strpos_stripos_assert_non_empty</li>
<li><a href="bd0ba6ee95"><code>bd0ba6e</code></a> Narrow the type of haystack when strpos != false</li>
<li><a href="0221ff1836"><code>0221ff1</code></a> Merge pull request <a href="https://redirect.github.com/vimeo/psalm/issues/9796">#9796</a> from kkmuffme/get_class_methods-vars-non-empty-string</li>
<li><a href="e23db18f6b"><code>e23db18</code></a> methods and vars cannot be falsy</li>
<li><a href="69589ebe83"><code>69589eb</code></a> Merge pull request <a href="https://redirect.github.com/vimeo/psalm/issues/9795">#9795</a> from robchett/powReturnTypeProvider</li>
<li>Additional commits viewable in <a href="https://github.com/vimeo/psalm/compare/5.9.0...5.12.0">compare view</a></li>
</ul>
</details>
<br />


Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)


</details>

Commits
-------
  Update vimeo/psalm requirement from 5.9.* to 5.12.*
  Add a weirdan/doctrine-psalm-plugin package
 2023-06-14 12:05:05 +02:00
TheMilek
7d2b1c07ad
Viewing children taxons API scenario ceverage 2023-06-13 14:08:00 +02:00
Kamil Grygierzec
6a12565419
bug #15096 [Fix] Remove redundant conflict entries (Rafikooo) 
This PR was merged into the 1.13 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.13 <!-- see the comment below -->                  |
| Bug fix?        | yes                                                       |
| New feature?    | no                                                      |
| BC breaks?      | no                                                      |
| Deprecations?   | no<!-- don't forget to update the UPGRADE-*.md file --> |
| License         | MIT                                                          |

Something went wrong with upmerge, this PR solves it


Commits
-------

e39ccd1ffc [Fix] Remove redundant conflict entries
 2023-06-13 14:06:07 +02:00
Rafikooo
e39ccd1ffc
[Fix] Remove redundant conflict entries 2023-06-13 13:30:22 +02:00
Sylius Bot
903f8de507 [CS][DX] Refactor 2023-06-12 02:35:10 +00:00
Grzegorz Sadowski
0fe3bcd42b
feature #14990 [API] Sorting user orders by order number (dawkaa) 
This PR was merged into the 1.13 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.13                  |
| Bug fix?        | no                                                       |
| New feature?    | yes                                                       |
| BC breaks?      | no                                                       |
| Deprecations?   | no |
| Related tickets | part of https://github.com/Sylius/Sylius/issues/11250 |
| License         | MIT                                                          |

<!--
 - Bug fixes must be submitted against the 1.12 branch
 - Features and deprecations must be submitted against the 1.13 branch
 - Make sure that the correct base branch is set

 To be sure you are not breaking any Backward Compatibilities, check the documentation:
 https://docs.sylius.com/en/latest/book/organization/backward-compatibility-promise.html
-->


Commits
-------

76d51022f3 [API] Sorting user orders by order number
7ac19488f5 Added tests to sorting user orders
4c0d93a601 Fixes for a conversation
 2023-06-09 14:59:19 +02:00
Grzegorz Sadowski
0d8d558808
feature #15063 [API] Allow overriding xml resource mapping (NoResponseMate) 
This PR was merged into the 1.13 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.13 |
| Bug fix?        | no                                                       |
| New feature?    | yes                                                       |
| BC breaks?      | no                                                       |
| Deprecations?   | no |
| Related tickets | replaces #13292                      |
| License         | MIT                                                          |

Commits
-------

4f5e141611 [API] Test overriding xml mapping
3db63e41ee [API] Allow overriding xml mapping
 2023-06-09 14:54:07 +02:00
Grzegorz Sadowski
2645db5672
Merge branch '1.12' into 1.13 
* 1.12:
  Update docs/cookbook/images/image-on-entity.rst
  Update docs/cookbook/images/image-on-entity.rst
  Update docs/cookbook/images/image-on-entity.rst
  Update docs/cookbook/images/image-on-entity.rst
  add docs for adding image to entity via one-to-one association
  [Promotion] Ignore coupon based promotions when processing an order with no coupon
  Add a conflict for doctrine/orm:2.15.2
  Fix typo
  [Fixture] Revert injected repository type
  [PHPStan] Fix Psalm (#14019)
  [PHPStan] Fix non nullable variable (#14019)
  [PHPStan] Fix PHPStan to continue support for Sf < 6 (#14019)
  [PHPStan] Fix PHPStan level 5 class inheritance errors (#14019)
  [PHPStan] Bump to level 5 (#14019)
 2023-06-09 14:26:22 +02:00
Grzegorz Sadowski
f89248a84b
minor #15037 [Docs] add image to entity via one-to-one association (vvasiloi) 
This PR was merged into the 1.12 branch.

Discussion
----------

Fixes #13764

I think it's the first time I contribute to the documentation, so please review it carefully. 🙈 

The instructions were tested in a standard Sylius application: https://github.com/Sylius/Sylius-Standard/pull/914

Commits
-------

8cff31946a add docs for adding image to entity via one-to-one association
ec55940c00 Update docs/cookbook/images/image-on-entity.rst
855c847c07 Update docs/cookbook/images/image-on-entity.rst
ec0fddb7ef Update docs/cookbook/images/image-on-entity.rst
5f8baf955f Update docs/cookbook/images/image-on-entity.rst
 2023-06-09 14:20:57 +02:00
Grzegorz Sadowski
75d8d1caf6
bug #15088 [Promotion] Ignore coupon based promotions when when processing an order with no coupon (NoResponseMate) 
This PR was merged into the 1.12 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.12 |
| Bug fix?        | somewhat                                                     |
| New feature?    | no                                                       |
| BC breaks?      | no                                                       |
| Deprecations?   | no |
| Related tickets | fixes #14983 |
| License         | MIT                                                          |

Commits
-------

4efbfe7578 [Promotion] Ignore coupon based promotions when processing an order with no coupon
 2023-06-09 14:20:10 +02:00
Victor Vasiloi
5f8baf955f
Update docs/cookbook/images/image-on-entity.rst 
Co-authored-by: Jan Góralski <jan.wojciech.goralski@gmail.com>
 2023-06-09 12:14:55 +02:00
Victor Vasiloi
ec0fddb7ef
Update docs/cookbook/images/image-on-entity.rst 
Co-authored-by: Jan Góralski <jan.wojciech.goralski@gmail.com>
 2023-06-09 12:14:55 +02:00
Victor Vasiloi
855c847c07
Update docs/cookbook/images/image-on-entity.rst 
Co-authored-by: Jan Góralski <jan.wojciech.goralski@gmail.com>
 2023-06-09 12:14:54 +02:00
Victor Vasiloi
ec55940c00
Update docs/cookbook/images/image-on-entity.rst 
Co-authored-by: Jan Góralski <jan.wojciech.goralski@gmail.com>
 2023-06-09 12:14:54 +02:00
Victor Vasiloi
8cff31946a
add docs for adding image to entity via one-to-one association 2023-06-09 12:14:54 +02:00
dawkaa
4c0d93a601 Fixes for a conversation 
I added the fixes for the conversation.
 2023-06-09 16:14:33 +08:00
dawkaa
7ac19488f5 Added tests to sorting user orders 
I added tests to sorting user orders.
 2023-06-09 16:11:22 +08:00
dawkaa
76d51022f3 [API] Sorting user orders by order number 
I did sorting user orders by order number.
 2023-06-09 16:11:22 +08:00
Jan Goralski
4efbfe7578
[Promotion] Ignore coupon based promotions when processing an order with no coupon 2023-06-08 13:14:39 +02:00