Commit graph

576 commits

Author SHA1 Message Date
Kamil Kokot
4d8dae96bc
Merge branch '1.7'
* 1.7:
  Remove inheritdoc directives
  Apply coding standard fixes
  Upgrade yarn.lock
  [Docs] fix sylius plus deployment
  Update github PR template
  Sylius 1.4 end of security support
  [Fix] Less strict symfony form conflict
  [Translations] Updated translations from Crowdin
  Changed descriptions and added italic font
  change lorem ipsum description and fix carousel header
2020-06-24 14:16:07 +02:00
Łukasz Chruściel
130afb5cc8
minor #11593 Upgrade static analysis tools and improve their usage (pamil)
This PR was merged into the 1.7-dev branch.

Discussion
----------



Commits
-------

5973709e62 Upgrade static analysis tools and improve their usage
2020-06-18 19:23:53 +02:00
Kamil Kokot
11672f575e
minor #11507 Synchronise packages composer.json files with the main one + normalize them (pamil)
This PR was merged into the 1.8-dev branch.

Discussion
----------

Related to #11500. Used https://github.com/ergebnis/composer-normalize to normalize composer.json files.

Commits
-------

86fdef2b89 Synchronise packages composer.json files with the main one + normalize them
2020-06-18 17:56:19 +02:00
Kamil Kokot
5973709e62
Upgrade static analysis tools and improve their usage 2020-06-18 17:42:57 +02:00
Łukasz Chruściel
ced5416777
[Fix] Less strict symfony form conflict 2020-06-16 08:48:28 +02:00
Łukasz Chruściel
450ddd15f0
Merge branch '1.7'
* 1.7:
  Add symfony/form conflict
  Add Sylius template events
2020-06-16 08:44:56 +02:00
Tomanhez
4783b51b95
Add symfony/form conflict 2020-06-16 07:19:27 +02:00
Kamil Kokot
86fdef2b89
Synchronise packages composer.json files with the main one + normalize them 2020-06-10 17:17:54 +02:00
Łukasz Chruściel
f8b1f49800
Merge branch '1.7'
* 1.7:
  [Maintenance] Add conflict to the 4.4.9 version of symfony/form
  Update order processor documentation
2020-06-02 14:29:25 +02:00
Grzegorz Sadowski
a38c470ea1
[Maintenance] Add conflict to the 4.4.9 version of symfony/form 2020-06-02 09:40:11 +02:00
Grzegorz Sadowski
de3ef03487
[Maintenance] Temporarily extend conflict to the ^2.5.5 versions of api-platform/core 2020-05-29 10:26:17 +02:00
Kamil Kokot
1df073cb29
Merge branch '1.7'
* 1.7:
  Travis Bionic + Chrome Headless + PHP 7.4 support
2020-05-26 20:50:36 +02:00
Kamil Kokot
58b043756b
Travis Bionic + Chrome Headless + PHP 7.4 support 2020-05-26 20:20:04 +02:00
Kamil Kokot
bd39d6c1d7
[Maintenance] Bump up minor versions of requirements 2020-05-25 11:28:53 +02:00
Mateusz Zalewski
1469b92f20
[Hot-fix] Conflict SyliusFixturesBundle 1.6.0 2020-05-25 10:23:10 +02:00
Jacques Bodin-Hullin
9cbd186086
Use https instead of http for all (almost) links
Use https for:
- github.com
- symfony.com
- sylius.com
- docs.sylius.com
- php.net
- pjedrzejewski.com
- phpspec.net

No change in translation files because it's managed by crowdin.
No change in XML files or XML code blocks.
2020-05-16 19:59:12 +02:00
Kamil Kokot
b05dcd032c
Merge branch '1.7'
* 1.7:
  [Documentation] Fix login & failure path
  [Docs] Redirect Registry docs to external URL
  [Docs] Redirect Grid & GridBundle docs to external URL
  [Docs] Redirect Resource & ResourceBundle docs to external URL
  [Docs] Redirect Mailer & MailerBundle docs to external URL
  [Docs] Redirect FixturesBundle docs to external URL
  [Docs] Redirect ThemeBundle docs to external URL
  [Docs] Allow redirecting to URLs
  synchronise dependencies
2020-05-12 11:43:29 +02:00
arti0090
05628cf906 synchronise dependencies 2020-05-11 13:38:31 +02:00
arti0090
a54119c9f9 synchronise dependencies 2020-05-11 12:30:52 +02:00
Grzegorz Sadowski
4113a0bf26
Merge branch '1.7'
* 1.7:
  [Composer] Add conflict to doctrine/inflector ^1.4 to fix taxons
