Skip to content
Permalink
Browse files

Merge branch '1.3' into 1.4

* 1.3:
  Scaling text input field to keep enough room for the buttons
  Change branches in Sylius PR template to supported ones
  Fix recent Composer deprecations
  Update to PHPUnit ^7.0
  • Loading branch information...
pamil committed Feb 11, 2019
2 parents 3e418ec + 372a1b8 commit 81e1dbb6cf88db57b93c6d6769b82d92feea6548
Showing with 87 additions and 75 deletions.
  1. +1 −1 .github/PULL_REQUEST_TEMPLATE.md
  2. +4 −4 composer.json
  3. +1 −1 phpunit.xml.dist
  4. +1 −1 src/Sylius/Bundle/AddressingBundle/composer.json
  5. +1 −1 src/Sylius/Bundle/AddressingBundle/phpunit.xml.dist
  6. +1 −1 src/Sylius/Bundle/AdminApiBundle/composer.json
  7. +1 −1 src/Sylius/Bundle/AdminBundle/composer.json
  8. +1 −1 src/Sylius/Bundle/AdminBundle/phpunit.xml.dist
  9. +1 −1 src/Sylius/Bundle/AttributeBundle/composer.json
  10. +1 −1 src/Sylius/Bundle/AttributeBundle/phpunit.xml.dist
  11. +2 −2 src/Sylius/Bundle/ChannelBundle/composer.json
  12. +1 −1 src/Sylius/Bundle/ChannelBundle/phpunit.xml.dist
  13. +3 −3 src/Sylius/Bundle/CoreBundle/composer.json
  14. +1 −1 src/Sylius/Bundle/CoreBundle/phpunit.xml.dist
  15. +1 −1 src/Sylius/Bundle/CurrencyBundle/composer.json
  16. +1 −1 src/Sylius/Bundle/CurrencyBundle/phpunit.xml.dist
  17. +1 −1 src/Sylius/Bundle/CustomerBundle/composer.json
  18. +1 −1 src/Sylius/Bundle/CustomerBundle/phpunit.xml.dist
  19. +3 −3 src/Sylius/Bundle/FixturesBundle/composer.json
  20. +1 −1 src/Sylius/Bundle/FixturesBundle/phpunit.xml.dist
  21. +3 −3 src/Sylius/Bundle/GridBundle/composer.json
  22. +1 −1 src/Sylius/Bundle/GridBundle/phpunit.xml.dist
  23. +1 −1 src/Sylius/Bundle/InventoryBundle/composer.json
  24. +1 −1 src/Sylius/Bundle/InventoryBundle/phpunit.xml.dist
  25. +1 −1 src/Sylius/Bundle/LocaleBundle/composer.json
  26. +1 −1 src/Sylius/Bundle/LocaleBundle/phpunit.xml.dist
  27. +1 −1 src/Sylius/Bundle/MailerBundle/composer.json
  28. +1 −1 src/Sylius/Bundle/MailerBundle/phpunit.xml.dist
  29. +1 −1 src/Sylius/Bundle/MoneyBundle/composer.json
  30. +1 −1 src/Sylius/Bundle/MoneyBundle/phpunit.xml.dist
  31. +2 −2 src/Sylius/Bundle/OrderBundle/composer.json
  32. +1 −1 src/Sylius/Bundle/OrderBundle/phpunit.xml.dist
  33. +1 −1 src/Sylius/Bundle/PaymentBundle/composer.json
  34. +1 −1 src/Sylius/Bundle/PaymentBundle/phpunit.xml.dist
  35. +1 −1 src/Sylius/Bundle/ProductBundle/composer.json
  36. +1 −1 src/Sylius/Bundle/ProductBundle/phpunit.xml.dist
  37. +2 −2 src/Sylius/Bundle/PromotionBundle/composer.json
  38. +1 −1 src/Sylius/Bundle/PromotionBundle/phpunit.xml.dist
  39. +2 −2 src/Sylius/Bundle/ResourceBundle/composer.json
  40. +1 −1 src/Sylius/Bundle/ResourceBundle/phpunit.xml.dist
  41. +1 −1 src/Sylius/Bundle/ReviewBundle/composer.json
  42. +1 −1 src/Sylius/Bundle/ReviewBundle/phpunit.xml.dist
  43. +1 −1 src/Sylius/Bundle/ShippingBundle/composer.json
  44. +1 −1 src/Sylius/Bundle/ShippingBundle/phpunit.xml.dist
  45. +12 −0 src/Sylius/Bundle/ShopBundle/Resources/private/scss/style.scss
  46. +3 −3 src/Sylius/Bundle/ShopBundle/Resources/views/Product/Index/_search.html.twig
  47. +3 −3 src/Sylius/Bundle/ShopBundle/composer.json
  48. +1 −1 src/Sylius/Bundle/ShopBundle/phpunit.xml.dist
  49. +1 −1 src/Sylius/Bundle/TaxationBundle/composer.json
  50. +1 −1 src/Sylius/Bundle/TaxationBundle/phpunit.xml.dist
  51. +1 −1 src/Sylius/Bundle/TaxonomyBundle/composer.json
  52. +1 −1 src/Sylius/Bundle/TaxonomyBundle/phpunit.xml.dist
  53. +4 −4 src/Sylius/Bundle/ThemeBundle/composer.json
  54. +1 −1 src/Sylius/Bundle/ThemeBundle/phpunit.xml.dist
  55. +1 −1 src/Sylius/Bundle/UserBundle/composer.json
  56. +1 −1 src/Sylius/Bundle/UserBundle/phpunit.xml.dist
