Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"composer/package-versions-deprecated": "1.11.99",
"cweagans/composer-patches": "1.7.3",
"doctrine/common": "3.5.0",
"doctrine/doctrine-bundle": "2.18.1",
"doctrine/doctrine-bundle": "3.0.0",
"doctrine/doctrine-migrations-bundle": "3.6.0",
"doctrine/orm": "3.5.3",
"exercise/htmlpurifier-bundle": "5.1",
Expand Down
39 changes: 17 additions & 22 deletions api/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 0 additions & 6 deletions api/config/packages/doctrine.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,17 @@ doctrine:
# IMPORTANT: You MUST configure your server version,
# either here or in the DATABASE_URL env var (see .env file)
server_version: '15.0'
use_savepoints: true
types:
datetime: App\Types\Doctrine\UTCDateTimeType
date: App\Types\Doctrine\UTCDateType

schema_filter: ~^(?!view_)~

orm:
auto_generate_proxy_classes: true
enable_lazy_ghost_objects: true
naming_strategy: App\Util\CamelPascalNamingStrategy
identity_generation_preferences:
Doctrine\DBAL\Platforms\PostgreSQLPlatform: identity
auto_mapping: true
report_fields_where_declared: true
validate_xml_mapping: false
mappings:
App:
Expand All @@ -28,8 +24,6 @@ doctrine:
dir: '%kernel.project_dir%/src/Entity'
prefix: 'App\Entity'
alias: App
controller_resolver:
auto_mapping: true

