Skip to content
This repository was archived by the owner on Nov 27, 2020. It is now read-only.

Fix doctrine common dependency #591

Merged
merged 1 commit into from
Sep 10, 2013
Merged

Fix doctrine common dependency #591

merged 1 commit into from
Sep 10, 2013

Conversation

eventhorizonpl
Copy link
Contributor

After release of Doctrine 2.4 the following versions was installed:
doctrine-orm: 2.3.x
doctrine-dbal: 2.3.x
doctrine-common: 2.4.x

We want the same version of doctrine components. I suggest blocking it on 2.3 for now.

Q A
Bug fix? yes
New feature? no
BC breaks? no
Deprecations? no
Tests pass? yes
License MIT

fabpot added a commit that referenced this pull request Sep 10, 2013
This PR was merged into the 2.3 branch.

Discussion
----------

Fix doctrine common dependency

After release of Doctrine 2.4 the following versions was installed:
doctrine-orm: 2.3.x
doctrine-dbal: 2.3.x
doctrine-common: 2.4.x

We want the same version of doctrine components. I suggest blocking it on 2.3 for now.

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| License       | MIT

Commits
-------

df4a16e fix doctrine-common dependency for 2.3 version
@fabpot fabpot merged commit df4a16e into symfony:2.3 Sep 10, 2013
@eventhorizonpl eventhorizonpl deleted the fix_doctrine_common_dependency branch September 10, 2013 17:45
@Tobion
Copy link
Contributor

Tobion commented Sep 17, 2013

  1. why not allow 2.4 of orm to be installed. the changes do not seem to affect symfony. so it should be compatible
  2. when 1. not desired, I don't see why we force all versions to be the same as done in this pr. if common 2.4 would not be compatible with orm 2.3, it would need to be changed in orm's composer.json, not in symfony.

@eventhorizonpl
Copy link
Contributor Author

@Tobion

at 1) I have nothing against allowing to use doctrine 2.4. But it's up to @fabpot
at 2) official requirements for using doctrine 2.4

{
    "require": {
        "doctrine/common": "2.4.*",
        "doctrine/dbal": "2.4.*",
        "doctrine/orm": "2.4.*"
    }
}

http://www.doctrine-project.org/blog/doctrine-2-4-released.html

@Tobion
Copy link
Contributor

Tobion commented Sep 18, 2013

at 2) what i mean is that this PR is bad IMO. we don't need to force doctrine-common <2.4. there is nothing wrong with installing doctrine-orm: 2.3.x and doctrine-common: 2.4.x. if it was not compatible it needs to be in the composer.json of doctrine-orm. this is what dependency and requirements resolution is about.

see https://github.com/doctrine/dbal/blob/2.3/composer.json#L16

@Tobion
Copy link
Contributor

Tobion commented Sep 18, 2013

@fabpot please revert

fabpot added a commit that referenced this pull request Sep 18, 2013
@fabpot
Copy link
Member

fabpot commented Sep 18, 2013

reverted

fabpot added a commit that referenced this pull request Sep 18, 2013
* 2.3:
  Revert "merged branch eventhorizonpl/fix_doctrine_common_dependency (PR #591)"
  fix doctrine-common dependency for 2.3 version
  updated VENDORS for 2.3.4
  updated VENDORS for 2.3.3
  Update phpDoc to make it standard compliant
  Updated the profiler configuration for the 2.3 changes
  updated VENDORS for 2.3.2
  Small typo/grammar fix.
  remove app cache, logs .gitkeep to ignore file
lsmith77 added a commit to liip-forks/symfony-standard that referenced this pull request Dec 9, 2013
# By Fabien Potencier (22) and others
# Via Fabien Potencier
* upstream/2.4: (31 commits)
  bumped 2.4 to stable
  updated VENDORS for 2.4.0-RC1
  updated to FrameworkExtraBundle 3.0 (examples updated as well)
  backported symfony#585
  Backport issue 426 / PR 429 to branch 2.2
  Added config to force Symfony to use native session handler by default
  updated VENDORS for 2.2.10
  updated VENDORS for 2.4.0-BETA2
  updated VENDORS for 2.2.9
  updated min stability to beta
  updated VENDORS for 2.4.0-BETA1
  fixed CS
  Refactored contact action to use new form methods in 2.3
  updated VENDORS for 2.2.8
  Revert "merged branch eventhorizonpl/fix_doctrine_common_dependency (PR symfony#591)"
  Added comment about http_method_override and HttpCache
  fix doctrine-common dependency for 2.3 version
  added some functional tests for the secure section of the demo bundle
  updated VENDORS for 2.3.4
  updated VENDORS for 2.2.6
  ...

Conflicts:
	app/SymfonyRequirements.php
	app/autoload.php
	app/config/config.yml
	src/Acme/DemoBundle/Controller/DemoController.php
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants