Commit graph

36129 commits

Author SHA1 Message Date
Grzegorz Sadowski
c7e6043008
Add conflict to gedmo/doctrine-extensions in ApiBundle (#17121)
| Q               | A
|-----------------|-----
| Branch?         | 2.0
| Bug fix?        | yes
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | n/a
| License         | MIT

<!--
 - Bug fixes must be submitted against the 1.13 branch
 - Features and deprecations must be submitted against the 1.14 branch
- Features, removing deprecations and BC breaks must be submitted
against the 2.0 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
-->
2024-10-07 09:51:35 +02:00
Karol
097ac5da13
[Theming] Move ThemeBundle dependency to ShopBundle (#17106)
| Q               | A
|-----------------|-----
| Branch?         | 2.0
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | yes
| Deprecations? | no<!-- don't forget to update the UPGRADE-*.md file
-->
| Related tickets | fixes https://github.com/Sylius/Sylius/issues/13143,
replaces #13656
| License         | MIT

<!--
 - Bug fixes must be submitted against the 1.13 branch
 - Features and deprecations must be submitted against the 1.14 branch
- Features, removing deprecations and BC breaks must be submitted
against the 2.0 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
-->
2024-10-07 09:50:23 +02:00
Michał Pysiak
c1e3cee7f2
Add CONFLICTS.md file 2024-10-07 09:02:01 +02:00
Michał Pysiak
c07062fbc1
Add conflict to ApiBundle 2024-10-07 08:57:20 +02:00
Grzegorz Sadowski
f8e5b83e61
Merge branch '1.14' into 2.0
* 1.14:
  Fix note
  Fix rebase
  Add CONFLICTS.md note
  Add gedmo/doctrine-extensions conflict
  Update upgrade file
  [MoneyBundle] Unification of service names
  Update upgrade file
  [LocaleBundle] Unification of service names
  [InventoryBundle] Unification of service names
  Mirror improvements
  Update upgrade file
  [CurrencyBundle] Unification of service names
2024-10-07 08:32:08 +02:00
Grzegorz Sadowski
8dfedae34c
Merge branch '1.13' into 1.14
* 1.13:
  Fix note
  Fix rebase
  Add CONFLICTS.md note
  Add gedmo/doctrine-extensions conflict
2024-10-07 08:21:13 +02:00
Grzegorz Sadowski
467b829668
bug #17120 Add gedmo/doctrine-extensions conflict (mpysiak)
This PR was merged into the 1.13 branch.

Discussion
----------

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

<!--
 - Bug fixes must be submitted against the 1.13 branch
 - Features and deprecations must be submitted against the 1.14 branch
 - Features, removing deprecations and BC breaks must be submitted against the 2.0 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
-->

gedmo/doctrine-extensions causes errors on Symfony 6.4


Commits
-------

57a3f9ba2e Add gedmo/doctrine-extensions conflict
5f3f7ad4fb Add CONFLICTS.md note
913e35e76d Fix rebase
8288159df8 Fix note
2024-10-07 08:20:55 +02:00
Michał Pysiak
8288159df8
Fix note 2024-10-07 07:07:11 +02:00
Michał Pysiak
913e35e76d
Fix rebase 2024-10-07 07:02:44 +02:00
Michał Pysiak
5f3f7ad4fb
Add CONFLICTS.md note 2024-10-07 06:59:04 +02:00
Michał Pysiak
57a3f9ba2e
Add gedmo/doctrine-extensions conflict 2024-10-07 06:58:37 +02:00
Jan Góralski
fc1b22b35c
minor #17110 [ChannelBundle] Unification of service names (Wojdylak)
This PR was merged into the 2.0 branch.

Discussion
----------

| Q               | A
|-----------------|-----
| Branch?         | 2.0
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | #17098
| License         | MIT


Commits
-------
  [ChannelBundle] Unification of service names
2024-10-04 16:35:58 +02:00
Jan Góralski
727efce532
minor #17109 [AttributeBundle] Unification of service names (Wojdylak)
This PR was merged into the 2.0 branch.

Discussion
----------

| Q               | A
|-----------------|-----
| Branch?         | 2.0
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | #17096
| License         | MIT


Commits
-------
  [AttributeBundle] Unification of service names
2024-10-04 16:34:21 +02:00
Jan Góralski
f632f68fb5
minor #17107 [AddressingBundle] Unification of service names (Wojdylak)
This PR was merged into the 2.0 branch.

Discussion
----------

| Q               | A
|-----------------|-----
| Branch?         | 2.0
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | #17095
| License         | MIT


Commits
-------
  [AddressingBundle] Unification of service names
2024-10-04 16:32:51 +02:00
Jan Góralski
d0536649e7
[LocaleBundle] Unification of service names (#17104)
| Q               | A
|-----------------|-----
| Branch?         | 1.14
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | yes
| Related tickets | #17093
| License         | MIT
2024-10-04 16:16:10 +02:00
Jan Góralski
2afefe7e46
Merge branch '1.14' into SYL-3989-locale-bundle-1.14 2024-10-04 16:15:45 +02:00
Jan Góralski
42490cca0a
[MoneyBundle] Unification of service names (#17105)
| Q               | A
|-----------------|-----
| Branch?         | 1.14
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | yes
| Related tickets | #17093
| License         | MIT
2024-10-04 15:56:19 +02:00
Jan Góralski
6e9af99458
Merge branch '1.14' into SYL-3990-money-bundle-1.14 2024-10-04 15:56:00 +02:00
Jan Góralski
1240936a04
[InventoryBundle] Unification of service names (#17103)
| Q               | A
|-----------------|-----
| Branch?         | 1.14
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | yes
| Related tickets | #17093
| License         | MIT
2024-10-04 15:54:29 +02:00
Jan Góralski
d695e46dc0
Merge branch '1.14' into SYL-3988-inventory-bundle-1.14 2024-10-04 15:52:26 +02:00
Jan Góralski
d1cb4c147b
minor #17099 [CurrencyBundle] Unification of service names (Wojdylak)
This PR was merged into the 1.14 branch.

Discussion
----------

| Q               | A
|-----------------|-----
| Branch?         | 1.14
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | yes
| Related tickets | https://github.com/Sylius/Sylius/pull/17093
| License         | MIT

Commits
-------
  [CurrencyBundle] Unification of service names
  Update upgrade file
  Mirror improvements
2024-10-04 15:39:45 +02:00
Grzegorz Sadowski
7eeb5253ad
[Shop] Make the loading of the Channel form type extension dependent on the AdminBundle 2024-10-04 14:09:49 +02:00
Grzegorz Sadowski
a9f021562c
[Theming] Move prepending sylius_theme from Core to Shop extension 2024-10-04 13:48:43 +02:00
Grzegorz Sadowski
226116b905
[Theming] Minor improvements to moving ThemeBundle dependency 2024-10-04 13:48:42 +02:00
mamazu
f8390b9b11
Moving ChannelTypeExtension to the Shop Bundle 2024-10-04 13:48:42 +02:00
mamazu
3a79005d80
Making the theme configuration in the core optional when the theme bundle is installed 2024-10-04 13:48:42 +02:00
mamazu
3ad5a5929c
Adding a note in the upgrade guide 2024-10-04 13:48:42 +02:00
mamazu
3708af4612
Removing theme bundle from tests 2024-10-04 13:48:42 +02:00
mamazu
9459ad8025
Apply suggestions from code review
Fixing the license.

Co-authored-by: Dmitri Perunov <diimpp@gmail.com>
2024-10-04 13:48:42 +02:00
mamazu
e0dd153067
Moving the ThemeContext to the shop bundle 2024-10-04 13:48:42 +02:00
mamazu
539e099a8a
Moving the template dependency to the ShopBundle 2024-10-04 13:48:41 +02:00
Wojdylak
d7b7d1a87c
[ChannelBundle] Unification of service names 2024-10-04 12:47:06 +02:00
Wojdylak
e755fa55a0
[AttributeBundle] Unification of service names 2024-10-04 12:41:52 +02:00
Wojdylak
77fed4c840
[AddressingBundle] Unification of service names 2024-10-04 12:28:13 +02:00
Wojdylak
b72c6f0cf3
Update upgrade file 2024-10-04 12:04:32 +02:00
Wojdylak
e9e0350f67
[MoneyBundle] Unification of service names 2024-10-04 12:04:23 +02:00
Grzegorz Sadowski
ded02aeabd
Update rector/rector requirement from ^0.18.0 to ^1.2.6 (#17097)
Updates the requirements on
[rector/rector](https://github.com/rectorphp/rector) to permit the
latest version.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/rectorphp/rector/releases">rector/rector's
releases</a>.</em></p>
<blockquote>
<h2>Released Rector 1.2.6</h2>
<h2>New Features 🥳</h2>
<ul>
<li>[TypeDeclaration] Add isset(), empty(), and negation support on
BoolReturnTypeFromBooleanStrictReturnsRector (<a
href="https://redirect.github.com/rectorphp/rector-src/pull/6339">#6339</a>)</li>
<li>[TypeDeclaration] Add NativeMethodReflection support on
ReturnStrictTypeAnalyzer (<a
href="https://redirect.github.com/rectorphp/rector-src/pull/6344">#6344</a>)</li>
<li>[DX] Show paths not match any file/directory on ProcessCommand when
given path not exists (<a
href="https://redirect.github.com/rectorphp/rector-src/pull/6307">#6307</a>)</li>
</ul>
<!-- raw HTML omitted -->
<h2>Bugfixes 🐛</h2>
<ul>
<li>[TypeDeclaration] Convert inline <a
href="https://github.com/var"><code>@​var</code></a> tag to assert() (<a
href="https://redirect.github.com/rectorphp/rector-src/pull/6300">#6300</a>),
Thanks <a
href="https://github.com/carlos-granados"><code>@​carlos-granados</code></a>!</li>
<li>Fix incorrect result after using RemoveByType in PhpDocInfo (<a
href="https://redirect.github.com/rectorphp/rector-src/pull/6301">#6301</a>),
Thanks <a
href="https://github.com/carlos-granados"><code>@​carlos-granados</code></a>!</li>
<li>[TypeDeclaration] Skip nullable callable on
TypedPropertyFromAssignsRector (<a
href="https://redirect.github.com/rectorphp/rector-src/pull/6308">#6308</a>)</li>
<li>Fix LocallyCalledStaticMethodToNonStaticRector when static function
is called using the class name (<a
href="https://redirect.github.com/rectorphp/rector-src/pull/6310">#6310</a>),
Thanks <a
href="https://github.com/carlos-granados"><code>@​carlos-granados</code></a>!</li>
<li>[Php81] Handle crash on ArrowFunction attribute on
FirstClassCallableRector (<a
href="https://redirect.github.com/rectorphp/rector-src/pull/6313">#6313</a>)</li>
<li>[Performance] Reduce double traverse on
StrictNativeFunctionReturnTypeAnalyzer (<a
href="https://redirect.github.com/rectorphp/rector-src/pull/6320">#6320</a>)</li>
<li>[PhpParser] Alternative PR for findInstancesOfScoped() to keep
existing performance (<a
href="https://redirect.github.com/rectorphp/rector-src/pull/6324">#6324</a>)</li>
<li>[CodingStyle] Use double quote to escape quotes in
EncapsedStringsToSprintfRector (<a
href="https://redirect.github.com/rectorphp/rector-src/pull/6326">#6326</a>)</li>
<li>[TypeDeclaration] Handle crash on func call not found on
BoolReturnTypeFromBooleanStrictReturnsRector (<a
href="https://redirect.github.com/rectorphp/rector-src/pull/6327">#6327</a>)</li>
<li>Fix first class callable to use combineAcceptors() to avoid assert
Arg instance error (<a
href="https://redirect.github.com/rectorphp/rector-src/pull/6330">#6330</a>)</li>
<li>[Php81] Allow used as assign expr on ReadOnlyPropertyRector (<a
href="https://redirect.github.com/rectorphp/rector-src/pull/6331">#6331</a>)</li>
<li>Skip arrow function in scoped search (<a
href="https://redirect.github.com/rectorphp/rector-src/pull/6333">#6333</a>)</li>
<li>[TypeDeclaration] Better approach for native type check on
ReturnStrictTypeAnalyzer (<a
href="https://redirect.github.com/rectorphp/rector-src/pull/6343">#6343</a>)</li>
<li>[DeadCode] Skip extension load append variable on
RemoveAlwaysTrueIfConditionRector (<a
href="https://redirect.github.com/rectorphp/rector-src/pull/6332">#6332</a>)</li>
<li>[TypeDeclaration] Remove only void type on
ReturnedNodesReturnTypeInfererTypeInferer (<a
href="https://redirect.github.com/rectorphp/rector-src/pull/6340">#6340</a>)</li>
<li>[DeadCode] Skip indirect next line definition of <a
href="https://github.com/var"><code>@​var</code></a> on
RemoveNonExistingVarAnnotationRector (<a
href="https://redirect.github.com/rectorphp/rector-src/pull/6348">#6348</a>)</li>
</ul>
<!-- raw HTML omitted -->
<h2>rectorphp/rector-symfony 🎵</h2>
<ul>
<li>Added return type declaration rules for FormTypeInterface (<a
href="https://redirect.github.com/rectorphp/rector-symfony/pull/670">#670</a>),
Thanks <a
href="https://github.com/stollr"><code>@​stollr</code></a></li>
</ul>
<!-- raw HTML omitted -->
<h2>rectorphp/rector-phpunit 🟢</h2>
<ul>
<li>[CodeQuality] Add NarrowSingleWillReturnCallbackRector (<a
href="https://redirect.github.com/rectorphp/rector-phpunit/pull/374">#374</a>)</li>
<li>[CodeQuality] Add SingleWithConsecutiveToWithRector (<a
href="https://redirect.github.com/rectorphp/rector-phpunit/pull/370">#370</a>)</li>
<li>[CodeQuality] Add NarrowIdenticalWithConsecutiveRector (<a
href="https://redirect.github.com/rectorphp/rector-phpunit/pull/369">#369</a>)</li>
<li>[CodeQuality] Add AddParentSetupCallOnSetupRector (<a
href="https://redirect.github.com/rectorphp/rector-phpunit/pull/364">#364</a>)</li>
<li>Include match() to invoke counting in WithConsecutiveRector (<a
href="https://redirect.github.com/rectorphp/rector-phpunit/pull/362">#362</a>)</li>
<li>Move WithConsecutiveRector to its PHPUnit100 namespace,
CreateMockToAnonymousClassRector + PreferPHPUnitSelfCallRector to
CodeQuality (<a
href="https://redirect.github.com/rectorphp/rector-phpunit/pull/360">#360</a>)</li>
<li>Add existing willReturnCallback() support to WithConsecutiveRector
(<a
href="https://redirect.github.com/rectorphp/rector-phpunit/pull/358">#358</a>)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="6ca85da281"><code>6ca85da</code></a>
Rector 1.2.6</li>
<li><a
href="c15442414c"><code>c154424</code></a>
Updated Rector to commit c0c7502f55a3884f67a5885ed05ae2443ff53802</li>
<li><a
href="68c7b4d151"><code>68c7b4d</code></a>
Updated Rector to commit b88e910957a85adafd6fb75fbe50991b9ec871d1</li>
<li><a
href="a3f6293c8b"><code>a3f6293</code></a>
Updated Rector to commit 0c9edebe4e1ca753d5bbe99e5109378155e87dde</li>
<li><a
href="b555bd2c5e"><code>b555bd2</code></a>
Updated Rector to commit d17d3e814eada2fa3ada3601034407df01d84568</li>
<li><a
href="cdbdb1bd14"><code>cdbdb1b</code></a>
Updated Rector to commit 697b37b340c3b4c73ad6f8e4cea26b7bf60ddf62</li>
<li><a
href="b86f33859b"><code>b86f338</code></a>
Updated Rector to commit a11fc615d18396cef284c18de269711114630676</li>
<li><a
href="a5a5200e52"><code>a5a5200</code></a>
Updated Rector to commit 54a66206986e685787d7e038929618a66e98ec42</li>
<li><a
href="32c2df7fcb"><code>32c2df7</code></a>
Updated Rector to commit 6b065efef08c34f6e3f69ebd24e24f2418f93007</li>
<li><a
href="3df699e80d"><code>3df699e</code></a>
Updated Rector to commit 6b065efef08c34f6e3f69ebd24e24f2418f93007</li>
<li>Additional commits viewable in <a
href="https://github.com/rectorphp/rector/compare/0.18.0...1.2.6">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 show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@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>
2024-10-04 11:42:34 +02:00
Jan Góralski
bb9140702e
minor #17085 [API] Refactor commands in ApiBundle (GSadee)
This PR was merged into the 2.0 branch.

Discussion
----------

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

<!--
 - Bug fixes must be submitted against the 1.13 branch
 - Features and deprecations must be submitted against the 1.14 branch
 - Features, removing deprecations and BC breaks must be submitted against the 2.0 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
-------
  [API] Refactor commands in ApiBundle
  [API] Refactor ResetPassword command in ApiBundle
  [API] Refactor VerifyShopUser command in ApiBundle
  [API] Refactor admin ResetPassword command in ApiBundle
  [API] Revert making commands readonly
  Add SensitiveParameter attribute to appropriate arguments in commands
2024-10-04 11:31:13 +02:00
Grzegorz Sadowski
f9587d25a3
Merge branch '1.14' into 2.0
* 1.14:
  Fix comparison of order items
2024-10-04 11:29:41 +02:00
Grzegorz Sadowski
5240e5fadc
Merge branch '1.13' into 1.14
* 1.13:
  Fix comparison of order items
2024-10-04 11:29:38 +02:00
Grzegorz Sadowski
93126b46ea
bug #17070 Fix comparison of order items (jaroslavtyc)
This PR was merged into the 1.13 branch.

Discussion
----------

Fix comparison of order items when one of them is Doctrine proxy object

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

Having to OrderItem objects, with exact same content, but one of them Doctrine proxy, then comparison of `$orderItem instanceof static` in proxy object fails, because compared object is not a Doctrine proxy. That is probably not intentional and can break app in imports and other "I have created an order item copy and I am looking for original" situations.

Commits
-------

9b0c5cf49b Fix comparison of order items
2024-10-04 11:29:18 +02:00
Wojdylak
cb8fe42b27
Update upgrade file 2024-10-04 11:18:32 +02:00
Wojdylak
c5ee8053e5
[LocaleBundle] Unification of service names 2024-10-04 11:18:22 +02:00
Wojdylak
29d4140d6c
[InventoryBundle] Unification of service names 2024-10-04 10:52:39 +02:00
Wojdylak
baf7b1c9bb
Mirror improvements 2024-10-04 08:48:53 +02:00
Wojdylak
0482da4694
Update upgrade file 2024-10-04 08:07:25 +02:00
Wojdylak
052cf030c0
[CurrencyBundle] Unification of service names 2024-10-04 08:04:53 +02:00
Grzegorz Sadowski
b2c07fec1f
Merge branch '1.14' into 2.0
* 1.14:
  [ChannelBundle] Revert changing sylius.channel_collector in Extension
  Update upgrade file
  [ChannelBundle] Unification of service names
  Remove alias of sylius.validator.valid_province_address
  Mirror improvement
  Update upgrade file
  [AddressingBundle] Unification of service names
2024-10-04 07:48:37 +02:00
Grzegorz Sadowski
eae363f3dd
refactor #17098 [ChannelBundle] Unification of service names (Wojdylak, GSadee)
This PR was merged into the 1.14 branch.

Discussion
----------

| Q               | A
|-----------------|-----
| Branch?         | 1.14
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | yes
| Related tickets | https://github.com/Sylius/Sylius/pull/17093
| License         | MIT


Commits
-------

a04dc6cb93 [ChannelBundle] Unification of service names
9de1a2d134 Update upgrade file
38be138827 [ChannelBundle] Revert changing sylius.channel_collector in Extension
7d7a53e370 Merge branch '1.14' into SYL-3984-channel-bundle-1.14
56f6ffbbb4 Merge branch '1.14' into SYL-3984-channel-bundle-1.14
2024-10-04 07:46:33 +02:00
Grzegorz Sadowski
56f6ffbbb4
Merge branch '1.14' into SYL-3984-channel-bundle-1.14 2024-10-04 07:46:00 +02:00