Skip to content

Commit ca2d3cc

Browse files
authored
Merge pull request #388 from greg0ire/4.0.x
Merge 3.4.x up into 4.0.x
2 parents 83b81f3 + 3a2865f commit ca2d3cc

File tree

6 files changed

+12
-5
lines changed

6 files changed

+12
-5
lines changed

.doctrine-project.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,16 @@
44
"slug": "persistence",
55
"docsSlug": "doctrine-persistence",
66
"versions": [
7+
{
8+
"name": "4.0",
9+
"branchName": "4.0.x",
10+
"slug": "latest",
11+
"upcoming": true
12+
},
713
{
814
"name": "3.4",
915
"branchName": "3.4.x",
10-
"slug": "latest",
16+
"slug": "3.4",
1117
"upcoming": true
1218
},
1319
{

.github/workflows/coding-standards.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ on:
1212
jobs:
1313
coding-standards:
1414
name: "Coding Standards"
15-
uses: "doctrine/.github/.github/workflows/coding-standards.yml@5.0.1"
15+
uses: "doctrine/.github/.github/workflows/coding-standards.yml@5.1.0"

.github/workflows/continuous-integration.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
jobs:
1313
phpunit:
1414
name: "PHPUnit"
15-
uses: "doctrine/.github/.github/workflows/continuous-integration.yml@5.0.1"
15+
uses: "doctrine/.github/.github/workflows/continuous-integration.yml@5.1.0"
1616
with:
1717
php-versions: '["8.1", "8.2", "8.3"]'
1818
secrets:

.github/workflows/release-on-milestone-closed.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
jobs:
99
release:
1010
name: "Git tag, release & create merge-up PR"
11-
uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@5.0.1"
11+
uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@5.1.0"
1212
secrets:
1313
GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
1414
GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}

.github/workflows/static-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ on:
1212
jobs:
1313
static-analysis:
1414
name: "Static Analysis"
15-
uses: "doctrine/.github/.github/workflows/static-analysis.yml@5.0.1"
15+
uses: "doctrine/.github/.github/workflows/static-analysis.yml@5.1.0"

docs/en/reference/object-change-tracking.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ the persistence backend.
99

1010
This approach is based on `the observer pattern <https://en.wikipedia.org/wiki/Observer_pattern>`_
1111
and consists of the following two interfaces:
12+
1213
* ``Doctrine\Persistence\NotifyPropertyChanged`` that is implemented by the object
1314
whose changes can be tracked,
1415
* ``Doctrine\Persistence\PropertyChangedListener`` that is implemented by subscribers

0 commit comments

Comments
 (0)