Merge pull request #387 from doctrine/3.3.x

Merge 3.3.x up into 3.4.x
doctrine · Oct 19, 2024 · eadad5a · eadad5a
2 parents d0ae4b4 + 1a9c912
commit eadad5a
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 5 deletions.
diff --git a/.doctrine-project.json b/.doctrine-project.json
@@ -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
         },
         {

diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
@@ -12,6 +12,6 @@ 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"
     with:
       composer-root-version: "3.0"
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -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:
       composer-root-version: "3.0"
       php-versions: '["7.2", "7.3", "7.4", "8.0", "8.1", "8.2", "8.3"]'

diff --git a/.github/workflows/release-on-milestone-closed.yml b/.github/workflows/release-on-milestone-closed.yml
@@ -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 }}

diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -12,6 +12,6 @@ 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"
     with:
       composer-root-version: "3.0"
diff --git a/docs/en/reference/object-change-tracking.rst b/docs/en/reference/object-change-tracking.rst
@@ -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