Commit a2b4ab8

authored

Merge 5.4 into 5.x (#3425)

2 parents 63da42c + 98b7568 commit a2b4ab8Copy full SHA for a2b4ab8

File tree

+10

-23

lines changed

+10

-23

lines changed

Lines changed: 3 additions & 17 deletions

Original file line number	Diff line number	Diff line change
`@@ -56,23 +56,9 @@ jobs:`
`56`	`56`
`57`	`57`	`- name: "Install dependencies with Composer"`
`58`	`58`	`uses: "ramsey/composer-install@3.1.1"`
`59`		`- with:`
`60`		`- composer-options: "--no-suggest"`
`61`		`-`
`62`		`- - name: "Validate PSR class names"`
`63`		`- run: "composer dump-autoload --optimize --strict-psr"`
`64`		`-`
`65`		`- - name: "Format the code"`
`66`		`- continue-on-error: true`
`67`		`- run: \|`
`68`		`- mkdir .cache`
`69`		`- ./vendor/bin/phpcbf`
`70`	`59`
`71`	`60`	`# The -q option is required until phpcs v4 is released`
`72`	`61`	`- name: "Run PHP_CodeSniffer"`
`73`		`- run: "vendor/bin/phpcs -q --no-colors --report=checkstyle \| cs2pr"`
`74`		`-`
`75`		`- - name: "Commit the changes"`
`76`		`- uses: stefanzweifel/git-auto-commit-action@v6`
`77`		`- with:`
`78`		`- commit_message: "apply phpcbf formatting"`
	`62`	`+ run: \|`
	`63`	`+ mkdir .cache`
	`64`	`+ vendor/bin/phpcs -q --no-colors --report=checkstyle \| cs2pr`

Lines changed: 6 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -213,8 +213,8 @@ methods in your application:`
`213`	`213`
`214`	`214`	`.. note::`
`215`	`215`
`216`		`- MongoDB is a schemaless database, so the preceding schema builder methods`
`217`		`- query the database data rather than the schema.`
	`216`	`+ MongoDB is a schema-flexible database, so the preceding schema`
	`217`	`+ builder methods query the database data rather than the schema.`
`218`	`218`
`219`	`219`	`Example`
`220`	`220`	```````
`@@ -269,9 +269,10 @@ collection fields:`
`269`	`269`	- ``Schema::hasColumns(string $<collection>, string[] $<field names>)``:
`270`	`270`	`checks if each specified field exists in at least one document`
`271`	`271`
`272`		`-MongoDB is a schemaless database, so the preceding methods query the collection`
`273`		`-data rather than the database schema. If the specified collection doesn't exist`
`274`		-or is empty, these methods return a value of ``false``.
	`272`	`+MongoDB is a schema-flexible database, so the preceding methods query`
	`273`	`+the collection data rather than the database schema. If the specified`
	`274`	`+collection doesn't exist or is empty, these methods return a value of`
	`275`	+``false``.
`275`	`276`
`276`	`277`	`.. note:: id Alias`
`277`	`278`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ Migration Features`
`201`	`201`	`------------------`
`202`	`202`
`203`	`203`	`The {+odm-short+} supports all Laravel migration features, but the`
`204`		`-implementation is specific to MongoDB's schemaless model.`
	`204`	`+implementation is specific to MongoDB's schema-flexible model.`
`205`	`205`
`206`	`206`	`Seeding Features`
`207`	`207`	`----------------`

Comments

(0)