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

[Documentation] Removing "Doctrine Mapping Types" ... #11384

Merged
merged 1 commit into from
Mar 20, 2024
Merged

[Documentation] Removing "Doctrine Mapping Types" ... #11384

merged 1 commit into from
Mar 20, 2024

Conversation

ThomasLandauer
Copy link
Contributor

@ThomasLandauer ThomasLandauer commented Mar 20, 2024 •
edited
Loading

... in favor of https://www.doctrine-project.org/projects/doctrine-dbal/en/3.8/reference/types.html#reference

Page: https://www.doctrine-project.org/projects/doctrine-orm/en/2.19/reference/basic-mapping.html#doctrine-mapping-types

As announced in doctrine/dbal#6336 (comment) , the goal is to remove this duplicated type information from ORM and replace it with a link to DBAL.
The information here was outdated regarding bigint and json_array.
Besides, the order was weird.

In doctrine/dbal#6341 , I'm adding any detail which I'm deleting here to the DBAL.

TODO/Question: What's the syntax for adding a link to DBAL docs?

@ThomasLandauer ThomasLandauer mentioned this pull request Mar 20, 2024
Closed
@greg0ire
Copy link
Member

Regarding how to link, here is an example:

orm/docs/en/reference/configuration.rst

Line 90 in 55c4845

`Doctrine DBAL connection configuration reference <https://docs.doctrine-project.org/projects/doctrine-dbal/en/stable/reference/configuration.html>`_.

@ThomasLandauer
Copy link
Contributor Author

OK, thanks, I'm done for now :-)

@greg0ire
Copy link
Member

Please kindly squash your commits together. If you don't, we'll try to remember to do it for you but it's best if you save us this trouble.

How to do that?

  1. git rebase -i origin/2.19.x, assuming origin is a git remote that points to this repository, and not your fork. If you're not sure what your remotes are, run git remote -vvv, there should be your fork and the holy/reference/base/origin/whatever-you-call-it repository.
  2. A window will show up with many lines, replace pick with fixup on every line but the first one
  3. Close your editor, git should do its magic, and you should end up with one commit
  4. Use git push --force to overwrite what you already push. Don't forget the --force option otherwise git will try to merge both things together.

@ThomasLandauer
[Documentation] Removing "Doctrine Mapping Types" ...
e3e6033 
... in favor of https://www.doctrine-project.org/projects/doctrine-dbal/en/3.8/reference/types.html#reference

Page: https://www.doctrine-project.org/projects/doctrine-orm/en/2.19/reference/basic-mapping.html#doctrine-mapping-types

As announced in doctrine/dbal#6336 (comment) , the goal is to remove this duplicated type information from ORM and replace it with a link to DBAL.

In doctrine/dbal#6341 , I'm adding any detail which I'm deleting here to the DBAL.
@ThomasLandauer
Copy link
Contributor Author

Well, looks like it worked - did it?
If yes, then it went smoother than the last time you took me by the hand: doctrine/dbal#4947 (comment) :-)

@greg0ire
Copy link
Member

Yet it worked! Nice progress there 🙂

@greg0ire greg0ire requested a review from derrabus March 20, 2024 21:07
SenseException
SenseException approved these changes Mar 20, 2024
View reviewed changes
Copy link
Member

@SenseException SenseException left a comment

Choose a reason for hiding this comment

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

Nice improvement 👍

