Merge branch 'develop'

This commit is contained in:
Simon Vieille 2023-09-28 18:14:35 +02:00
commit ba76a83163
3 changed files with 12 additions and 2 deletions

View file

@ -9,7 +9,7 @@ services:
environment:
- MARIADB_ROOT_PASSWORD=root
pipeline:
steps:
db_wait:
image: gitnet.fr/deblan/timeout:latest
commands:
@ -21,7 +21,7 @@ pipeline:
- mysql -hdb -uroot -proot -e "CREATE DATABASE app"
config:
image: deblan/php:8.1
image: deblan/php:${PHP_VERSION}
commands:
- echo APP_ENV=prod >> .env.local
- echo APP_SECRET=$(openssl rand -hex 32) >> .env.local

View file

@ -1,5 +1,13 @@
## [Unreleased]
## [v1.22.0] 2023-09-28
### Added
* update woodpecker ci base file
### Fixed
* fix #1: add UniqueEntity constraint in the User entity
### Changed
* upgrade murph/murph-core
## [1.21.0] 2023-08-11
### Changed
* upgrade murph/murph-core

View file

@ -9,9 +9,11 @@ use Doctrine\ORM\Mapping as ORM;
use Scheb\TwoFactorBundle\Model\Google\TwoFactorInterface;
use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface;
use Symfony\Component\Security\Core\User\UserInterface;
use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
#[ORM\Entity(repositoryClass: UserRepository::class)]
#[ORM\HasLifecycleCallbacks]
#[UniqueEntity('email')]
class User implements PasswordAuthenticatedUserInterface, UserInterface, TwoFactorInterface, EntityInterface
{
use Timestampable;