Merge branch '3.x' into 4.x

sonata-project · Jan 6, 2022 · 3b2f6c5 · 3b2f6c5
2 parents 3fd9834 + 026f847
commit 3b2f6c5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -8,6 +8,7 @@ tests export-ignore
 docs export-ignore
 Makefile export-ignore
 phpunit.xml.dist export-ignore
+bin/console export-ignore
 phpstan.neon.dist export-ignore
 phpstan-baseline.neon export-ignore
 phpstan-console-application.php export-ignore

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -34,6 +34,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - [[#745](https://github.com/sonata-project/SonataClassificationBundle/pull/745)] `Sonata\ClassificationBundle\Form\FormHelper` ([@core23](https://github.com/core23))
 - [[#744](https://github.com/sonata-project/SonataClassificationBundle/pull/744)] Support for PHP 7.3 ([@core23](https://github.com/core23))
 
+## [3.18.1](https://github.com/sonata-project/SonataClassificationBundle/compare/3.18.0...3.18.1) - 2022-01-05
+### Fixed
+- [[#812](https://github.com/sonata-project/SonataClassificationBundle/pull/812)] Fixed CategoryInterface::getSlug() PHPDoc return type. ([@kwizer15](https://github.com/kwizer15))
+
 ## [3.18.0](https://github.com/sonata-project/SonataClassificationBundle/compare/3.17.0...3.18.0) - 2021-11-06
 ### Deprecated
 - [[#765](https://github.com/sonata-project/SonataClassificationBundle/pull/765)] `BaseCategory::disableChildrenLazyLoading()` ([@VincentLanglet](https://github.com/VincentLanglet))