Skip to content

Commit

Permalink
Merge branch '1.3' into 1.4
Browse files Browse the repository at this point in the history 
* 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
pamil committed Feb 11, 2019
2 parents 3e418ec + 372a1b8 commit 81e1dbb
Show file tree
Hide file tree
Showing 56 changed files with 87 additions and 75 deletions.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
View file
@@ -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
Expand Down
8 changes: 4 additions & 4 deletions composer.json
View file
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion phpunit.xml.dist
View file
Expand Up @@ -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"
>
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/AddressingBundle/composer.json
View file
Expand Up @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/AddressingBundle/phpunit.xml.dist
View file
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/AdminApiBundle/composer.json
View file
Expand Up @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/AdminBundle/composer.json
View file
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/AdminBundle/phpunit.xml.dist
View file
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/AttributeBundle/composer.json
View file
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/AttributeBundle/phpunit.xml.dist
View file
@@ -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>
Expand Down
4 changes: 2 additions & 2 deletions src/Sylius/Bundle/ChannelBundle/composer.json
View file
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/ChannelBundle/phpunit.xml.dist
View file
@@ -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>
Expand Down
6 changes: 3 additions & 3 deletions src/Sylius/Bundle/CoreBundle/composer.json
View file
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/CoreBundle/phpunit.xml.dist
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/CurrencyBundle/composer.json
View file
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/CurrencyBundle/phpunit.xml.dist
View file
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/CustomerBundle/composer.json
View file
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/CustomerBundle/phpunit.xml.dist
View file
@@ -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>
Expand Down
6 changes: 3 additions & 3 deletions src/Sylius/Bundle/FixturesBundle/composer.json
View file
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/FixturesBundle/phpunit.xml.dist
View file
@@ -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>
Expand Down
6 changes: 3 additions & 3 deletions src/Sylius/Bundle/GridBundle/composer.json
View file
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/GridBundle/phpunit.xml.dist
View file
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/InventoryBundle/composer.json
View file
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/InventoryBundle/phpunit.xml.dist
View file
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/LocaleBundle/composer.json
View file
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/LocaleBundle/phpunit.xml.dist
View file
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/MailerBundle/composer.json
View file
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/MailerBundle/phpunit.xml.dist
View file
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/MoneyBundle/composer.json
View file
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/MoneyBundle/phpunit.xml.dist
View file
@@ -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>
Expand Down
4 changes: 2 additions & 2 deletions src/Sylius/Bundle/OrderBundle/composer.json
View file
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/OrderBundle/phpunit.xml.dist
View file
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/PaymentBundle/composer.json
View file
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/PaymentBundle/phpunit.xml.dist
View file
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/ProductBundle/composer.json
View file
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/ProductBundle/phpunit.xml.dist
View file
@@ -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>
Expand Down
4 changes: 2 additions & 2 deletions src/Sylius/Bundle/PromotionBundle/composer.json
View file
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/PromotionBundle/phpunit.xml.dist
View file
@@ -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>
Expand Down
4 changes: 2 additions & 2 deletions src/Sylius/Bundle/ResourceBundle/composer.json
View file
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/ResourceBundle/phpunit.xml.dist
View file
@@ -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>
Expand Down

0 comments on commit 81e1dbb

Please sign in to comment.