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

Jump to bottom

Fix some composer.json files #1422

Merged
merged 1 commit into from Jun 21, 2014
Merged

Fix some composer.json files #1422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 1 addition & 7 deletions composer.json
View file
Open in desktop
Expand Up @@ -143,11 +143,5 @@
"incenteev-parameters": {
"file": "app/config/parameters.yml"
}
},
"repositories": [
{
"type": "vcs",
"url": "https://github.com/winzou/Finite"
}
]
}
}
3 changes: 2 additions & 1 deletion src/Sylius/Bundle/AddressingBundle/composer.json
View file
Open in desktop
Expand Up @@ -46,5 +46,6 @@
"branch-alias": {
"dev-master": "0.10-dev"
}
}
},
"minimum-stability": "dev"
}
3 changes: 2 additions & 1 deletion src/Sylius/Bundle/AttributeBundle/composer.json
View file
Open in desktop
Expand Up @@ -44,5 +44,6 @@
"branch-alias": {
"dev-master": "0.10-dev"
}
}
},
"minimum-stability": "dev"
}
3 changes: 2 additions & 1 deletion src/Sylius/Bundle/CartBundle/composer.json
View file
Open in desktop
Expand Up @@ -47,5 +47,6 @@
"branch-alias": {
"dev-master": "0.10-dev"
}
}
},
"minimum-stability": "dev"
}
8 changes: 4 additions & 4 deletions src/Sylius/Bundle/CoreBundle/composer.json
View file
Open in desktop
Expand Up @@ -20,9 +20,8 @@
}
],
"require": {
"php": ">=5.3.3",
"php": ">=5.3.3",

"doctrine/doctrine-bundle": "~1.3@dev",
"friendsofsymfony/user-bundle": "2.0.*@dev",
"hwi/oauth-bundle": "0.3.*",
"jms/serializer-bundle": "0.12.*",
Expand Down Expand Up @@ -56,7 +55,7 @@
"symfony/framework-bundle": "~2.3"
},
"require-dev": {
"fzaninotto/faker": "1.2.*",
"fzaninotto/faker": "~1.2",
"phpspec/phpspec": "~2.0",
"symfony/form": "~2.3"
},
Expand All @@ -77,5 +76,6 @@
"branch-alias": {
"dev-master": "0.10-dev"
}
}
},
"minimum-stability": "dev"
}
3 changes: 2 additions & 1 deletion src/Sylius/Bundle/InventoryBundle/composer.json
View file
Open in desktop
Expand Up @@ -45,5 +45,6 @@
"branch-alias": {
"dev-master": "0.10-dev"
}
}
},
"minimum-stability": "dev"
}
3 changes: 2 additions & 1 deletion src/Sylius/Bundle/MoneyBundle/composer.json
View file
Open in desktop
Expand Up @@ -46,5 +46,6 @@
"branch-alias": {
"dev-master": "0.10-dev"
}
}
},
"minimum-stability": "dev"
}
3 changes: 2 additions & 1 deletion src/Sylius/Bundle/OrderBundle/composer.json
View file
Open in desktop
Expand Up @@ -48,5 +48,6 @@
"branch-alias": {
"dev-master": "0.10-dev"
}
}
},
"minimum-stability": "dev"
}
3 changes: 2 additions & 1 deletion src/Sylius/Bundle/PaymentBundle/composer.json
View file
Open in desktop
Expand Up @@ -45,5 +45,6 @@
"branch-alias": {
"dev-master": "0.10-dev"
}
}
},
"minimum-stability": "dev"
}
5 changes: 3 additions & 2 deletions src/Sylius/Bundle/PayumBundle/composer.json
View file
Open in desktop
Expand Up @@ -31,7 +31,7 @@
"sylius/resource-bundle": "0.10.*@dev",
"payum/payum-bundle": "~0.8.5",
"payum/core": "~0.8.7",
"winzou/state-machine": "~0.1"
"winzou/state-machine": "~0.1.2"
},
"config": {
"bin-dir": "bin"
Expand All @@ -46,5 +46,6 @@
"branch-alias": {
"dev-master": "0.10-dev"
}
}
},
"minimum-stability": "dev"
}
12 changes: 7 additions & 5 deletions src/Sylius/Bundle/PricingBundle/composer.json
View file
Open in desktop
Expand Up @@ -24,12 +24,11 @@

"stof/doctrine-extensions-bundle": "1.1.*",
"sylius/pricing": "0.10.*@dev",
"sylius/registry": "0.10.*@dev",
"sylius/resource-bundle": "0.10.*@dev",
Copy link
Contributor

Choose a reason for hiding this comment

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

It is using the registry component: https://github.com/Sylius/Sylius/blob/master/src/Sylius/Bundle/PricingBundle/Resources/config/services.xml#L24
We do need to have this requirement here.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I knew someone will point this =) And yes it uses it, but we don't need this requirement here, it's set in sylius/pricing as a requirement.