@@ -1,6 +1,6 @@
| Q | A
| --------------- | -----
| Branch? | 1.2, 1.3 or master <!-- see the comment below -->
| Branch? | 1.3, 1.4 or master <!-- see the comment below -->
| Bug fix? | no/yes
| New feature? | no/yes
| BC breaks? | no/yes
@@ -104,16 +104,16 @@
"hwi/oauth-bundle": "^0.6",
"lchrusciel/api-test-case": "^3.1.0",
"lakion/mink-debug-extension": "^1.2.3",
"matthiasnoback/symfony-config-test": "^3.0",
"matthiasnoback/symfony-dependency-injection-test": "^2.0",
"mikey179/vfsStream": "^1.6",
"matthiasnoback/symfony-config-test": "^4.0",
"matthiasnoback/symfony-dependency-injection-test": "^3.0",
"mikey179/vfsstream": "^1.6",
"pamil/phpspec-skip-example-extension": "^4.0",
"pamil/prophecy-common": "^0.1",
"phpspec/phpspec": "^5.0",
"phpstan/phpstan-doctrine": "^0.10",
"phpstan/phpstan-shim": "^0.10",
"phpstan/phpstan-webmozart-assert": "^0.10",
"phpunit/phpunit": "^6.5",
"phpunit/phpunit": "^7.0",
"sensiolabs/security-checker": "^5.0",
"stripe/stripe-php": "^4.1",
"sylius-labs/coding-standard": "^3.0",
@@ -2,7 +2,7 @@

<!-- https://phpunit.de/manual/current/en/appendixes.configuration.html -->
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.5/phpunit.xsd"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.0/phpunit.xsd"
colors="true"
bootstrap="config/bootstrap.php"
>
@@ -33,7 +33,7 @@
"symfony/dependency-injection": "^3.4|^4.1.1",
"symfony/form": "^3.4|^4.1.1",
"symfony/validator": "^3.4|^4.1.1",
"phpunit/phpunit": "^6.5",
"phpunit/phpunit": "^7.0",
"symfony/browser-kit": "^3.4|^4.1.1",
"polishsymfonycommunity/symfony-mocker-container": "^1.0"
},
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>

