Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Composer improvements #3751

Merged
merged 2 commits into from
May 1, 2016
Merged

Composer improvements #3751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
652b02a
Composer improvements
soullivaneuh May 1, 2016
b90cfa9
Fix options resolver test
soullivaneuh May 1, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Tests/Block/FakeBlockService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@
namespace Sonata\AdminBundle\Tests\Block;

use Sonata\AdminBundle\Block\AdminListBlockService;
use Symfony\Component\OptionsResolver\OptionsResolverInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;

/**
* @author Sullivan Senechal <[email protected]>
*/
class FakeBlockService extends AdminListBlockService
{
public function setDefaultSettings(OptionsResolverInterface $resolver)
public function configureSettings(OptionsResolver $resolver)
{
parent::setDefaultSettings($resolver);
parent::configureSettings($resolver);

$resolver
->setDefaults(array(
Expand Down
53 changes: 27 additions & 26 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,36 +17,37 @@
}
],
"require": {
"symfony/http-foundation": "~2.3|~3.0",
"symfony/form": "^2.3.5|~3.0",
"symfony/validator": "~2.3|~3.0",
"symfony/security-bundle": "~2.3|~3.0",
"symfony/routing": "~2.3|~3.0",
"symfony/config": "^2.3.9|~3.0",
"symfony/console": "~2.3|~3.0",
"symfony/twig-bridge": "^2.3.5|~3.0",
"symfony/class-loader":"~2.3|~3.0",
"symfony/expression-language": "~2.4|~3.0",
"symfony/templating":"~2.3|~3.0",
"symfony/translation":"~2.3|~3.0",
"symfony/dependency-injection": "^2.3.3|~3.0",
"symfony/property-access": "~2.3|~3.0",
"symfony/security-acl": "~2.3|~3.0",
"twig/twig": "~1.23",
"twig/extensions": "~1.0",
"sonata-project/exporter": "~1.0",
"sonata-project/block-bundle": "^2.3.9",
"sonata-project/core-bundle": "^2.3.10",
"doctrine/common": "~2.2",
"doctrine/inflector": "~1.0",
"php": "^5.3 || ^7.0",
"symfony/http-foundation": "^2.3 || ^3.0",
"symfony/form": "^2.3.5 || ^3.0",
"symfony/validator": "^2.3 || ^3.0",
"symfony/security-bundle": "^2.3 || ^3.0",
"symfony/routing": "^2.3 || ^3.0",
"symfony/config": "^2.3.9 || ^3.0",
"symfony/console": "^2.3 || ^3.0",
"symfony/twig-bridge": "^2.3.5 || ^3.0",
"symfony/class-loader":"^2.3 || ^3.0",
"symfony/expression-language": "^2.4 || ^3.0",
"symfony/templating":"^2.3 || ^3.0",
"symfony/translation":"^2.3 || ^3.0",
"symfony/dependency-injection": "^2.3.3 || ^3.0",
"symfony/property-access": "^2.3 || ^3.0",
"symfony/security-acl": "^2.3 || ^3.0",
"twig/twig": "^1.23",
"twig/extensions": "^1.0",
"sonata-project/exporter": "^1.0",
"sonata-project/block-bundle": "3.x-dev@dev",
"sonata-project/core-bundle": "3.x-dev@dev",
"doctrine/common": "^2.2",
"doctrine/inflector": "^1.0",
"knplabs/knp-menu-bundle": "^2.1.1"
},
"require-dev": {
"jms/di-extra-bundle": "~1.7",
"sensio/generator-bundle": "~2.3|~3.0",
"symfony/yaml": "~2.3|~3.0",
"jms/di-extra-bundle": "^1.7",
"sensio/generator-bundle": "^2.3 || ^3.0",
"symfony/yaml": "^2.3 || ^3.0",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Setting the sort-package option in all composer.json of all sonata-projects would be great.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What sort-package option does exactly?

Copy link
Contributor

@greg0ire greg0ire May 1, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It sorts all packages alphabetically, but this works with composer require only. https://getcomposer.org/doc/06-config.md#sort-packages

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does it works with composer validate too?

Can be discussed on a sonata-project/dev-kit issue.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does it works with composer validate too?

I tested that, but no, validate does not report anything about that.

"sonata-project/intl-bundle": "^2.2.4",
"symfony/phpunit-bridge": "~2.7|~3.0"
"symfony/phpunit-bridge": "^2.7 || ^3.0"
},
"conflict": {
"jms/di-extra-bundle": "<1.7.0"
Expand Down