Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Update version of sensio/distribution-bundle to 3.0#3088

Closed
nbas11 wants to merge 459 commits into
Sylius:masterfrom
nbas11:patch-2
Closed

Update version of sensio/distribution-bundle to 3.0#3088
nbas11 wants to merge 459 commits into
Sylius:masterfrom
nbas11:patch-2

Conversation

@nbas11
Copy link
Copy Markdown
Contributor

@nbas11 nbas11 commented Jul 28, 2015

Facing this issue: sensiolabs/SensioDistributionBundle#150 while using sensio/distribution-bundle v2.3.22.
3.0 branch should be compatible with symfony 2.3 and higher per http://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/index.html

@michalmarcinkowski
Copy link
Copy Markdown
Contributor

@MblKiTA could you rebase this PR?

@nbas11
Copy link
Copy Markdown
Contributor Author

nbas11 commented Dec 15, 2015

@michalmarcinkowski, rebased

@michalmarcinkowski
Copy link
Copy Markdown
Contributor

@MblKiTA have you pushed your changes? I don't see any update.

@nbas11
Copy link
Copy Markdown
Contributor Author

nbas11 commented Dec 16, 2015

@michalmarcinkowski Seems I've done it now.

@michalmarcinkowski
Copy link
Copy Markdown
Contributor

Something is wrong, cause I see 13 commits... I would suggest to switch on a clean master branch and apply this change once again, it will be probably faster than struggling with desynchronized rebase. Please remember to update the composer.lock file also. Thanks for your effort!

@nbas11
Copy link
Copy Markdown
Contributor Author

nbas11 commented Dec 16, 2015

@michalmarcinkowski is it ok now?

Zales0123 and others added 22 commits December 16, 2015 18:53
Also added missing ChannelBasedCalculator spec.
If you don't ask for the field "email" sylius will crash trying to "INSERT INTO sylius_customer" with an empty e-mail.
tuka217 and others added 24 commits December 16, 2015 18:53
[Report] Introduce code for Report
[ResportBundle] Add AddCodeFormSubscriber to ReportType
…eType and TaxCategoryType

[TaxationBundle] Add validation  for filed 'code' from TaxRate and TaxCategory
[Taxation] Add field 'code' to TaxCategory and TaxRate, TaxCategoryInterface and TaxRateInterface extend AwareCodeInterface
[WebBundle] Add code filed to TaxCategory views and to TaxRate views
[MailerBundle] Add AddCodeFormSubscriber to EmailType
…ce extends CodeAwareInterface

[PaymentBundle]  PaymentMethodType add AddCodeFormSubscriber to builder
[ChannelBundle] Add AddCodeFormSubscriber to ChannelType
…nts CodeAwareInterface

[PromotionBundle] add AddCodeFormSubscriber to PromotionType and to CouponType
[ArchetypeBundle] Add AddCodeFormEventSubscriber to ArchetypeType
With the introduction of AppVeyor continuous integration and
improved setup of Travis, the root directory may start to become
disorganised or cluttered, especially if there are more tools to
be integrated in the future. Moving files for AppVeyor, Travis and
Vagrant into an "etc" directory will help estabish a new location
for similar files.
…build directory, made javascripts more fail-safe
…e" (it would throw: `Cannot use nodename property "name" of class "Xyz" as a dynamic operand use "localname()" instead.`)
…ContentController and Sylius' ResourceController
@michalmarcinkowski
Copy link
Copy Markdown
Contributor

@MblKiTA please run composer update sensio/distribution-bundle in order to update composer.lock file, then it's ready to merge 😉

@nbas11
Copy link
Copy Markdown
Contributor Author

nbas11 commented Jan 7, 2016

@michalmarcinkowski, I've created a new pull request for this:
#3826

@nbas11 nbas11 closed this Jan 7, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.