.gitattributes

@@ -1,11 +1,11 @@
 /.github         export-ignore
 /.gitattributes   export-ignore
 /.gitignore       export-ignore
-/.php_cs.dist	    export-ignore
-/.travis.yml      export-ignore
+/.php-cs-fixer.dist.php export-ignore
 /Changelog.md     export-ignore
 /Makefile         export-ignore
 /README.md        export-ignore
-/Tests            export-ignore
+/docs/           export-ignore
+/tests/           export-ignore
 /Upgrade.md       export-ignore
 /phpunit.xml.dist export-ignore

.github/workflows/ci.yaml

@@ -0,0 +1,58 @@
+name: CI
+
+on:
+    pull_request:
+    push:
+        branches:
+            - master
+            - 2.x
+            - 3.x
+
+jobs:
+    run:
+        runs-on: ubuntu-latest
+        strategy:
+            fail-fast: false
+            matrix:
+                php:
+                    - '8.1'
+                    - '8.2'
+                    - '8.3'
+                symfony-versions: [false]
+                include:
+                    -   description: 'Symfony 6.*'
+                        php: '8.2'
+                        symfony-versions: '^6.4'
+        name: PHP ${{ matrix.php }} ${{ matrix.description }}
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v4
+
+            - uses: actions/cache@v4
+              with:
+                  path: ~/.composer/cache/files
+                  key: composer-${{ matrix.php }}-${{ matrix.symfony-versions }}-${{ hashFiles('composer.json') }}
+                  restore-keys: |
+                    composer-${{ matrix.php }}-
+                    composer-
+
+            - name: Setup PHP
+              uses: shivammathur/setup-php@v2
+              with:
+                  php-version: ${{ matrix.php }}
+
+            - name: Install symfony/flex
+              run: composer config --global --no-plugins allow-plugins.symfony/flex true && composer global require symfony/flex
+              if: matrix.symfony-versions
+
+            - name: Install dependencies
+              env:
+                SYMFONY_REQUIRE: ${{ matrix.symfony-versions }}
+              run: composer update
+
+            - name: Install PHPUnit
+              run: ./vendor/bin/simple-phpunit install
+
+            - name: Run PHPUnit tests
+              run: |
+                ./vendor/bin/simple-phpunit

.github/workflows/static-analysis.yaml

@@ -0,0 +1,35 @@
+name: Code style and composer validate
+
+on:
+    pull_request:
+    push:
+        branches: [ master, 2.x, 3.x ]
+
+jobs:
+    composer-validate:
+        name: Validate composer.json
+        runs-on: ubuntu-latest
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v3
+
+            - name: Validate
+              run: composer validate --no-check-lock --strict
+
+    php-cs-fixer:
+        name: PHP-CS-Fixer
+        runs-on: ubuntu-latest
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v3
+
+            - name: Setup PHP
+              uses: shivammathur/setup-php@v2
+              with:
+                  php-version: '8.1'
+
+            - name: Install dependencies
+              run: composer install
+
+            - name: Run script
+              run: vendor/bin/php-cs-fixer fix --verbose --diff --dry-run

.gitignore

@@ -1,5 +1,6 @@
-.php_cs
-.php_cs.cache
+.php-cs-fixer.php
+.php-cs-fixer.cache
 composer.lock
 phpunit.xml
 vendor/
+.phpunit.result.cache

.php_cs.dist → .php-cs-fixer.dist.php

@@ -9,10 +9,10 @@
 file that was distributed with this source code.
 EOF;
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
     ->setRules([
         '@Symfony' => true,
-        'array_syntax' => ['syntax' => 'long'],
+        'array_syntax' => ['syntax' => 'short'],
         'combine_consecutive_unsets' => true,
         'header_comment' => ['header' => $header],
         'linebreak_after_opening_tag' => true,
@@ -23,6 +23,10 @@
         'php_unit_construct' => true,
         'php_unit_strict' => true,
         'phpdoc_no_empty_return' => false,
+        'no_superfluous_phpdoc_tags' => [
+            'remove_inheritdoc' => true,
+            'allow_mixed' => true,
+        ],
     ])
     ->setUsingCache(true)
     ->setRiskyAllowed(true)

Changelog.md

@@ -1,9 +1,104 @@
 Changelog
 =========
 
-### 2.1.3 (2018-xx-xx)
+### 4.0.0 (2024-07-04)
 
