Skip to content

Commit

Permalink
Add codefog/contao-haste version 5 compat.
Browse files Browse the repository at this point in the history
  • Loading branch information
markocupic committed Jan 26, 2023
1 parent 9bfc899 commit 21a8bbc
Show file tree
Hide file tree
Showing 42 changed files with 237 additions and 442 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true

[*.{php,twig,yml}]
[*.{php,twig,yaml,json}]
indent_style = space
indent_size = 4

Expand Down
7 changes: 2 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -289,16 +289,13 @@ declare(strict_types=1);

namespace App\EventListener;

use Contao\CoreBundle\ServiceAnnotation\Hook;
use Markocupic\CalendarEventBookingBundle\Controller\FrontendModule\CalendarEventBookingEventBookingModuleController;
use Contao\CoreBundle\DependencyInjection\Attribute\AsHook;

/**
* @Hook(DoSomething::HOOK, priority=DoSomething::PRIORITY)
*/
#[AsHook(DoSomething::HOOK, priority: 1200)]
final class DoSomething
{
public const HOOK = 'calEvtBookingPostBooking';
public const PRIORITY = 1200;

/**
* @var EventRegistration
Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
}
],
"require": {
"php": "^7.4 || ^8.0",
"contao/core-bundle": "^4.9",
"contao/calendar-bundle": "^4.9",
"php": "^8.1",
"contao/core-bundle": "^4.13 || ^5.0",
"contao/calendar-bundle": "^4.13 || ^5.0",
"markocupic/export_table": "^5.1",
"ramsey/uuid": "^3.0 || ^4.0",
"codefog/contao-haste": "^4.23",
"codefog/contao-haste": "^5.0",
"terminal42/notification_center": "^1.5"
},
"require-dev": {
Expand Down
11 changes: 0 additions & 11 deletions config/services.yml

This file was deleted.

40 changes: 20 additions & 20 deletions contao/config/config.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
* This file is part of Calendar Event Booking Bundle.
*
* (c) Marko Cupic 2022 <[email protected]>
* (c) Marko Cupic 2023 <[email protected]>
* @license MIT
* For the full copyright and license information,
* please view the LICENSE file that was distributed with this source code.
Expand All @@ -24,28 +24,28 @@
* Notification center
*/
$GLOBALS['NOTIFICATION_CENTER']['NOTIFICATION_TYPE']['calendar-event-booking-bundle'] = [
'booking-notification' => [
'email_sender_name' => ['organizer_name'],
'booking-notification' => [
'email_sender_name' => ['organizer_name'],
'email_sender_address' => ['organizer_email', 'admin_email'],
'recipients' => ['organizer_email', 'member_email', 'admin_email'],
'email_recipient_cc' => ['organizer_email', 'member_email', 'admin_email'],
'email_recipient_bcc' => ['organizer_email', 'member_email', 'admin_email'],
'email_replyTo' => ['organizer_email', 'member_email', 'admin_email'],
'email_subject' => ['event_*', 'event_title', 'event_unsubscribeLimitTstamp', 'event_unsubscribeHref', 'member_*', 'member_dateOfBirth', 'member_salutation', 'organizer_*', 'organizer_name', 'organizer_email', 'admin_email'],
'email_text' => ['event_*', 'event_title', 'event_unsubscribeLimitTstamp', 'event_unsubscribeHref', 'member_*', 'member_dateOfBirth', 'member_salutation', 'organizer_*', 'organizer_name', 'organizer_email', 'admin_email'],
'email_html' => ['event_*', 'event_title', 'event_unsubscribeLimitTstamp', 'event_unsubscribeHref', 'member_*', 'member_dateOfBirth', 'member_salutation', 'organizer_*', 'organizer_name', 'organizer_email', 'admin_email'],
'attachment_tokens' => [],
'recipients' => ['organizer_email', 'member_email', 'admin_email'],
'email_recipient_cc' => ['organizer_email', 'member_email', 'admin_email'],
'email_recipient_bcc' => ['organizer_email', 'member_email', 'admin_email'],
'email_replyTo' => ['organizer_email', 'member_email', 'admin_email'],
'email_subject' => ['event_*', 'event_title', 'event_unsubscribeLimitTstamp', 'event_unsubscribeHref', 'member_*', 'member_dateOfBirth', 'member_salutation', 'organizer_*', 'organizer_name', 'organizer_email', 'admin_email'],
'email_text' => ['event_*', 'event_title', 'event_unsubscribeLimitTstamp', 'event_unsubscribeHref', 'member_*', 'member_dateOfBirth', 'member_salutation', 'organizer_*', 'organizer_name', 'organizer_email', 'admin_email'],
'email_html' => ['event_*', 'event_title', 'event_unsubscribeLimitTstamp', 'event_unsubscribeHref', 'member_*', 'member_dateOfBirth', 'member_salutation', 'organizer_*', 'organizer_name', 'organizer_email', 'admin_email'],
'attachment_tokens' => [],
],
'event-unsubscribe-notification' => [
'email_sender_name' => ['organizer_name'],
'email_sender_name' => ['organizer_name'],
'email_sender_address' => ['organizer_email', 'admin_email'],
'recipients' => ['organizer_email', 'member_email', 'admin_email'],
'email_recipient_cc' => ['organizer_email', 'member_email', 'admin_email'],
'email_recipient_bcc' => ['organizer_email', 'member_email', 'admin_email'],
'email_replyTo' => ['organizer_email', 'member_email', 'admin_email'],
'email_subject' => ['event_*', 'event_title', 'event_unsubscribeLimitTstamp', 'event_unsubscribeHref', 'member_*', 'member_dateOfBirth', 'member_salutation', 'organizer_*', 'organizer_name', 'organizer_email', 'admin_email'],
'email_text' => ['event_*', 'event_title', 'event_unsubscribeLimitTstamp', 'event_unsubscribeHref', 'member_*', 'member_dateOfBirth', 'member_salutation', 'organizer_*', 'organizer_name', 'organizer_email', 'admin_email'],
'email_html' => ['event_*', 'event_title', 'event_unsubscribeLimitTstamp', 'event_unsubscribeHref', 'member_*', 'member_dateOfBirth', 'member_salutation', 'organizer_*', 'organizer_name', 'organizer_email', 'admin_email'],
'attachment_tokens' => [],
'recipients' => ['organizer_email', 'member_email', 'admin_email'],
'email_recipient_cc' => ['organizer_email', 'member_email', 'admin_email'],
'email_recipient_bcc' => ['organizer_email', 'member_email', 'admin_email'],
'email_replyTo' => ['organizer_email', 'member_email', 'admin_email'],
'email_subject' => ['event_*', 'event_title', 'event_unsubscribeLimitTstamp', 'event_unsubscribeHref', 'member_*', 'member_dateOfBirth', 'member_salutation', 'organizer_*', 'organizer_name', 'organizer_email', 'admin_email'],
'email_text' => ['event_*', 'event_title', 'event_unsubscribeLimitTstamp', 'event_unsubscribeHref', 'member_*', 'member_dateOfBirth', 'member_salutation', 'organizer_*', 'organizer_name', 'organizer_email', 'admin_email'],
'email_html' => ['event_*', 'event_title', 'event_unsubscribeLimitTstamp', 'event_unsubscribeHref', 'member_*', 'member_dateOfBirth', 'member_salutation', 'organizer_*', 'organizer_name', 'organizer_email', 'admin_email'],
'attachment_tokens' => [],
],
];
2 changes: 1 addition & 1 deletion contao/dca/tl_calendar.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
* This file is part of Calendar Event Booking Bundle.
*
* (c) Marko Cupic 2022 <[email protected]>
* (c) Marko Cupic 2023 <[email protected]>
* @license MIT
* For the full copyright and license information,
* please view the LICENSE file that was distributed with this source code.
Expand Down
2 changes: 1 addition & 1 deletion contao/dca/tl_calendar_events.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
* This file is part of Calendar Event Booking Bundle.
*
* (c) Marko Cupic 2022 <[email protected]>
* (c) Marko Cupic 2023 <[email protected]>
* @license MIT
* For the full copyright and license information,
* please view the LICENSE file that was distributed with this source code.
Expand Down
2 changes: 1 addition & 1 deletion contao/dca/tl_calendar_events_member.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
* This file is part of Calendar Event Booking Bundle.
*
* (c) Marko Cupic 2022 <[email protected]>
* (c) Marko Cupic 2023 <[email protected]>
* @license MIT
* For the full copyright and license information,
* please view the LICENSE file that was distributed with this source code.
Expand Down
2 changes: 1 addition & 1 deletion contao/dca/tl_form.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
* This file is part of Calendar Event Booking Bundle.
*
* (c) Marko Cupic 2022 <[email protected]>
* (c) Marko Cupic 2023 <[email protected]>
* @license MIT
* For the full copyright and license information,
* please view the LICENSE file that was distributed with this source code.
Expand Down
2 changes: 1 addition & 1 deletion contao/dca/tl_module.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
* This file is part of Calendar Event Booking Bundle.
*
* (c) Marko Cupic 2022 <[email protected]>
* (c) Marko Cupic 2023 <[email protected]>
* @license MIT
* For the full copyright and license information,
* please view the LICENSE file that was distributed with this source code.
Expand Down
2 changes: 1 addition & 1 deletion contao/languages/en/default.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
* This file is part of Calendar Event Booking Bundle.
*
* (c) Marko Cupic 2022 <[email protected]>
* (c) Marko Cupic 2023 <[email protected]>
* @license MIT
* For the full copyright and license information,
* please view the LICENSE file that was distributed with this source code.
Expand Down
2 changes: 1 addition & 1 deletion contao/languages/en/modules.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
* This file is part of Calendar Event Booking Bundle.
*
* (c) Marko Cupic 2022 <[email protected]>
* (c) Marko Cupic 2023 <[email protected]>
* @license MIT
* For the full copyright and license information,
* please view the LICENSE file that was distributed with this source code.
Expand Down
2 changes: 1 addition & 1 deletion contao/languages/en/tl_calendar.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
* This file is part of Calendar Event Booking Bundle.
*
* (c) Marko Cupic 2022 <[email protected]>
* (c) Marko Cupic 2023 <[email protected]>
* @license MIT
* For the full copyright and license information,
* please view the LICENSE file that was distributed with this source code.
Expand Down
2 changes: 1 addition & 1 deletion contao/languages/en/tl_calendar_events.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
* This file is part of Calendar Event Booking Bundle.
*
* (c) Marko Cupic 2022 <[email protected]>
* (c) Marko Cupic 2023 <[email protected]>
* @license MIT
* For the full copyright and license information,
* please view the LICENSE file that was distributed with this source code.
Expand Down
2 changes: 1 addition & 1 deletion contao/languages/en/tl_calendar_events_member.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
* This file is part of Calendar Event Booking Bundle.
*
* (c) Marko Cupic 2022 <[email protected]>
* (c) Marko Cupic 2023 <[email protected]>
* @license MIT
* For the full copyright and license information,
* please view the LICENSE file that was distributed with this source code.
Expand Down
2 changes: 1 addition & 1 deletion contao/languages/en/tl_form.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
* This file is part of Calendar Event Booking Bundle.
*
* (c) Marko Cupic 2022 <[email protected]>
* (c) Marko Cupic 2023 <[email protected]>
* @license MIT
* For the full copyright and license information,
* please view the LICENSE file that was distributed with this source code.
Expand Down
2 changes: 1 addition & 1 deletion contao/languages/en/tl_module.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
* This file is part of Calendar Event Booking Bundle.
*
* (c) Marko Cupic 2022 <[email protected]>
* (c) Marko Cupic 2023 <[email protected]>
* @license MIT
* For the full copyright and license information,
* please view the LICENSE file that was distributed with this source code.
Expand Down
2 changes: 1 addition & 1 deletion contao/languages/en/tl_nc_notification.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
* This file is part of Calendar Event Booking Bundle.
*
* (c) Marko Cupic 2022 <[email protected]>
* (c) Marko Cupic 2023 <[email protected]>
* @license MIT
* For the full copyright and license information,
* please view the LICENSE file that was distributed with this source code.
Expand Down
Loading

0 comments on commit 21a8bbc

Please sign in to comment.