Skip to content

Commit

Permalink
minor #11507 Synchronise packages composer.json files with the main o…
Browse files Browse the repository at this point in the history
…ne + 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
-------

86fdef2b899bdc330ba4388f1c746564d38b47df Synchronise packages composer.json files with the main one + normalize them
  • Loading branch information
pamil authored Jun 18, 2020
2 parents b285aa2 + 9eaf643 commit a2e0c31
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 20 deletions.
47 changes: 28 additions & 19 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,15 @@
"name": "sylius/ui-bundle",
"type": "symfony-bundle",
"description": "Generic UI bundle for Sylius eCommerce components.",
"keywords": ["shop", "ecommerce", "store", "webshop", "sylius", "ui", "user interface"],
"keywords": [
"shop",
"ecommerce",
"store",
"webshop",
"sylius",
"ui",
"user interface"
],
"homepage": "https://sylius.com",
"license": "MIT",
"authors": [
Expand All @@ -21,8 +29,7 @@
],
"require": {
"php": "^7.3",

"doctrine/collections": "^1.3",
"doctrine/collections": "^1.6",
"knplabs/knp-menu": "^3.1",
"knplabs/knp-menu-bundle": "^3.0",
"sonata-project/block-bundle": "^4.0",
Expand All @@ -31,44 +38,46 @@
"symfony/security": "^4.4",
"symfony/security-bundle": "^4.4",
"symfony/templating": "^4.4",
"zendframework/zend-stdlib": "^3.1"
"zendframework/zend-stdlib": "^3.2"
},
"conflict": {
"twig/twig": "^1.0"
},
"require-dev": {
"matthiasnoback/symfony-config-test": "^4.0",
"matthiasnoback/symfony-dependency-injection-test": "^3.0",
"matthiasnoback/symfony-config-test": "^4.2",
"matthiasnoback/symfony-dependency-injection-test": "^4.1",
"phpspec/phpspec": "^6.1",
"phpunit/phpunit": "^7.0",
"phpunit/phpunit": "^8.5",
"symfony/dependency-injection": "^4.4",
"symfony/form": "^4.4",
"twig/twig": "^2.0"
},
"conflict": {
"twig/twig": "^1.0"
"twig/twig": "^2.12"
},
"config": {
"bin-dir": "bin"
},
"extra": {
"branch-alias": {
"dev-master": "1.6-dev"
}
},
"autoload": {
"psr-4": { "Sylius\\Bundle\\UiBundle\\": "" }
"psr-4": {
"Sylius\\Bundle\\UiBundle\\": ""
}
},
"minimum-stability": "dev",
"prefer-stable": true,
"repositories": [
{
"type": "path",
"url": "../../*/*"
}
],
"minimum-stability": "dev",
"prefer-stable": true,
"scripts": {
"test": [
"@composer validate --strict",
"bin/phpunit --colors=always",
"bin/phpspec run --ansi --no-interaction"
]
},
"extra": {
"branch-alias": {
"dev-master": "1.6-dev"
}
}
}
2 changes: 1 addition & 1 deletion phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -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/7.0/phpunit.xsd"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/8.5/phpunit.xsd"
colors="true"
>
<php>
Expand Down

0 comments on commit a2e0c31

Please sign in to comment.