@SenseException SenseException merged commit 5ccbc20 into doctrine:2.19.x Mar 20, 2024
1 check passed
derrabus added a commit that referenced this pull request Mar 21, 2024
@derrabus
Merge branch '2.19.x' into 2.20.x
716da7e 
* 2.19.x:
  [Documentation] Removing "Doctrine Mapping Types" ... (#11384)
  [GH-11185] Bugfix: do not use collection batch loading for indexBy assocations. (#11380)
  Improve lazy ghost performance by avoiding self-referencing closure. (#11376)
@derrabus derrabus added this to the 2.19.3 milestone Mar 21, 2024
@ThomasLandauer ThomasLandauer deleted the patch-10 branch March 21, 2024 09:32
derrabus added a commit to derrabus/orm that referenced this pull request Mar 21, 2024
@derrabus
Merge branch '2.19.x' into 3.1.x
a80c1cd 
* 2.19.x:
  Remove unused variable (doctrine#11391)
  [Documentation] Removing "Doctrine Mapping Types" ... (doctrine#11384)
  [doctrineGH-11185] Bugfix: do not use collection batch loading for indexBy assocations. (doctrine#11380)
  Improve lazy ghost performance by avoiding self-referencing closure. (doctrine#11376)
derrabus added a commit to derrabus/orm that referenced this pull request Mar 21, 2024
@derrabus
Merge branch '2.19.x' into 3.1.x
eba0f27 
* 2.19.x:
  Add missing import
  Remove unused variable (doctrine#11391)
  [Documentation] Removing "Doctrine Mapping Types" ... (doctrine#11384)
  [doctrineGH-11185] Bugfix: do not use collection batch loading for indexBy assocations. (doctrine#11380)
  Improve lazy ghost performance by avoiding self-referencing closure. (doctrine#11376)
derrabus added a commit to derrabus/orm that referenced this pull request Mar 21, 2024
@derrabus
Merge branch '2.19.x' into 3.1.x
1e08858 
* 2.19.x:
  Add missing import
  Remove unused variable (doctrine#11391)
  [Documentation] Removing "Doctrine Mapping Types" ... (doctrine#11384)
  [doctrineGH-11185] Bugfix: do not use collection batch loading for indexBy assocations. (doctrine#11380)
  Improve lazy ghost performance by avoiding self-referencing closure. (doctrine#11376)
derrabus added a commit to derrabus/orm that referenced this pull request Mar 21, 2024
@derrabus
Merge branch '2.19.x' into 3.1.x
34a410e 
* 2.19.x:
  Add missing import
  Remove unused variable (doctrine#11391)
  [Documentation] Removing "Doctrine Mapping Types" ... (doctrine#11384)
  [doctrineGH-11185] Bugfix: do not use collection batch loading for indexBy assocations. (doctrine#11380)
  Improve lazy ghost performance by avoiding self-referencing closure. (doctrine#11376)
derrabus added a commit to derrabus/orm that referenced this pull request Mar 21, 2024
@derrabus
Merge branch '2.19.x' into 3.1.x
4ebc6c0 
* 2.19.x:
  Add missing import
  Remove unused variable (doctrine#11391)
  [Documentation] Removing "Doctrine Mapping Types" ... (doctrine#11384)
  [doctrineGH-11185] Bugfix: do not use collection batch loading for indexBy assocations. (doctrine#11380)
  Improve lazy ghost performance by avoiding self-referencing closure. (doctrine#11376)
derrabus added a commit to derrabus/orm that referenced this pull request Mar 21, 2024
@derrabus
Merge branch '2.19.x' into 3.1.x
0a1988b 
* 2.19.x:
  Set column length explicitly (doctrine#11393)
  Add missing import
  Remove unused variable (doctrine#11391)
  [Documentation] Removing "Doctrine Mapping Types" ... (doctrine#11384)
  [doctrineGH-11185] Bugfix: do not use collection batch loading for indexBy assocations. (doctrine#11380)
  Improve lazy ghost performance by avoiding self-referencing closure. (doctrine#11376)
derrabus added a commit to derrabus/orm that referenced this pull request Mar 21, 2024
@derrabus
Merge branch '3.1.x' into 3.2.x
4672d28 
* 3.1.x:
  Adjust PHPBench mocks
  Set column length explicitly (doctrine#11393)
  Add missing import
  Remove unused variable (doctrine#11391)
  Fixed proxy initialization for EnumReflectionProperty
  Remove older versions from the docs (doctrine#11383)
  [Documentation] Removing "Doctrine Mapping Types" ... (doctrine#11384)
  [doctrineGH-11185] Bugfix: do not use collection batch loading for indexBy assocations. (doctrine#11380)
  Improve lazy ghost performance by avoiding self-referencing closure. (doctrine#11376)
  Remove outdated git metadata files (doctrine#11362)
  Switch join columns around, otherwise index doesnt match
  Key on fk
  Fix entities and mapping.
  Minor code style fix in AbstractRemoteControl
  Do not schedule batch loading for target classes with composite identifier.
  Cleanup tests not to use model sets.
  provides a test case for github issue 11154
derrabus added a commit to derrabus/orm that referenced this pull request Mar 21, 2024
@derrabus
Merge branch '3.2.x' into 4.0.x
80aec02 
* 3.2.x:
  Adjust PHPBench mocks
  Set column length explicitly (doctrine#11393)
  Add missing import
  Remove unused variable (doctrine#11391)
  Fixed proxy initialization for EnumReflectionProperty
  Remove older versions from the docs (doctrine#11383)
  [Documentation] Removing "Doctrine Mapping Types" ... (doctrine#11384)
  [doctrineGH-11185] Bugfix: do not use collection batch loading for indexBy assocations. (doctrine#11380)
  Improve lazy ghost performance by avoiding self-referencing closure. (doctrine#11376)
  Remove outdated git metadata files (doctrine#11362)
  Switch join columns around, otherwise index doesnt match
  Key on fk
  Fix entities and mapping.
  Minor code style fix in AbstractRemoteControl
  Do not schedule batch loading for target classes with composite identifier.
  Cleanup tests not to use model sets.
  provides a test case for github issue 11154
@github-actions github-actions bot mentioned this pull request Mar 22, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SenseException SenseException SenseException approved these changes

@greg0ire greg0ire greg0ire approved these changes

@derrabus derrabus Awaiting requested review from derrabus

Assignees
No one assigned
Labels
Documentation
Projects
None yet
Milestone
2.19.3
Development

Successfully merging this pull request may close these issues.
4 participants
@ThomasLandauer @greg0ire @SenseException @derrabus