schema_ignore_classes:
- App\Entity\CampRootContentNode
Expand Down
1 change: 0 additions & 1 deletion api/config/packages/prod/doctrine.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
doctrine:
orm:
auto_generate_proxy_classes: false
metadata_cache_driver:
type: pool
pool: doctrine.system_cache_pool
Expand Down
2 changes: 2 additions & 0 deletions api/src/Repository/ActivityRepository.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
* @method null|Activity findOneBy(array $criteria, array $orderBy = null)
* @method Activity[] findAll()
* @method Activity[] findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
*
* @template-extends ServiceEntityRepository<Activity>
*/
class ActivityRepository extends ServiceEntityRepository implements CanFilterByUserInterface {
use FiltersByCampCollaboration;
Expand Down
2 changes: 2 additions & 0 deletions api/src/Repository/ActivityResponsibleRepository.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
* @method null|ActivityResponsible findOneBy(array $criteria, array $orderBy = null)
* @method ActivityResponsible[] findAll()
* @method ActivityResponsible[] findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
*
* @template-extends ServiceEntityRepository<ActivityResponsible>
*/
class ActivityResponsibleRepository extends ServiceEntityRepository implements CanFilterByUserInterface {
use FiltersByCampCollaboration;
Expand Down
2 changes: 2 additions & 0 deletions api/src/Repository/CampCollaborationRepository.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
* @method null|CampCollaboration findOneBy(array $criteria, array $orderBy = null)
* @method CampCollaboration[] findAll()
* @method CampCollaboration[] findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
*
* @template-extends ServiceEntityRepository<CampCollaboration>
*/
class CampCollaborationRepository extends ServiceEntityRepository implements CanFilterByUserInterface {
use FiltersByCampCollaboration;
Expand Down
2 changes: 2 additions & 0 deletions api/src/Repository/CampRepository.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
* @method null|Camp findOneBy(array $criteria, array $orderBy = null)
* @method Camp[] findAll()
* @method Camp[] findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
*
* @template-extends ServiceEntityRepository<Camp>
*/
class CampRepository extends ServiceEntityRepository implements CanFilterByUserInterface {
use FiltersByCampCollaboration;
Expand Down
2 changes: 2 additions & 0 deletions api/src/Repository/CategoryRepository.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
* @method null|Category findOneBy(array $criteria, array $orderBy = null)
* @method Category[] findAll()
* @method Category[] findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
*
* @template-extends ServiceEntityRepository<Category>
*/
class CategoryRepository extends ServiceEntityRepository implements CanFilterByUserInterface {
use FiltersByCampCollaboration;
Expand Down
2 changes: 2 additions & 0 deletions api/src/Repository/ChecklistItemRepository.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
* @method null|ChecklistItem findOneBy(array $criteria, array $orderBy = null)
* @method ChecklistItem[] findAll()
* @method ChecklistItem[] findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
*
* @template-extends ServiceEntityRepository<ChecklistItem>
*/
class ChecklistItemRepository extends ServiceEntityRepository implements CanFilterByUserInterface {
public function __construct(ManagerRegistry $registry) {
Expand Down
2 changes: 2 additions & 0 deletions api/src/Repository/ChecklistRepository.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
* @method null|Checklist findOneBy(array $criteria, array $orderBy = null)
* @method Checklist[] findAll()
* @method Checklist[] findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
*
* @template-extends ServiceEntityRepository<Checklist>
*/
class ChecklistRepository extends ServiceEntityRepository implements CanFilterByUserInterface {
use FiltersByCampCollaboration;
Expand Down
2 changes: 2 additions & 0 deletions api/src/Repository/CommentRepository.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
* @method null|Comment findOneBy(array $criteria, array $orderBy = null)
* @method Comment[] findAll()
* @method Comment[] findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
*
* @template-extends ServiceEntityRepository<Comment>
*/
class CommentRepository extends ServiceEntityRepository implements CanFilterByUserInterface {
use FiltersByCampCollaboration;
Expand Down
2 changes: 2 additions & 0 deletions api/src/Repository/DayRepository.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
* @method null|Day findOneBy(array $criteria, array $orderBy = null)
* @method Day[] findAll()
* @method Day[] findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
*
* @template-extends ServiceEntityRepository<Day>
*/
class DayRepository extends ServiceEntityRepository implements CanFilterByUserInterface {
use FiltersByCampCollaboration;
Expand Down
2 changes: 2 additions & 0 deletions api/src/Repository/DayResponsibleRepository.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
* @method null|DayResponsible findOneBy(array $criteria, array $orderBy = null)
* @method DayResponsible[] findAll()
* @method DayResponsible[] findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
*
* @template-extends ServiceEntityRepository<DayResponsible>
*/
class DayResponsibleRepository extends ServiceEntityRepository implements CanFilterByUserInterface {
use FiltersByCampCollaboration;
Expand Down
2 changes: 2 additions & 0 deletions api/src/Repository/MaterialItemRepository.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
* @method null|MaterialItem findOneBy(array $criteria, array $orderBy = null)
* @method MaterialItem[] findAll()
* @method MaterialItem[] findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
*
* @template-extends ServiceEntityRepository<MaterialItem>
*/
class MaterialItemRepository extends ServiceEntityRepository implements CanFilterByUserInterface {
use FiltersByCampCollaboration;
Expand Down
2 changes: 2 additions & 0 deletions api/src/Repository/MaterialListRepository.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
* @method null|MaterialList findOneBy(array $criteria, array $orderBy = null)
* @method MaterialList[] findAll()
* @method MaterialList[] findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
*
* @template-extends ServiceEntityRepository<MaterialList>
*/
class MaterialListRepository extends ServiceEntityRepository implements CanFilterByUserInterface {
use FiltersByCampCollaboration;
Expand Down
2 changes: 2 additions & 0 deletions api/src/Repository/OAuthStateRepository.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
* @method null|OAuthState findOneBy(array $criteria, array $orderBy = null)
* @method OAuthState[] findAll()
* @method OAuthState[] findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
*
* @template-extends ServiceEntityRepository<OAuthState>
*/
class OAuthStateRepository extends ServiceEntityRepository {
public function __construct(ManagerRegistry $registry) {
Expand Down
2 changes: 2 additions & 0 deletions api/src/Repository/PeriodRepository.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
* @method null|Period findOneBy(array $criteria, array $orderBy = null)
* @method Period[] findAll()
* @method Period[] findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
*
* @template-extends ServiceEntityRepository<Period>
*/
class PeriodRepository extends ServiceEntityRepository implements CanFilterByUserInterface {
use FiltersByCampCollaboration;
Expand Down
2 changes: 2 additions & 0 deletions api/src/Repository/ProfileRepository.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
* @method null|Profile findOneBy(array $criteria, array $orderBy = null)
* @method Profile[] findAll()
* @method Profile[] findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
*
* @template-extends ServiceEntityRepository<Profile>
*/
class ProfileRepository extends ServiceEntityRepository implements CanFilterByUserInterface {
public function __construct(ManagerRegistry $registry) {
Expand Down
2 changes: 2 additions & 0 deletions api/src/Repository/ScheduleEntryRepository.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
* @method null|ScheduleEntry findOneBy(array $criteria, array $orderBy = null)
* @method ScheduleEntry[] findAll()
* @method ScheduleEntry[] findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
*
* @template-extends ServiceEntityRepository<ScheduleEntry>
*/
class ScheduleEntryRepository extends ServiceEntityRepository implements CanFilterByUserInterface {
use FiltersByCampCollaboration;
Expand Down
2 changes: 2 additions & 0 deletions api/src/Repository/UserRepository.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
* @method null|User findOneBy(array $criteria, array $orderBy = null)
* @method User[] findAll()
* @method User[] findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
*
* @template-extends ServiceEntityRepository<User>
*/
class UserRepository extends ServiceEntityRepository implements PasswordUpgraderInterface, UserLoaderInterface {
public function __construct(ManagerRegistry $registry) {
Expand Down