2020-05-11 08:52:21 +02:00
Grzegorz Sadowski
7da61c9361
[Composer] Add conflict to doctrine/inflector ^1.4 to fix taxons 2020-05-11 08:16:33 +02:00
Łukasz Chruściel
25e93dc1b3
Revert "[Backend] Feeding sales statistics graph with date from chosen period" 2020-05-08 12:39:41 +02:00
Łukasz Chruściel
f6819a26e2
[Maintenance] Upgrade psalm version 2020-05-06 20:40:09 +02:00
Adam Kasperczak
092c6f9594 replace sql with DQL in statistic provider 2020-05-06 14:40:07 +02:00
Mateusz Zalewski
c0f05e9918
Conflict API Platform 2.5.5 to fix the build 2020-04-24 09:42:44 +02:00
Olivier ALLAIN
5f71fd358c update Psalm version 2020-04-20 19:47:43 +02:00
Kamil Kokot
e5f7fc3e28
[API] Registering shop users 2020-04-15 17:07:57 +02:00
Grzegorz Sadowski
d3222c3550
Merge branch '1.7'
* 1.7:
  [Maintenance] Add mockery dependency
  [Maintenance][Travis] Upgrade php memory to 4G
  [Maintenance][Travis] Turn off composer scripts during installation
  [Maintenance] Fix unit assertion
2020-04-14 08:56:45 +02:00
Łukasz Chruściel
a4b16d6e5c
[Maintenance] Add mockery dependency 2020-04-13 20:31:49 +02:00
Kamil Kokot
f5564d0ed6
Merge branch '1.7'
* 1.7:
  [Maintenance] Remove memory swap
  [Maintenance] Lower Sylius\ThemeBundle to 1.5
  [Maintenance] Lower Sylius\FixtureBundle to 1.4
  [Maintenance] Lower Sylius\Registry to 1.4 & Sylius\Mailer to 1.4
  [Maintenance] Upgrade packages to Sylius ^1.6
  Attempting to create swap space to accomodate composer's memory issues
  Refactored unit test for the order items subtotal calculator test
  Removed doc from constructor
  Update src/Sylius/Bundle/ShopBundle/Twig/OrderItemsSubtotalExtension.php
  Also triggering user deprecation "error"
  Changed todo into deprecation comment
  Made injection of calculator in twig extension optional
  Enabling psalm plugin
  Added mockery plugin for psalm
  Separated order items subtotal calculation logic from twig extension
  Use only empty function to check property path
  Check is null
  Check if PropertyPath is empty for add error to form
2020-04-10 13:06:10 +02:00
Kamil Kokot
895c0509c3
Merge branch '1.6' into 1.7
* 1.6:
  [Maintenance] Remove memory swap
  [Maintenance] Lower Sylius\ThemeBundle to 1.5
  [Maintenance] Lower Sylius\FixtureBundle to 1.4
  [Maintenance] Lower Sylius\Registry to 1.4 & Sylius\Mailer to 1.4
  [Maintenance] Upgrade packages to Sylius ^1.6
  Attempting to create swap space to accomodate composer's memory issues
  Refactored unit test for the order items subtotal calculator test
  Removed doc from constructor
  Update src/Sylius/Bundle/ShopBundle/Twig/OrderItemsSubtotalExtension.php
  Also triggering user deprecation "error"
  Changed todo into deprecation comment
  Made injection of calculator in twig extension optional
  Enabling psalm plugin
  Added mockery plugin for psalm
  Separated order items subtotal calculation logic from twig extension
  Use only empty function to check property path
  Check is null
  Check if PropertyPath is empty for add error to form
2020-04-10 11:11:51 +02:00
Łukasz Chruściel
ade9a9e58a
refactor #11191 Separated order items subtotal calculation logic from twig extension (4c0n)
This PR was merged into the 1.6 branch.

Discussion
----------

| Q               | A
| --------------- | -----
| Branch?         | 1.6
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| License         | MIT

I'd like to be able to use the logic for calculating the subtotal of all order items outside of Twig templates, hence this separation.


Commits
-------

