From 46fa408d8b725324b16b1af730a453b65705002b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Tamarelle?=
 <jerome.tamarelle@mongodb.com>
Date: Thu, 3 Jul 2025 13:13:29 +0200
Subject: [PATCH 1/2] PHPORM-361 Remove autocommit of CS fixes (#3420)

---
 .github/workflows/coding-standards.yml | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
index 4d0eda3f9..f3fc3e369 100644
--- a/.github/workflows/coding-standards.yml
+++ b/.github/workflows/coding-standards.yml
@@ -56,23 +56,9 @@ jobs:
 
       - name: "Install dependencies with Composer"
         uses: "ramsey/composer-install@3.1.1"
-        with:
-          composer-options: "--no-suggest"
-
-      - name: "Validate PSR class names"
-        run: "composer dump-autoload --optimize --strict-psr"
-
-      - name: "Format the code"
-        continue-on-error: true
-        run: |
-          mkdir .cache
-          ./vendor/bin/phpcbf
 
       # The -q option is required until phpcs v4 is released
       - name: "Run PHP_CodeSniffer"
-        run: "vendor/bin/phpcs -q --no-colors --report=checkstyle | cs2pr"
-
-      - name: "Commit the changes"
-        uses: stefanzweifel/git-auto-commit-action@v6
-        with:
-          commit_message: "apply phpcbf formatting"
+        run: |
+          mkdir .cache
+          vendor/bin/phpcs -q --no-colors --report=checkstyle | cs2pr

From 98b75683f0c68a0294f9b63e2a8bcc5b2a5a4d93 Mon Sep 17 00:00:00 2001
From: Rea Rustagi <85902999+rustagir@users.noreply.github.com>
Date: Thu, 3 Jul 2025 09:45:22 -0400
Subject: [PATCH 2/2] DOCSP-51402: schema-flexible terminology (#3424)

---
 docs/database-collection.txt   | 11 ++++++-----
 docs/feature-compatibility.txt |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/docs/database-collection.txt b/docs/database-collection.txt
index be081c97b..e8d97711a 100644
--- a/docs/database-collection.txt
+++ b/docs/database-collection.txt
@@ -213,8 +213,8 @@ methods in your application:
 
 .. note::
 
-   MongoDB is a schemaless database, so the preceding schema builder methods
-   query the database data rather than the schema.
+   MongoDB is a schema-flexible database, so the preceding schema
+   builder methods query the database data rather than the schema.
 
 Example
 ```````
@@ -269,9 +269,10 @@ collection fields:
 - ``Schema::hasColumns(string $<collection>, string[] $<field names>)``:
   checks if each specified field exists in at least one document
 
-MongoDB is a schemaless database, so the preceding methods query the collection
-data rather than the database schema. If the specified collection doesn't exist
-or is empty, these methods return a value of ``false``.
+MongoDB is a schema-flexible database, so the preceding methods query
+the collection data rather than the database schema. If the specified
+collection doesn't exist or is empty, these methods return a value of
+``false``.
 
 .. note:: id Alias
 
diff --git a/docs/feature-compatibility.txt b/docs/feature-compatibility.txt
index 707f12c70..cce0932cc 100644
--- a/docs/feature-compatibility.txt
+++ b/docs/feature-compatibility.txt
@@ -201,7 +201,7 @@ Migration Features
 ------------------
 
 The {+odm-short+} supports all Laravel migration features, but the
-implementation is specific to MongoDB's schemaless model.
+implementation is specific to MongoDB's schema-flexible model.
 
 Seeding Features
 ----------------