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.

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

Merge 2.19.x into 3.1.x #11416

Merged
merged 11 commits into from
Apr 15, 2024
Merged

Merge 2.19.x into 3.1.x #11416

merged 11 commits into from
Apr 15, 2024

Commits on Mar 17, 2024

  1. [Documentation] Query Result Formats

    Page: https://www.doctrine-project.org/projects/doctrine-orm/en/2.19/reference/dql-doctrine-query-language.html#query-result-formats
    
    Follow-up of doctrine#11359
    
    The table I suggested is probably not working, since the text for each method is too long. And what I really wanted is to make it more *scanable*. So I tried boldfacing - if this doesn't work, I'll try something else.
    
    Questions:
    
    1. This section here is basically the same as https://www.doctrine-project.org/projects/doctrine-orm/en/2.10/reference/dql-doctrine-query-language.html#hydration-modes ! So I'll try to merge them (in another PR), OK? I think the list is a better format (more scanable) - since those methods all work the same, there's no need for a full-blown code sample for each, IMO.
    
    2. `getSingleColumnResult()` is missing.
    ThomasLandauer committed Mar 17, 2024
    Configuration menu
    Copy the full SHA
    ae84225 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4b4b9b7 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2024

  1. Configuration menu
    Copy the full SHA
    46d0865 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2024

  1. Fix psalm errors: remove override of template type

    See doctrine/collections#368 for the same
    issue in doctrine/collections which has been fixed there.
    
    The issue happens when using ->contains(). Running psalm emits
    
      > InvalidArgument - Argument 1 of Doctrine\ORM\PersistentCollection::contains
      > expects
      > TMaybeContained:fn-doctrine\common\collections\readablecollection::contains
      > as mixed, but … provided.
    
    Solution: we should either not define @template TMaybeContained or
    re-define the complete psalm docblock from ReadableCollection.
    
    Repairing the docblock necessitates an update to the psalm baseline:
    one "known issue" is no longer an issue and thus removed.
    tantegerda1 committed Mar 22, 2024
    Configuration menu
    Copy the full SHA
    c54c557 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2024

  1. Merge pull request doctrine#11372 from ThomasLandauer/patch-12

    [Documentation] Query Result Formats
    greg0ire committed Mar 23, 2024
    Configuration menu
    Copy the full SHA
    e4a6c04 View commit details
    Browse the repository at this point in the history
  2. Merge pull request doctrine#11389 from tantegerda1/2.19.x

    Fix psalm errors: remove override of template type
    greg0ire committed Mar 23, 2024
    Configuration menu
    Copy the full SHA
    6090141 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2024

  1. [Documentation] Merging "Query Result Formats" with "Hydration Modes"

    Page: https://www.doctrine-project.org/projects/doctrine-orm/en/2.19/reference/dql-doctrine-query-language.html#query-result-formats
    
    As announced in doctrine#11372 (comment), I merged the (mostly) identical sections.
    
    * I changed the `const`s from `Query` to `AbstractQuery`
    * I deleted this - mainly cause I didn't find a nice place for it:
        > In parentheses are the constants of the ``Query`` class which you can use with the
    general-purpose method ``Query::execute(array $params = [], $hydrationMode = Query::HYDRATE_OBJECT)``.
    ThomasLandauer committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    5f3c1db View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2024

  1. Merge pull request doctrine#11403 from ThomasLandauer/patch-10

    [Documentation] Merging "Query Result Formats" with "Hydration Modes"
    greg0ire committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    e9e60f2 View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2024

  1. Fix templated phpdoc return type (doctrine#11407)

    * Improve getClassMetadata phpdoc
    
    * Update baseline
    VincentLanglet committed Apr 1, 2024
    Configuration menu
    Copy the full SHA
    8709fb3 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2024

  1. Configuration menu
    Copy the full SHA
    b274893 View commit details
    Browse the repository at this point in the history
  2. Merge branch '2.19.x' into 3.1.x

    * 2.19.x:
      Fix BIGINT validation (doctrine#11414)
      Fix templated phpdoc return type (doctrine#11407)
      [Documentation] Merging "Query Result Formats" with "Hydration Modes"
      Fix psalm errors: remove override of template type
      Update dql-doctrine-query-language.rst
      Adding `NonUniqueResultException`
      [Documentation] Query Result Formats
    derrabus committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    f79d166 View commit details
    Browse the repository at this point in the history