dc9abca3c7 Separated order items subtotal calculation logic from twig extension
06397e9ed9 Added mockery plugin for psalm
09d39b2940 Enabling psalm plugin
40c277ed94 Made injection of calculator in twig extension optional
d7f483d042 Changed todo into deprecation comment
6367184928 Also triggering user deprecation "error"
2f08497550 Update src/Sylius/Bundle/ShopBundle/Twig/OrderItemsSubtotalExtension.php
1ad620448f Removed doc from constructor
f4839fb327 Refactored unit test for the order items subtotal calculator test
7cca8bc5d2 Merge branch 'feature/separate-order-items-subtotal-calculation-logic' of github.com:4c0n/Sylius into feature/separate-order-items-subtotal-calculation-logic
0f64d06909 Attempting to create swap space to accomodate composer's memory issues
2020-04-09 17:10:19 +02:00
Kamil Kokot
0a1f161b04
Try out Behat packages supporting Symfony 5 2020-04-04 20:54:41 +02:00
Kamil Kokot
f447181251
[Symfony 5] Upgrade to PHPUnit 8 and DependencyInjectionTest 4 2020-04-02 23:40:44 +02:00
Kamil Kokot
3f1fc5abc2
refactor #11281 [Maintenance] Bump ApiTestCase to v5.0 (lchrusciel)
This PR was merged into the 1.8-dev branch.

Discussion
----------

| Q               | A
| --------------- | -----
| Branch?         | master
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | Partially #10928 
| License         | MIT

<!--
 - Bug fixes must be submitted against the 1.6 or 1.7 branches (the lowest possible)
 - Features and deprecations must be submitted against the master branch
 - Make sure that the correct base branch is set
-->


Commits
-------

71a71d9c52 [Maintenance] Bump ApiTestCase to v5.0
2020-04-02 10:50:46 +02:00
Łukasz Chruściel
593c50a2cb
Merge branch '1.7'
* 1.7:
  Install symfony/polyfill-php80 to fix the psalm build
2020-03-31 17:38:19 +02:00
Łukasz Chruściel
d20fba9b02
Merge branch '1.6' into 1.7
* 1.6:
  Install symfony/polyfill-php80 to fix the psalm build
2020-03-31 17:34:58 +02:00
Mateusz Zalewski
b8bfc58c5e
Install symfony/polyfill-php80 to fix the psalm build 2020-03-31 16:39:21 +02:00
Łukasz Chruściel
71a71d9c52
[Maintenance] Bump ApiTestCase to v5.0 2020-03-28 17:44:10 +01:00
Grzegorz Sadowski
c724c9fbc2
[Psalm] Add symfony/polyfill-php80 to fix build 2020-03-27 15:09:25 +01:00
Grzegorz Sadowski
0d25d47ee7
[API] Implement managing payment state feature 2020-03-17 15:14:29 +01:00
Mateusz Zalewski
f4d7b54da3
[API] Install jwt authentication bundle and configure basic security 2020-03-17 15:14:24 +01:00
Kamil Kokot
90fd5eb6b9
Init API Bundle 2020-03-17 15:14:17 +01:00
Youri Westerman
06397e9ed9 Added mockery plugin for psalm 2020-03-06 14:17:54 +01:00
Łukasz Chruściel
c23f5c107a
Merge branch '1.7'
* 1.7:
  Update Mink-related libraries to allow for Symfony 5
  Fix fot totals event
  Add yaml configuration for new template events
  Move twig content to new templates in Block
  Add new blocks in ShopBundle/Resources/views/Block/Layout
  Add block config
  Add deprecated notes
  Move twig html from templates to blocks
  Add new blocks in ShopBundle/Cart/Block
  [Docs] Mention minimum-stability in Plus installation
  [Docs] Fix installation steps
  Add documentation to deploy Sylius to SymfonyCloud
  user provider fix exception
2020-02-27 10:46:28 +01:00
Kamil Kokot
a046604d90
Update Mink-related libraries to allow for Symfony 5 2020-02-26 15:00:17 +01:00
Kamil Kokot
70f6b60bc2
Prepare master branch for v1.8.0-DEV 2020-02-12 14:21:53 +01:00
Grzegorz Sadowski
b3d94ed448
[Composer] Add conflicts to fix build for Symfony 3.4 2020-02-05 21:39:14 +01:00
Kamil Kokot
5ba9b638ae
Revert "Move "php-http/guzzle6-adapter" to "require-dev"" 2020-01-23 15:44:43 +01:00
Łukasz Chruściel
12c6d0a72b
minor #11057 Move "php-http/guzzle6-adapter" to "require-dev" (pamil)
This PR was merged into the 1.7-dev branch.

Discussion
----------

It is required only by "hwi/oauth-bundle" which is in "require-dev" as well.

Commits
-------

fd46e93eca Move "php-http/guzzle6-adapter" to "require-dev"
2020-01-23 13:03:31 +01:00