Skip to content

Commit

Permalink
Fix Contao requirement issue
Browse files Browse the repository at this point in the history
  • Loading branch information
markocupic committed Jan 4, 2023
1 parent 9624a21 commit c2bcc6b
Show file tree
Hide file tree
Showing 33 changed files with 86 additions and 65 deletions.
58 changes: 29 additions & 29 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
{
"name": "markocupic/calendar-event-booking-bundle",
"type": "contao-bundle",
"description": "Contao 4 Calendar Event Booking Bundle",
"license": "MIT",
"authors": [
{
"name": "Marko Cupic",
"homepage": "https://github.com/markocupic"
"name": "markocupic/calendar-event-booking-bundle",
"type": "contao-bundle",
"description": "Contao 4 Calendar Event Booking Bundle",
"license": "MIT",
"authors": [
{
"name": "Marko Cupic",
"homepage": "https://github.com/markocupic"
}
],
"require": {
"php": "^7.4 || ^8.0",
"contao/core-bundle": "^4.9",
"contao/calendar-bundle": "^4.9",
"markocupic/export_table": "^5.1",
"ramsey/uuid": "^3.0 || ^4.0",
"codefog/contao-haste": "^4.23",
"terminal42/notification_center": "^1.5"
},
"require-dev": {
"contao/easy-coding-standard": "^3.0"
},
"autoload": {
"psr-4": {
"Markocupic\\CalendarEventBookingBundle\\": "src/"
}
},
"extra": {
"contao-manager-plugin": "Markocupic\\CalendarEventBookingBundle\\ContaoManager\\Plugin"
}
],
"require": {
"php": "^7.4 || ^8.0",
"contao/core-bundle": "^4.13",
"contao/calendar-bundle": "^4.9",
"markocupic/export_table": "^5.1",
"ramsey/uuid": "^3.0 || ^4.0",
"codefog/contao-haste": "^4.23",
"terminal42/notification_center": "^1.5"
},
"require-dev": {
"contao/easy-coding-standard": "^3.0"
},
"autoload": {
"psr-4": {
"Markocupic\\CalendarEventBookingBundle\\": "src/"
}
},
"extra": {
"contao-manager-plugin": "Markocupic\\CalendarEventBookingBundle\\ContaoManager\\Plugin"
}
}
11 changes: 11 additions & 0 deletions config/services.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
services:
_defaults:
autowire: true
autoconfigure: true
public: true
bind:
$projectDir: '%kernel.project_dir%'

Markocupic\CalendarEventBookingBundle\:
resource: ../src/
exclude: ../src/{Event,Model,DependencyInjection}
10 changes: 4 additions & 6 deletions contao/dca/tl_calendar_events_member.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,13 @@
* @link https://github.com/markocupic/calendar-event-booking-bundle
*/

use Contao\DataContainer;
use Contao\DC_Table;
use Markocupic\CalendarEventBookingBundle\DataContainer\CalendarEventsMember;
use Ramsey\Uuid\Uuid;

$GLOBALS['TL_DCA']['tl_calendar_events_member'] = [
// Config
'config' => [
'dataContainer' => DC_Table::class,
'dataContainer' => 'Table',
'ptable' => 'tl_calendar_events',
'enableVersioning' => true,
'onsubmit_callback' => [],
Expand All @@ -42,9 +40,9 @@
// List
'list' => [
'sorting' => [
'mode' => DataContainer::MODE_SORTABLE,
'mode' => '2',
'fields' => ['lastname'],
'flag' => DataContainer::SORT_INITIAL_LETTER_ASC,
'flag' => '1',
'panelLayout' => 'filter;sort,search',
],
'label' => [
Expand All @@ -57,7 +55,7 @@
'showColumns' => true,
],
'global_operations' => [
'all' => [
'all' => [
'label' => &$GLOBALS['TL_LANG']['MSC']['all'],
'href' => 'act=select',
'class' => 'header_edit_all',
Expand Down
2 changes: 1 addition & 1 deletion src/ContaoManager/Plugin.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
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
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
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 src/DataContainer/CalendarEvents.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 src/DataContainer/CalendarEventsMember.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 src/DataContainer/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
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 @@ -31,6 +31,6 @@ public function load(array $mergedConfig, ContainerBuilder $container): void
new FileLocator(__DIR__.'/../../config')
);

$loader->load('services.yml');
$loader->load('services.yaml');
}
}
12 changes: 12 additions & 0 deletions src/EventListener/DataContainer/ContentOnLoadCallbackListener.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
<?php

declare(strict_types=1);

/*
* This file is part of Calendar Event Booking Bundle.
*
* (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.
* @link https://github.com/markocupic/calendar-event-booking-bundle
*/

namespace Markocupic\CalendarEventBookingBundle\EventListener\DataContainer;

use Contao\CoreBundle\ServiceAnnotation\Callback;
Expand Down
2 changes: 1 addition & 1 deletion src/Helper/AddTemplateData.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 src/Helper/EventRegistration.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 src/Helper/Formatter.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 src/Helper/NotificationHelper.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 src/Listener/ContaoHooks/AddField/Escort.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 src/Listener/ContaoHooks/ExportTable.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 src/Listener/ContaoHooks/LoadFormField.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 src/Listener/ContaoHooks/ParseTemplate.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 src/Listener/ContaoHooks/PostBooking/AddToSession.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 src/Listener/ContaoHooks/PostBooking/ContaoLog.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 src/Listener/ContaoHooks/PostBooking/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
2 changes: 1 addition & 1 deletion src/Listener/ContaoHooks/PrepareFormData/FormatInput.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
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
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
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 src/Logger/Logger.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 src/MarkocupicCalendarEventBookingBundle.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 src/Migration/AutogenerateBookingForm.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 src/Migration/Version500/AutoGenerateBookingToken.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 src/Migration/Version500/RenameFrontendModuleType.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 src/Model/CalendarEventsMemberModel.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

0 comments on commit c2bcc6b

Please sign in to comment.