Commit graph

32454 commits

Author SHA1 Message Date
Karol
756c01ed96
[UPMERGE] 1.13 -> 2.0 (#16119)
This PR has been generated automatically.
For more details see
[upmerge_pr.yaml](/Sylius/Sylius/blob/1.13/.github/workflows/upmerge_pr.yaml).

**Remember!** The upmerge should always be merged with using `Merge pull
request` button.

In case of conflicts, please resolve them manually with usign the
following commands:
```
git fetch upstream
gh pr checkout <this-pr-number>
git merge upstream/2.0 -m "Resolve conflicts between 1.13 and 2.0"
```

If you use other name for the upstream remote, please replace `upstream`
with the name of your remote pointing to the `Sylius/Sylius` repository.

Once the conflicts are resolved, please run `git merge --continue` and
push the changes to this PR.
2024-04-15 10:38:52 +02:00
Jacob Tobiasz
bce9fff156
Update php-entrypoint to give www-data permissions to public/media (#16114)
| Q | A |

|-----------------|--------------------------------------------------------------|
| Branch?         | 1.13  |
| Bug fix? | yes |
| New feature? | no |
| BC breaks? | no |
| Deprecations?   | no |
| Related tickets | fixes #X, partially #Y, mentioned in #Z |
| 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
-->
2024-04-12 11:02:38 +02:00
mihaichitic
60a9434a7f
Update php-entrypoint to give www-data permissions to public/media 2024-04-11 11:21:15 +03:00
Karol
6eff9ab037
[UPMERGE] 1.13 -> 2.0 (#16113)
This PR has been generated automatically.
For more details see
[upmerge_pr.yaml](/Sylius/Sylius/blob/1.13/.github/workflows/upmerge_pr.yaml).

**Remember!** The upmerge should always be merged with using `Merge pull
request` button.

In case of conflicts, please resolve them manually with usign the
following commands:
```
git fetch upstream
gh pr checkout <this-pr-number>
git merge upstream/2.0 -m "Resolve conflicts between 1.13 and 2.0"
```

If you use other name for the upstream remote, please replace `upstream`
with the name of your remote pointing to the `Sylius/Sylius` repository.

Once the conflicts are resolved, please run `git merge --continue` and
push the changes to this PR.
2024-04-11 09:36:32 +02:00
Wojdylak
6c3fc02be6
Resolve conflicts between 1.13 and 2.0 2024-04-11 08:31:52 +02:00
Grzegorz Sadowski
169a76d203
minor #16105 [Maintenance] Update upgrade file (Wojdylak)
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 | #16100
| License         | MIT


Commits
-------

f0de556f17 [Maintenance] Update upgrade file
2024-04-10 19:23:33 +02:00
Damian Murawski
8974f4cf59 Update FUNDING.yml 2024-04-10 12:27:09 +02:00
Damian Murawski
1a3f1c1825 Create FUNDING.yml 2024-04-10 12:27:09 +02:00
Jacob Tobiasz
a4196c7870
[UPMERGE] 1.13 -> 2.0 (#16107)
This PR has been generated automatically.
For more details see
[upmerge_pr.yaml](/Sylius/Sylius/blob/1.13/.github/workflows/upmerge_pr.yaml).

**Remember!** The upmerge should always be merged with using `Merge pull
request` button.

In case of conflicts, please resolve them manually with usign the
following commands:
```
git fetch upstream
gh pr checkout <this-pr-number>
git merge upstream/2.0 -m "Resolve conflicts between 1.13 and 2.0"
```

If you use other name for the upstream remote, please replace `upstream`
with the name of your remote pointing to the `Sylius/Sylius` repository.

Once the conflicts are resolved, please run `git merge --continue` and
push the changes to this PR.
2024-04-10 11:41:02 +02:00
Jacob Tobiasz
0b23ad4e02
Resolve conflicts between 1.13 and 2.0 2024-04-10 10:35:10 +02:00
Wojdylak
f0de556f17
[Maintenance] Update upgrade file 2024-04-09 11:50:30 +02:00
Jacob Tobiasz
739683e36d
minor #16103 [Maintenance] Deprecate SyliusLocaleEvents (NoResponseMate)
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?   | yes |
| Related tickets | -                      |
| License         | MIT                                                          |

It's not used anywhere 🤷 

Commits
-------
  [Maintenance] Deprecate `SyliusLocaleEvents`
2024-04-09 11:15:04 +02:00
Jacob Tobiasz
956a53aa8b
[UPMERGE] 1.12 -> 1.13 (#16102)
This PR has been generated automatically.
For more details see
[upmerge_pr.yaml](/Sylius/Sylius/blob/1.13/.github/workflows/upmerge_pr.yaml).

**Remember!** The upmerge should always be merged with using `Merge pull
request` button.

In case of conflicts, please resolve them manually with usign the
following commands:
```
git fetch upstream
gh pr checkout <this-pr-number>
git merge upstream/1.13 -m "Resolve conflicts between 1.12 and 1.13"
```

If you use other name for the upstream remote, please replace `upstream`
with the name of your remote pointing to the `Sylius/Sylius` repository.

Once the conflicts are resolved, please run `git merge --continue` and
push the changes to this PR.
2024-04-09 10:20:48 +02:00
Jacob Tobiasz
906187827d
[UPMERGE] 1.13 -> 2.0 (#16101)
This PR has been generated automatically.
For more details see
[upmerge_pr.yaml](/Sylius/Sylius/blob/1.13/.github/workflows/upmerge_pr.yaml).

**Remember!** The upmerge should always be merged with using `Merge pull
request` button.

In case of conflicts, please resolve them manually with usign the
following commands:
```
git fetch upstream
gh pr checkout <this-pr-number>
git merge upstream/2.0 -m "Resolve conflicts between 1.13 and 2.0"
```

If you use other name for the upstream remote, please replace `upstream`
with the name of your remote pointing to the `Sylius/Sylius` repository.

Once the conflicts are resolved, please run `git merge --continue` and
push the changes to this PR.
2024-04-09 10:20:23 +02:00
Jan Goralski
97f743fd55
[Maintenance] Deprecate SyliusLocaleEvents 2024-04-09 10:07:43 +02:00
Jan Góralski
9245b8f63c
minor #16100 [Maintenance] Add firewall for image resolver (Wojdylak)
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

[Optimize firewall configuration](https://symfony.com/bundles/LiipImagineBundle/current/basic-usage.html#optimize-firewall-configuration)

Commits
-------
  [Maintenance] Add image firewall
2024-04-08 16:01:32 +02:00
Karol
8e3cb3d358
minor #16099 BUGFIX: [ShopBundle] #16068 wrap long text in product description (crydotsnake)
This PR was merged into the 1.12 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.12.                                                        |
| Bug fix?        | yes.                                                         |
| New feature?    | no                                                           |
| BC breaks?      | no.                                                          |
| Deprecations?   | no                                                           |
| Related tickets | fixes #16068,                                                |
| 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
-->

Its the same behavior as in: #16031 

![SCR-20240406-hdyh](https://github.com/Sylius/Sylius/assets/39345336/4fc9f839-3070-4b04-bde7-754fdef69307)



Commits
-------
  BUGFIX: [ShopBundle] #16068 wrap long text in product description
2024-04-08 12:52:39 +02:00
Wojdylak
f62a814d48
[Maintenance] Add image firewall 2024-04-08 12:44:29 +02:00
Simon Krull
f004659c48 BUGFIX: [ShopBundle] #16068 wrap long text in product description 2024-04-06 07:27:55 +02:00
Grzegorz Sadowski
0e70ea37f0
Merge branch '1.13' into 2.0
* 1.13:
  [Maintenance] Change names of tests
  [Maintenance] Change tex to tax
2024-04-05 07:30:51 +02:00
Grzegorz Sadowski
9dfbb6debb
minor #16092 Minor correction of names (Wojdylak)
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
-------

3491859b3d [Maintenance] Change tex to tax
96c85e565a [Maintenance] Change names of tests
2024-04-04 14:59:34 +02:00
Wojdylak
96c85e565a
[Maintenance] Change names of tests 2024-04-04 13:29:09 +02:00
Wojdylak
3491859b3d
[Maintenance] Change tex to tax 2024-04-04 13:26:47 +02:00
Grzegorz Sadowski
1d4bf2477c [Behat] Remove unneeded config for sylius/calendar 2024-04-03 12:17:57 +02:00
Grzegorz Sadowski
76c12e8d8f
Merge branch '1.13' into 2.0
* 1.13:
  [API][Maintenance] Remove unnecessary enabled option
  [CS][DX] Refactor
  BUGFIX: [AdminBundle] #16031 wrap long text in notes section
2024-04-03 11:43:19 +02:00
Grzegorz Sadowski
46fb261f1f
Merge branch '1.12' into 1.13
* 1.12:
  BUGFIX: [AdminBundle] #16031 wrap long text in notes section
2024-04-03 11:43:14 +02:00
Grzegorz Sadowski
b5dd68c544
refactor #16085 [CS][DX] Refactor ()
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
-------

b74deac766 [CS][DX] Refactor
2024-04-03 11:40:50 +02:00
Jan Góralski
bef777eac0
minor #16086 [API][Maintenance] Remove unnecessary enabled option (Wojdylak)
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
-------
  [API][Maintenance] Remove unnecessary enabled option
2024-04-03 11:19:35 +02:00
Karol
0e9aeb0107
minor #16076 BUGFIX: [AdminBundle] #16031 wrap long text in notes section (crydotsnake)
This PR was merged into the 1.12 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.12.        <!-- see the comment below -->                  |
| Bug fix?        | yes.                                                         |
| New feature?    | no.                                                          |
| BC breaks?      | no.                                                          |
| Deprecations?   | no.    <!-- don't forget to update the UPGRADE-*.md file --> |
| Related tickets | fixes #16031                       |
| 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
-->

As already described in #16031 

When you have a long text in the notes info without any spaces and new lines, the text doesent wrap and therefore it breaks out of the container.

So i added a `word-break: break-word;` to the ID: `sylius-order-notes` in the `_ui.scss` file.

### Result

![SCR-20240330-mypw](https://github.com/Sylius/Sylius/assets/39345336/a7c7b395-70bf-40c3-882b-f7a1b044591e)


Commits
-------
  BUGFIX: [AdminBundle] #16031 wrap long text in notes section
2024-04-03 10:33:29 +02:00
Wojdylak
3ffa1c59c8
[API][Maintenance] Remove unnecessary enabled option 2024-04-03 09:49:52 +02:00
Grzegorz Sadowski
5e3c6943d6
Merge branch '1.13' into 2.0
* 1.13:
  [API][Test] Minor updating of functions name
  [API][Test] Add common response for different databases
  [API] Add respons for order item unit test
  Add nullable to phpstan type
  [Api][Shop] Improve orders tests
  [Api][Shop] Add Checkout/CompletionTest
  [Api][Shop] Add Checkout/PaymentMethodTest
  [Api][Shop] Add Checkout/ShippingMethodTest
  [Api][Shop] Add Checkout/CartTest
  [Api][Shop] Add paymentNotFound validation to ChosenPaymentMethodEligibility class
2024-04-03 07:00:46 +02:00
Grzegorz Sadowski
96fe9c4dbc
minor #16073 [API][Shop] Improve Order and Checkout tests (Wojdylak)
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

Based on #16063

Commits
-------

ede8121c8e [Api][Shop] Add paymentNotFound validation to ChosenPaymentMethodEligibility class
ad53e3d569 [Api][Shop] Add Checkout/CartTest
1663553482 [Api][Shop] Add Checkout/ShippingMethodTest
279156675c [Api][Shop] Add Checkout/PaymentMethodTest
1313080304 [Api][Shop] Add Checkout/CompletionTest
833ac87af3 [Api][Shop] Improve orders tests
3b4f5eba2a Add nullable to phpstan type
da70b88f70 [API] Add respons for order item unit test
9f07f0c3d1 [API][Test] Add common response for different databases
324f4300da [API][Test] Minor updating of functions name
2024-04-03 07:00:24 +02:00
Sylius Bot
b74deac766 [CS][DX] Refactor 2024-04-03 02:12:42 +00:00
Grzegorz Sadowski
8804b6e8c1
Merge branch '1.13' into 2.0
* 1.13:
  Change application's version to v1.13.0-DEV
  Generate changelog for v1.13.0-BETA.1
  Change application's version to v1.13.0-BETA.1
2024-04-02 13:25:11 +02:00
Grzegorz Sadowski
f4b8d4df8b
Change application's version to v1.13.0-DEV 2024-04-02 13:12:32 +02:00
Grzegorz Sadowski
df572d730a
Generate changelog for v1.13.0-BETA.1 2024-04-02 12:58:40 +02:00
Grzegorz Sadowski
af0e408993
Change application's version to v1.13.0-BETA.1 2024-04-02 12:54:54 +02:00
Grzegorz Sadowski
5d93c43eca
Merge branch '1.13' into 2.0
* 1.13:
  [Inventory] Fix deprecation note of sylius_inventory.checker configuration
  [Inventory] Add deprecation for sylius_inventory.checker config
  Add note to the UPGRADE file about changing the service argument
  Using the service name for the availibilty checker
  [API][Test] Minor updating of functions name
  [Payum] Move validation groups configuration to PayumBundle
  Move config to Core, SyliusPaymentBundle do not requires SyliusPayumBundle
  [Api][Admin] Add ChannelNotFoundException to OrderAddressRequirementValidator
  [Api][Admin] Change validation message of address requirement
  [Api][Admin] Fix get channels test
  [Api][Checkout] Add validation for required address
  [Maintenance][API] Secure and cleanup openapi documentation modifiers
2024-04-02 12:45:15 +02:00
Jan Góralski
e539f65049
minor #16082 [Inventory] Fix deprecation note of sylius_inventory.checker configuration (GSadee)
This PR was merged into the 1.13 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.13|
| Bug fix?        | yes                                                       |
| New feature?    | no                                                       |
| BC breaks?      | nox                                                       |
| Deprecations?   | yes <!-- don't forget to update the UPGRADE-*.md file --> |
| Related tickets | after https://github.com/Sylius/Sylius/pull/16062|
| 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
-------
  [Inventory] Fix deprecation note of sylius_inventory.checker configuration
2024-04-02 12:13:17 +02:00
Grzegorz Sadowski
8068063da4
[Inventory] Fix deprecation note of sylius_inventory.checker configuration 2024-04-02 12:09:01 +02:00
Jan Góralski
9bfc5b13c0
bugfix #16062 Using the service name for the availibilty checker (mamazu)
This PR was merged into the 1.13 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.12        |
| Bug fix?        | yes (for plus users)                                                   |
| New feature?    | no                                                       |
| BC breaks?      | no                                                       |
| Deprecations?   | no |
| Related tickets | -                      |
| License         | MIT                                                          |

## The problem

With Sylius plus the  `sylius.availability_checker` service is overwritten with a more complicated logic. Using the autowireable interface will always default to the Sylius core implemenation.

## The solution
Use the service name.

In the long run maybe deprecate the service name and only overwrite the interface in Sylius Plus.


Commits
-------
  Using the service name for the availibilty checker
  Add note to the UPGRADE file about changing the service argument
  [Inventory] Add deprecation for sylius_inventory.checker config
2024-04-02 12:03:21 +02:00
Wojdylak
324f4300da
[API][Test] Minor updating of functions name 2024-04-02 11:14:54 +02:00
Wojdylak
9f07f0c3d1
[API][Test] Add common response for different databases 2024-04-02 11:14:54 +02:00
Wojdylak
da70b88f70
[API] Add respons for order item unit test 2024-04-02 11:14:54 +02:00
Wojdylak
3b4f5eba2a
Add nullable to phpstan type 2024-04-02 11:14:53 +02:00
Wojdylak
833ac87af3
[Api][Shop] Improve orders tests 2024-04-02 11:14:53 +02:00
Wojdylak
1313080304
[Api][Shop] Add Checkout/CompletionTest 2024-04-02 11:14:53 +02:00
Wojdylak
279156675c
[Api][Shop] Add Checkout/PaymentMethodTest 2024-04-02 11:14:52 +02:00
Wojdylak
1663553482
[Api][Shop] Add Checkout/ShippingMethodTest 2024-04-02 11:14:52 +02:00
Wojdylak
ad53e3d569
[Api][Shop] Add Checkout/CartTest 2024-04-02 11:14:52 +02:00