+* [BC break] Removed the CouchDB ODM integration
+* [BC break] Added return types in most methods
+* [BC break] Marked classes as final when they were `@final`
+* Removed support for symfony <6.4
+* Removed support for PHP <8.1
+* Remove the mailer implementation based on Swiftmailer
+* Added support for Symfony 7
+
+### 3.4.0 (2024-06-25)
+
+* Deprecated the TwigSwiftMailer implementation
+
+### 3.3.0 (2024-06-24)
+
+* Added a mailer implementation based on symfony/mailer and Twig
+* Added tentative return types in most methods
+* Deprecated the CouchDB ODM integration as the ODM is unmaintained
+
+### 3.2.1 (2023-07-06)
+
+* Fixed remaining deprecations with Symfony 6.3
+
+### 3.2.0 (2023-07-06)
+
+* Fixed deprecations with Symfony 6.3
+* Fixed deprecations with Doctrine ORM (requires using DoctrineBundle 2.10.1 or newer for the fix to be effective)
+* Fixed the way to access the session when enabling confirmation emails
+* Fixed the way to access the firewall name when enabling the registration feature
+
+### 3.1.0 (2022-10-26)
+
+* Added support for Symfony 6
+
+### 3.0.2 (2022-10-26)
+
+* Fixed support for the remember-me in the programmatic login when using the new authentication system of Symfony.
+* Fixed some deprecations when using Symfony 5.4.
+
+### 3.0.1 (2022-08-27)
+
+* Fixed the wiring of controllers to avoid a deprecation warning when using Twig.
+
+### 3.0.0 (2022-04-28)
+
+* [BC break] Change the base class of controllers to use the `AbstractController` (but extending the controllers is not officially supported anymore).
+* [BC break] Remove the group feature
+* [BC break] Change the base class for events to `Symfony\Contracts\EventDispatcher\Event` instead of `Symfony\Component\EventDispatcher\Event`
+* [BC break] Remove the `Symfony\Component\Security\Core\User\AdvancedUserInterface` methods from our `UserInterface`
+* [BC break] The ResettingListener now longer blocks password resetting requests based on the `isAccountNonLocked` method of the `AdvancedUserInterface`. Projects customizing `isAccountNonLocked` for that purpose should instead register their own listener for the `FOSUserEvents::RESETTING_RESET_REQUEST` event to set a response instead of processing the request.
+* [BC break] Made `\FOS\UserBundle\Model\User::serialize` and `\FOS\UserBundle\Model\User::unserialize` final. Child classes needing to extend the serialization must override `__serialize` and `__unserialize` instead.
+* [BC break] `\FOS\UserBundle\Event\GetResponseNullableUserEvent` no longer inherits from `\FOS\UserBundle\Event\GetResponseUserEvent` and `\FOS\UserBundle\Event\UserEvent` as that was breaking variance rules.
+* [BC break] A few methods of `FOS\UserBundle\Model\User` now have return types (in methods where Symfony 6 requires them)
+* [BC break] The legacy mailer based on SwiftMailer and symfony/templating is no longer used by default. Selecting a mailer service is now mandatory when using a feature needing the mailer.
+* [BC break] Remove the legacy mailer based on SwiftMailer and symfony/templating. Use `fos_user.mailer.twig_swift` or a custom mailer service.
+* Add support for Symfony 5.
+* Add return types in most methods.
+* Add autowiring support for `FOS\UserBundle\Mailer\MailerInterface`
+
+### 2.2.4 (2022-01-14)
+
+* Fixed a deprecation warning reported by DebugClassLoader in the AdvancedUserInterface BC layer due to the change done in 2.2.3.
+
+### 2.2.3 (2022-01-14)
+
+* Added missing deprecations on some group-related event classes
+* Fixed an invalid report of `UserInterface` being deprecated in static analyzers
+* Fixed the documented return type for `\FOS\UserBundle\Event\GetResponseNullableUserEvent::getUser`
+
+### 2.2.2 (2021-09-08)
+
+* Fixed a deprecation warning about groups being triggered when loading all Doctrine metadata.
+
+### 2.2.1 (2021-09-08)
+
+* Fixed a deprecation warning about groups being triggered when loading the User class of the bundle.
+
+### 2.2.0 (2021-08-26)
+
+* Deprecated the Groups feature.
+* Marked all controllers final.
+* Marked internal classes as such.
 * Added Mongolian translation.
+* Added an email provider.
+* Added a custom user checker.
+* Added PHP 7.4 and PHP 8.0 support.
+* Removed fieldName attribute in MongoDB mapping.
+* Registration confirmation now redirects to login page if token is invalid.
+* User model will not rely on `AdvancedUserInterface` anymore.
+* Self-salting password encoders will not create a salt anymore.
+* FlashListener constructor now accepts `SessionInterface`.
+* Fixed several Symfony deprecation notices.
+* Fixed several translations.
+* Bumped the min PHP version to 7.1.3.
+* Bumped the min Symfony version to 4.4.
+* Added compatibility with Twig 3.
+* Added compatibility with doctrine/persistence 2.
 
 ### 2.1.2 (2018-03-08)