Copy link
Contributor

Choose a reason for hiding this comment

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

You must not care about sylius/pricing dependencies, this is the job of Composer!
The lib sylius/pricing-bundle uses the lib sylius/registry, so the the latest must be in the composer.json of the first.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The bundle as it name says: sylius/pricing-bundle uses sylius/pricing component which requires sylius/registry to work, and yes it's job of Composer, but with your approach we have to change every single bundle & component to add dependencies used in them, i.e. doctrine/collections etc. and we don't do that, why? Because it's job of Composer, and if we have dependency that requires same we don't duplicate it in every file!

Be consistent man, look at sylius/core-bundle do you see there any component (skipping Core component) requirement?! No! Because we don't duplicate requirements...

Copy link
Contributor

Choose a reason for hiding this comment

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

I know the way we're currently doing is not good. But that's not an excuse to continue in that way ;)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Why you think "it's not good"? With your thinking we must change ~60+% of packages of bundles at Packagist cause they don't declare every dependency they use if that dependency is used by it's requirements.

Not looking far away, let's see Symfony WebProfilerBundle, you have 3 hard + 3 soft deps, let's see code for missing (from your PoV) deps: 1, 2, 3...

We could go further, but I don't see any point in this.

Copy link
Contributor

Choose a reason for hiding this comment

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

Fair enough, but I still find it weird. What if the component stops using a dependency and remove it from its composer.json, while the bundle still relies on it? We end up doing the job of Composer...

"symfony/framework-bundle": "~2.3"
},
"require-dev": {
"phpspec/phpspec": "2.0.*@dev",
"phpspec/phpspec": "~2.0",
"doctrine/orm": "~2.2",
"symfony/form": "~2.3",
"symfony/validator": "~2.3"
Expand All @@ -38,12 +37,15 @@
"bin-dir": "bin"
},
"autoload": {
"psr-0": { "Sylius\\Bundle\\PricingBundle\\": "" }
"psr-4": { "Sylius\\Bundle\\PricingBundle\\": "" }
},
"autoload-dev": {
"psr-4": { "Sylius\\Bundle\\PricingBundle\\spec\\": "spec/" }
},
"target-dir": "Sylius/Bundle/PricingBundle",
"extra": {
"branch-alias": {
"dev-master": "0.10-dev"
}
}
},
"minimum-stability": "dev"
}
3 changes: 2 additions & 1 deletion src/Sylius/Bundle/ProductBundle/composer.json
View file
Open in desktop
Expand Up @@ -47,5 +47,6 @@
"branch-alias": {
"dev-master": "0.10-dev"
}
}
},
"minimum-stability": "dev"
}
3 changes: 2 additions & 1 deletion src/Sylius/Bundle/PromotionBundle/composer.json
View file
Open in desktop
Expand Up @@ -47,5 +47,6 @@
"branch-alias": {
"dev-master": "0.10-dev"
}
}
},
"minimum-stability": "dev"
}
3 changes: 2 additions & 1 deletion src/Sylius/Bundle/ResourceBundle/composer.json
View file
Open in desktop
Expand Up @@ -56,5 +56,6 @@
"branch-alias": {
"dev-master": "0.10-dev"
}
}
},
"minimum-stability": "dev"
}
3 changes: 2 additions & 1 deletion src/Sylius/Bundle/SequenceBundle/composer.json
View file
Open in desktop
Expand Up @@ -43,5 +43,6 @@
"branch-alias": {
"dev-master": "0.10-dev"
}
}
},
"minimum-stability": "dev"
}
3 changes: 2 additions & 1 deletion src/Sylius/Bundle/SettingsBundle/composer.json
View file
Open in desktop
Expand Up @@ -45,5 +45,6 @@
"branch-alias": {
"dev-master": "0.10-dev"
}
}
},
"minimum-stability": "dev"
}
3 changes: 2 additions & 1 deletion src/Sylius/Bundle/ShippingBundle/composer.json
View file
Open in desktop
Expand Up @@ -46,5 +46,6 @@
"branch-alias": {
"dev-master": "0.10-dev"
}
}
},
"minimum-stability": "dev"
}
3 changes: 2 additions & 1 deletion src/Sylius/Bundle/TaxationBundle/composer.json
View file
Open in desktop
Expand Up @@ -45,5 +45,6 @@
"branch-alias": {
"dev-master": "0.10-dev"
}
}
},
"minimum-stability": "dev"
}
3 changes: 2 additions & 1 deletion src/Sylius/Bundle/TaxonomyBundle/composer.json
View file
Open in desktop
Expand Up @@ -46,5 +46,6 @@
"branch-alias": {
"dev-master": "0.10-dev"
}
}
},
"minimum-stability": "dev"
}
3 changes: 2 additions & 1 deletion src/Sylius/Bundle/VariationBundle/composer.json
View file
Open in desktop
Expand Up @@ -46,5 +46,6 @@
"branch-alias": {
"dev-master": "0.10-dev"
}
}
},
"minimum-stability": "dev"
}
3 changes: 2 additions & 1 deletion src/Sylius/Bundle/WebBundle/composer.json
View file
Open in desktop
Expand Up @@ -38,5 +38,6 @@
"branch-alias": {
"dev-master": "0.10-dev"
}
}
},
"minimum-stability": "dev"
}
2 changes: 1 addition & 1 deletion src/Sylius/Component/Attribute/composer.json
View file
Open in desktop
Expand Up @@ -25,7 +25,7 @@
"sylius/resource": "0.10.*@dev"
},
"require-dev": {
"phpspec/phpspec": "2.0.*"
"phpspec/phpspec": "~2.0"
},
"config": {
"bin-dir": "bin"
Expand Down
3 changes: 2 additions & 1 deletion src/Sylius/Component/Cart/composer.json
View file
Open in desktop
Expand Up @@ -41,5 +41,6 @@
"branch-alias": {
"dev-master": "0.10-dev"
}
}
},
"minimum-stability": "dev"
}
8 changes: 6 additions & 2 deletions src/Sylius/Component/Core/composer.json
View file
Open in desktop
Expand Up @@ -33,7 +33,10 @@
"sylius/inventory": "0.10.*@dev",
"sylius/taxonomy": "0.10.*@dev",
"sylius/payment": "0.10.*@dev",
"sylius/resource": "0.10.*@dev"
"sylius/pricing": "0.10.*@dev",
"sylius/resource": "0.10.*@dev",

