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.20.x up into 3.3.x #11664

Merged
merged 13 commits into from
Oct 12, 2024
Merged

Merge 2.20.x up into 3.3.x #11664

merged 13 commits into from
Oct 12, 2024

Commits on Oct 9, 2024

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

Commits on Oct 10, 2024

  1. Run risky code in finally block

    catch blocks are not supposed to fail. If you want to do something
    despite an exception happening, you should do it in a finally block.
    
    Closes doctrine#7545
    greg0ire committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    51be1b1 View commit details
    Browse the repository at this point in the history
  2. Add guard clause

    It maybe happen that the SQL COMMIT statement is successful, but then
    something goes wrong. In that kind of case, you do not want to attempt a
    rollback.
    
    This was implemented in UnitOfWork::commit(), but for some reason not in
    the similar EntityManager methods.
    greg0ire committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    b6137c8 View commit details
    Browse the repository at this point in the history
  3. Remove submodule remnant

    This should make a warning we have in the CI go away.
    
    >  fatal: No url found for submodule path 'docs/en/_theme' in .gitmodules
    greg0ire committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    bac1c17 View commit details
    Browse the repository at this point in the history
  4. Merge pull request doctrine#11655 from greg0ire/submodule-cleanup

    Submodule cleanup
    greg0ire authored Oct 10, 2024
    Configuration menu
    Copy the full SHA
    6281c2b View commit details
    Browse the repository at this point in the history
  5. Merge pull request doctrine#11646 from greg0ire/finally-fix-bug

    Run risky code in finally block
    greg0ire authored Oct 10, 2024
    Configuration menu
    Copy the full SHA
    c2c5000 View commit details
    Browse the repository at this point in the history
  6. Merge pull request doctrine#11656 from doctrine/2.19.x

    Merge 2.19.x up into 2.20.x
    greg0ire authored Oct 10, 2024
    Configuration menu
    Copy the full SHA
    14f2572 View commit details
    Browse the repository at this point in the history
  7. [doctrineGH-8471] undeprecate partials completly (doctrine#11647)

    * [doctrineGH-8471] Undeprecate all PARTIAL object usage.
    beberlei authored Oct 10, 2024
    Configuration menu
    Copy the full SHA
    bea454e View commit details
    Browse the repository at this point in the history
  8. Fix different first/max result values taking up query cache space (do…

    …ctrine#11188)
    
    * Add a test covering the doctrine#11112 issue
    
    * Add new OutputWalker and SqlFinalizer interfaces
    
    * Add a SingleSelectSqlFinalizer that can take care of adding offset/limit as well as locking mode statements to a given SQL query.
    
    Add a FinalizedSelectExecutor that executes given, finalized SQL statements.
    
    * In SqlWalker, split SQL query generation into the two parts that shall happen before and after the finalization phase.
    
    Move the part that generates "pre-finalization" SQL into a dedicated method. Use a side channel in SingleSelectSqlFinalizer to access the "finalization" logic and avoid duplication.
    
    * Fix CS violations
    
    * Skip the GH11112 test while applying refactorings
    
    * Avoid a Psalm complaint due to invalid (?) docblock syntax
    
    * Establish alternate code path - queries can obtain the sql executor through the finalizer, parser knows about output walkers yielding finalizers
    
    * Remove a possibly premature comment
    
    * Re-enable the doctrine#11112 test
    
    * Fix CS
    
    * Make RootTypeWalker inherit from SqlOutputWalker so it becomes finalizer-aware
    
    * Update QueryCacheTest, since first/max results no longer need extra cache entries
    
    * Fix ParserResultSerializationTest by forcing the parser to produce a ParserResult of the old kind (with the executor already constructed)
    
    * Fix WhereInWalkerTest
    
    * Update lib/Doctrine/ORM/Query/Exec/PreparedExecutorFinalizer.php
    
    Co-authored-by: Grégoire Paris <postmaster@greg0ire.fr>
    
    * Fix tests
    
    * Fix a Psalm complaint
    
    * Fix a test
    
    * Fix CS
    
    * Make the NullSqlWalker an instance of SqlOutputWalker
    
    * Avoid multiple cache entries caused by LimitSubqueryOutputWalker
    
    * Fix Psalm complaints
    
    * Fix static analysis complaints
    
    * Remove experimental code that I committed accidentally
    
    * Remove unnecessary baseline entry
    
    * Make AddUnknownQueryComponentWalker subclass SqlOutputWalker
    
    That way, we have no remaining classes in the codebase subclassing SqlWalker but not SqlOutputWalker
    
    * Use more expressive exception classes
    
    * Add a deprecation message
    
    * Move SqlExecutor creation to ParserResult, to minimize public methods available on it
    
    * Avoid keeping the SqlExecutor in the Query, since it must be generated just in time (e. g. in case Query parameters change)
    
    * Address PHPStan complaints
    
    * Fix tests
    
    * Small refactorings
    
    * Add an upgrade notice
    
    * Small refactorings
    
    * Update the Psalm baseline
    
    * Add a missing namespace import
    
    * Update Psalm baseline
    
    * Fix CS
    
    * Fix Psalm baseline
    
    ---------
    
    Co-authored-by: Grégoire Paris <postmaster@greg0ire.fr>
    mpdude and greg0ire authored Oct 10, 2024
    Configuration menu
    Copy the full SHA
    39d2136 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2024

  1. test: cover all transactional methods in `EntityManagerTest::testItPr…

    …eservesTheOriginalExceptionOnRollbackFailure()`
    simPod committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    ee0d719 View commit details
    Browse the repository at this point in the history
  2. Merge pull request doctrine#11660 from simPod/test-method

    test: cover all transactional methods in `EntityManagerTest::testItPreservesTheOriginalExceptionOnRollbackFailure()`
    greg0ire authored Oct 11, 2024
    Configuration menu
    Copy the full SHA
    ff612b9 View commit details
    Browse the repository at this point in the history
  3. Merge pull request doctrine#11661 from doctrine/2.19.x

    Merge 2.19.x up into 2.20.x
    greg0ire authored Oct 11, 2024
    Configuration menu
    Copy the full SHA
    8ed6c22 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    a321331 View commit details
    Browse the repository at this point in the history