<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.5/phpunit.xsd"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.0/phpunit.xsd"
colors="true"
>
<php>
@@ -31,7 +31,7 @@
"require-dev": {
"doctrine/orm": "^2.5",
"phpspec/phpspec": "^5.0",
"phpunit/phpunit": "^6.5",
"phpunit/phpunit": "^7.0",
"symfony/dependency-injection": "^3.4|^4.1.1",
"twig/twig": "^2.0"
},
@@ -29,7 +29,7 @@
},
"require-dev": {
"phpspec/phpspec": "^5.0",
"phpunit/phpunit": "^6.5",
"phpunit/phpunit": "^7.0",
"symfony/dependency-injection": "^3.4|^4.1.1"
},
"conflict": {
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>

<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.5/phpunit.xsd"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.0/phpunit.xsd"
colors="true"
>
<testsuites>
@@ -32,7 +32,7 @@
"require-dev": {
"doctrine/orm": "^2.5",
"phpspec/phpspec": "^5.0",
"phpunit/phpunit": "^6.5",
"phpunit/phpunit": "^7.0",
"symfony/dependency-injection": "^3.4|^4.1.1",
"symfony/form": "^3.4|^4.1.1",
"symfony/browser-kit": "^3.4|^4.1.1",
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>

<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.5/phpunit.xsd"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.0/phpunit.xsd"
colors="true"
>
<php>
@@ -27,9 +27,9 @@
"symfony/framework-bundle": "^3.4|^4.1.1"
},
"require-dev": {
"matthiasnoback/symfony-dependency-injection-test": "^2.0",
"matthiasnoback/symfony-dependency-injection-test": "^3.0",
"phpspec/phpspec": "^5.0",
"phpunit/phpunit": "^6.5",
"phpunit/phpunit": "^7.0",
"twig/twig": "^2.0",
"doctrine/orm": "^2.5",
"symfony/dependency-injection": "^3.4|^4.1.1",
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>

<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.5/phpunit.xsd"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.0/phpunit.xsd"
colors="true"
>
<php>
@@ -56,10 +56,10 @@
},
"require-dev": {
"hwi/oauth-bundle": "^0.6",
"matthiasnoback/symfony-config-test": "^3.0",
"matthiasnoback/symfony-dependency-injection-test": "^2.0",
"matthiasnoback/symfony-config-test": "^4.0",
"matthiasnoback/symfony-dependency-injection-test": "^3.0",
"phpspec/phpspec": "^5.0",
"phpunit/phpunit": "^6.5",
"phpunit/phpunit": "^7.0",
"symfony/dependency-injection": "^3.4|^4.1.1"
},
"conflict": {
@@ -2,7 +2,7 @@

<!-- http://phpunit.de/manual/4.1/en/appendixes.configuration.html -->
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.5/phpunit.xsd"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.0/phpunit.xsd"
colors="true"
>
<testsuites>
@@ -30,7 +30,7 @@
"require-dev": {
"doctrine/orm": "^2.5",
"phpspec/phpspec": "^5.0",
"phpunit/phpunit": "^6.5",
"phpunit/phpunit": "^7.0",
"twig/twig": "^2.0",
"symfony/dependency-injection": "^3.4|^4.1.1",
"symfony/form": "^3.4|^4.1.1",
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>

<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.5/phpunit.xsd"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.0/phpunit.xsd"
colors="true"
>
<php>
@@ -43,7 +43,7 @@
},
"require-dev": {
"phpspec/phpspec": "^5.0",
"phpunit/phpunit": "^6.5",
"phpunit/phpunit": "^7.0",
"symfony/dependency-injection": "^3.4|^4.1.1",
"symfony/form": "^3.4|^4.1.1",
"symfony/browser-kit": "^3.4|^4.1.1",
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>

<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.5/phpunit.xsd"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.0/phpunit.xsd"
colors="true"
>
<php>
@@ -32,10 +32,10 @@
"require-dev": {
"doctrine/orm": "^2.5",
"doctrine/doctrine-bundle": "^1.3",
"matthiasnoback/symfony-config-test": "^3.0",
"matthiasnoback/symfony-dependency-injection-test": "^2.0",
"matthiasnoback/symfony-config-test": "^4.0",
"matthiasnoback/symfony-dependency-injection-test": "^3.0",
"phpspec/phpspec": "^5.0",
"phpunit/phpunit": "^6.5",
"phpunit/phpunit": "^7.0",
"twig/twig": "^2.0",
"symfony/browser-kit": "^3.4|^4.1.1",
"symfony/dependency-injection": "^3.4|^4.1.1",
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>

<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.5/phpunit.xsd"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.0/phpunit.xsd"
colors="true"
>
<php>
@@ -33,12 +33,12 @@
"doctrine/orm": "^2.5",
"doctrine/phpcr-odm": "^1.3",
"jackalope/jackalope-doctrine-dbal": "^1.2",
"matthiasnoback/symfony-config-test": "^3.0",
"matthiasnoback/symfony-dependency-injection-test": "^2.0",
"matthiasnoback/symfony-config-test": "^4.0",
"matthiasnoback/symfony-dependency-injection-test": "^3.0",
"ocramius/proxy-manager": "^2.1",
"pagerfanta/pagerfanta": "^1.0|^2.0",
"phpspec/phpspec": "^5.0",
"phpunit/phpunit": "^6.5",
"phpunit/phpunit": "^7.0",
"polishsymfonycommunity/symfony-mocker-container": "^1.0",
"symfony/browser-kit": "^3.4|^4.1.1",
"symfony/dependency-injection": "^3.4|^4.1.1",
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>

<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.5/phpunit.xsd"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.0/phpunit.xsd"
colors="true"
>
<php>
@@ -31,7 +31,7 @@
"require-dev": {
"doctrine/orm": "^2.5",
"phpspec/phpspec": "^5.0",
"phpunit/phpunit": "^6.5",
"phpunit/phpunit": "^7.0",
"twig/twig": "^2.0",
"symfony/browser-kit": "^3.4|^4.1.1",
"symfony/dependency-injection": "^3.4|^4.1.1",
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>

<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.5/phpunit.xsd"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.0/phpunit.xsd"
colors="true"
>
<php>
@@ -30,7 +30,7 @@
"require-dev": {
"doctrine/orm": "^2.5",
"phpspec/phpspec": "^5.0",
"phpunit/phpunit": "^6.5",
"phpunit/phpunit": "^7.0",
"twig/twig": "^2.0",
"ocramius/proxy-manager": "^2.0",
"symfony/browser-kit": "^3.4|^4.1.1",
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>

<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.5/phpunit.xsd"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.0/phpunit.xsd"
colors="true"
>
<php>
@@ -27,7 +27,7 @@
},
"require-dev": {
"phpspec/phpspec": "^5.0",
"phpunit/phpunit": "^6.5",
"phpunit/phpunit": "^7.0",
"polishsymfonycommunity/symfony-mocker-container": "^1.0",
"symfony/browser-kit": "^3.4|^4.1.1",
"symfony/dependency-injection": "^3.4|^4.1.1",
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>

<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.5/phpunit.xsd"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.0/phpunit.xsd"
colors="true"
>
<php>
@@ -31,7 +31,7 @@
"require-dev": {
"doctrine/orm": "^2.5",
"phpspec/phpspec": "^5.0",
"phpunit/phpunit": "^6.5",
"phpunit/phpunit": "^7.0",
"twig/twig": "^2.0",
"sylius/currency-bundle": "^1.2",
"symfony/form": "^3.4|^4.1.1",
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>

<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.5/phpunit.xsd"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.0/phpunit.xsd"
colors="true"
>
<php>
@@ -31,9 +31,9 @@
},
"require-dev": {
"doctrine/orm": "^2.5",
"matthiasnoback/symfony-dependency-injection-test": "^2.0",
"matthiasnoback/symfony-dependency-injection-test": "^3.0",
"phpspec/phpspec": "^5.0",
"phpunit/phpunit": "^6.5",
"phpunit/phpunit": "^7.0",
"polishsymfonycommunity/symfony-mocker-container": "^1.0",
"symfony/browser-kit": "^3.4|^4.1.1",
"symfony/dependency-injection": "^3.4|^4.1.1",
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>

<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.5/phpunit.xsd"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.0/phpunit.xsd"
colors="true"
>
<php>
@@ -30,7 +30,7 @@
"doctrine/orm": "^2.5",
"phpspec/phpspec": "^5.0",
"sylius/locale-bundle": "^1.2",
"phpunit/phpunit": "^6.5",
"phpunit/phpunit": "^7.0",
"symfony/browser-kit": "^3.4|^4.1.1",
"symfony/dependency-injection": "^3.4|^4.1.1",
"polishsymfonycommunity/symfony-mocker-container": "^1.0"
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>

<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.5/phpunit.xsd"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.0/phpunit.xsd"
colors="true"
>
<php>
@@ -32,7 +32,7 @@
"require-dev": {
"doctrine/orm": "^2.5",
"phpspec/phpspec": "^5.0",
"phpunit/phpunit": "^6.5",
"phpunit/phpunit": "^7.0",
"symfony/form": "^3.4|^4.1.1",
"symfony/validator": "^3.4|^4.1.1",
"symfony/browser-kit": "^3.4|^4.1.1",
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>

<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.5/phpunit.xsd"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.0/phpunit.xsd"
colors="true"
>
<php>
@@ -31,9 +31,9 @@
},
"require-dev": {
"doctrine/orm": "^2.5",
"matthiasnoback/symfony-dependency-injection-test": "^2.0",
"matthiasnoback/symfony-dependency-injection-test": "^3.0",
"phpspec/phpspec": "^5.0",
"phpunit/phpunit": "^6.5",
"phpunit/phpunit": "^7.0",
"symfony/form": "^3.4|^4.1.1",
"symfony/validator": "^3.4|^4.1.1",
"symfony/browser-kit": "^3.4|^4.1.1",
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>

<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.5/phpunit.xsd"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.0/phpunit.xsd"
colors="true"
>
<php>
@@ -48,9 +48,9 @@
"doctrine/phpcr-odm": "^1.4",
"jackalope/jackalope-doctrine-dbal": "^1.2",
"lakion/api-test-case": "^3.1.0",
"matthiasnoback/symfony-dependency-injection-test": "^2.0",
"matthiasnoback/symfony-dependency-injection-test": "^3.0",
"phpspec/phpspec": "^5.0",
"phpunit/phpunit": "^6.5",
"phpunit/phpunit": "^7.0",
"sylius/grid-bundle": "^1.2",
"sylius/locale": "^1.2",
"symfony/dependency-injection": "^3.4|^4.1.1",
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>

<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.5/phpunit.xsd"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.0/phpunit.xsd"
colors="true"
>
<php>
Oops, something went wrong.

0 comments on commit 81e1dbb

Please sign in to comment.
You can’t perform that action at this time.