Skip to content

Merge 3.4.x up into 4.0.x #388

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

Merged
merged 7 commits into from
Oct 20, 2024
Merged

Merge 3.4.x up into 4.0.x #388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
528e2d0
Add missing blank line
greg0ire Sep 24, 2024
69a864f
Merge pull request #383 from doctrine/fix-docs
greg0ire Sep 24, 2024
94a8310
Bump doctrine/.github from 5.0.1 to 5.1.0 (#384)
dependabot[bot] Sep 30, 2024
9916d0b
Acknowledge the existence of 4.0
greg0ire Oct 15, 2024
1a9c912
Merge pull request #386 from greg0ire/update-branch-metadata
greg0ire Oct 15, 2024
eadad5a
Merge pull request #387 from doctrine/3.3.x
greg0ire Oct 19, 2024
3a2865f
Merge remote-tracking branch 'origin/3.4.x' into 4.0.x
greg0ire Oct 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .doctrine-project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,16 @@
"slug": "persistence",
"docsSlug": "doctrine-persistence",
"versions": [
{
"name": "4.0",
"branchName": "4.0.x",
"slug": "latest",
"upcoming": true
},
{
"name": "3.4",
"branchName": "3.4.x",
"slug": "latest",
"slug": "3.4",
"upcoming": true
},
{
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coding-standards.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ on:
jobs:
coding-standards:
name: "Coding Standards"
uses: "doctrine/.github/.github/workflows/coding-standards.yml@5.0.1"
uses: "doctrine/.github/.github/workflows/coding-standards.yml@5.1.0"
2 changes: 1 addition & 1 deletion .github/workflows/continuous-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
jobs:
phpunit:
name: "PHPUnit"
uses: "doctrine/.github/.github/workflows/continuous-integration.yml@5.0.1"
uses: "doctrine/.github/.github/workflows/continuous-integration.yml@5.1.0"
with:
php-versions: '["8.1", "8.2", "8.3"]'
secrets:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-on-milestone-closed.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
release:
name: "Git tag, release & create merge-up PR"
uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@5.0.1"
uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@5.1.0"
secrets:
GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/static-analysis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ on:
jobs:
static-analysis:
name: "Static Analysis"
uses: "doctrine/.github/.github/workflows/static-analysis.yml@5.0.1"
uses: "doctrine/.github/.github/workflows/static-analysis.yml@5.1.0"
1 change: 1 addition & 0 deletions docs/en/reference/object-change-tracking.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ the persistence backend.

This approach is based on `the observer pattern <https://en.wikipedia.org/wiki/Observer_pattern>`_
and consists of the following two interfaces:

* ``Doctrine\Persistence\NotifyPropertyChanged`` that is implemented by the object
whose changes can be tracked,
* ``Doctrine\Persistence\PropertyChangedListener`` that is implemented by subscribers
Expand Down