"knplabs/gaufrette": "*@dev"
},
"require-dev": {
"phpspec/phpspec": "~2.0",
Expand All @@ -52,5 +55,6 @@
"branch-alias": {
"dev-master": "0.10-dev"
}
}
},
"minimum-stability": "dev"
}
3 changes: 2 additions & 1 deletion src/Sylius/Component/Order/composer.json
View file
Open in desktop
Expand Up @@ -38,5 +38,6 @@
"branch-alias": {
"dev-master": "0.10-dev"
}
}
},
"minimum-stability": "dev"
}
4 changes: 2 additions & 2 deletions src/Sylius/Component/Pricing/composer.json
View file
Open in desktop
Expand Up @@ -26,7 +26,7 @@
"sylius/registry": "0.10.*@dev"
},
"require-dev": {
"phpspec/phpspec": "2.0.*"
"phpspec/phpspec": "~2.0"
},
"config": {
"bin-dir": "bin"
Expand All @@ -35,7 +35,7 @@
"psr-4": { "Sylius\\Component\\Pricing\\": "" }
},
"autoload-dev": {
"psr-4": { "spec\\Sylius\\Component\\Pricing\\": "spec/" }
"psr-4": { "Sylius\\Component\\Pricing\\spec\\": "spec/" }
Copy link
Member

Choose a reason for hiding this comment

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

Are we sure about this? The namespace starts with spec.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Both ways are correct, but this one makes it consistent with other composer.json files.

},
"extra": {
"branch-alias": {
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Component/Product/composer.json
View file
Open in desktop
Expand Up @@ -27,7 +27,7 @@
"sylius/variation": "0.10.*@dev"
},
"require-dev": {
"phpspec/phpspec": "2.0.*@dev"
"phpspec/phpspec": "~2.0"
},
"autoload": {
"psr-4": { "Sylius\\Component\\Product\\": "" }
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Component/Registry/composer.json
View file
Open in desktop
Expand Up @@ -23,7 +23,7 @@
"php": ">=5.3.3"
},
"require-dev": {
"phpspec/phpspec": "2.0.*@dev"
"phpspec/phpspec": "~2.0"
},
"config": {
"bin-dir": "bin"
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Component/Resource/composer.json
View file
Open in desktop
Expand Up @@ -24,7 +24,7 @@

"doctrine/collections": "~1.0",
"doctrine/common": "~2.3",
"winzou/state-machine": "~0.1"
"winzou/state-machine": "~0.1.2"
},
"require-dev": {
"phpspec/phpspec": "~2.0"
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Component/Shipping/composer.json
View file
Open in desktop
Expand Up @@ -24,7 +24,7 @@

"sylius/resource": "0.10.*@dev",
"symfony/options-resolver": "~2.3",
"winzou/state-machine": "~0.1"
"winzou/state-machine": "~0.1.2"
},
"require-dev": {
"phpspec/phpspec": "~2.0"
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Component/Variation/composer.json
View file
Open in desktop
Expand Up @@ -25,7 +25,7 @@
"sylius/resource": "0.10.*@dev"
},
"require-dev": {
"phpspec/phpspec": "2.0.*@dev"
"phpspec/phpspec": "~2.0"
},
"config": {
"bin-dir": "bin"
Expand Down