From 87fdb2ae5cab7509b7825f0ac44aa28d1fa575d8 Mon Sep 17 00:00:00 2001 From: Alex Tselegidis Date: Mon, 16 Nov 2020 13:25:54 +0200 Subject: [PATCH] The EA_Migration class is not part of the core and cannot be extended directly. --- application/core/EA_Migration.php | 48 ------------------- .../migrations/001_specific_calendar_sync.php | 5 +- .../002_add_google_analytics_setting.php | 5 +- ...003_add_customer_notifications_setting.php | 5 +- .../004_add_date_format_setting.php | 5 +- .../005_add_require_captcha_setting.php | 5 +- .../006_add_calendar_view_setting.php | 5 +- .../007_add_service_availabilities_type.php | 5 +- .../008_add_service_attendants_number.php | 5 +- .../migrations/009_change_column_types.php | 5 +- .../010_add_time_format_setting.php | 5 +- ...11_remove_prefix_from_fkey_constraints.php | 5 +- application/migrations/012_legal_contents.php | 5 +- .../013_add_weekday_start_setting.php | 5 +- ...014_create_appointment_location_column.php | 5 +- ...rking_plan_exceptions_to_user_settings.php | 5 +- .../016_add_require_phone_number_setting.php | 5 +- .../migrations/017_add_api_token_setting.php | 5 +- .../migrations/018_add_timezone_to_users.php | 5 +- .../019_add_display_any_provider_setting.php | 5 +- .../migrations/020_add_language_to_users.php | 5 +- 21 files changed, 80 insertions(+), 68 deletions(-) delete mode 100644 application/core/EA_Migration.php diff --git a/application/core/EA_Migration.php b/application/core/EA_Migration.php deleted file mode 100644 index 99a555bd..00000000 --- a/application/core/EA_Migration.php +++ /dev/null @@ -1,48 +0,0 @@ - - * @copyright Copyright (c) 2013 - 2020, Alex Tselegidis - * @license https://opensource.org/licenses/GPL-3.0 - GPLv3 - * @link https://easyappointments.org - * @since v1.4.0 - * ---------------------------------------------------------------------------- */ - -/** - * Class MY_Migration - * - * @property CI_Loader $load - * @property CI_Input $input - * @property CI_Output $output - * @property CI_Config $config - * @property CI_Lang $lang - * @property CI_Cache $cache - * @property CI_DB_query_builder $db - * @property CI_Session $session - * @property CI_Security $security - * @property CI_Migration $migration - * - * @property Admins_model $admins_model - * @property Appointments_model $appointments_model - * @property Consents_model $consents_model - * @property Customers_model $customers_model - * @property Providers_model $providers_model - * @property Roles_model $roles_model - * @property Secretaries_model $secretaries_model - * @property Services_model $services_model - * @property Settings_model $settings_model - * @property User_model $user_model - * - * @property Availability $availability - * @property Google_Sync $google_sync - * @property Ics_file $ics_file - * @property Notifications $notifications - * @property Synchronization $synchronization - * @property Timezones $timezones - */ -class EA_Migration extends CI_Model { - // -} diff --git a/application/migrations/001_specific_calendar_sync.php b/application/migrations/001_specific_calendar_sync.php index fa86d3d0..8b701146 100644 --- a/application/migrations/001_specific_calendar_sync.php +++ b/application/migrations/001_specific_calendar_sync.php @@ -16,8 +16,11 @@ * * Notice: This first migration got altered to include the creation of the initial database structure so that external * SQL are not required. + * + * @property CI_DB_query_builder $db + * @property CI_DB_forge $dbforge */ -class Migration_Specific_calendar_sync extends EA_Migration { +class Migration_Specific_calendar_sync extends CI_Migration { /** * Upgrade method. */ diff --git a/application/migrations/002_add_google_analytics_setting.php b/application/migrations/002_add_google_analytics_setting.php index 87e06d2d..74950d28 100644 --- a/application/migrations/002_add_google_analytics_setting.php +++ b/application/migrations/002_add_google_analytics_setting.php @@ -13,8 +13,11 @@ /** * Class Migration_Add_google_analytics_setting + * + * @property CI_DB_query_builder $db + * @property CI_DB_forge $dbforge */ -class Migration_Add_google_analytics_setting extends EA_Migration { +class Migration_Add_google_analytics_setting extends CI_Migration { /** * Upgrade method. * diff --git a/application/migrations/003_add_customer_notifications_setting.php b/application/migrations/003_add_customer_notifications_setting.php index 33cff6ea..0eab1da0 100644 --- a/application/migrations/003_add_customer_notifications_setting.php +++ b/application/migrations/003_add_customer_notifications_setting.php @@ -13,8 +13,11 @@ /** * Class Migration_Add_customer_notifications_setting + * + * @property CI_DB_query_builder $db + * @property CI_DB_forge $dbforge */ -class Migration_Add_customer_notifications_setting extends EA_Migration { +class Migration_Add_customer_notifications_setting extends CI_Migration { /** * Upgrade method. * diff --git a/application/migrations/004_add_date_format_setting.php b/application/migrations/004_add_date_format_setting.php index 757585bc..8ebc46ce 100644 --- a/application/migrations/004_add_date_format_setting.php +++ b/application/migrations/004_add_date_format_setting.php @@ -13,8 +13,11 @@ /** * Class Migration_Add_date_format_setting + * + * @property CI_DB_query_builder $db + * @property CI_DB_forge $dbforge */ -class Migration_Add_date_format_setting extends EA_Migration { +class Migration_Add_date_format_setting extends CI_Migration { /** * Upgrade method. * diff --git a/application/migrations/005_add_require_captcha_setting.php b/application/migrations/005_add_require_captcha_setting.php index c47a199d..fc69ae16 100644 --- a/application/migrations/005_add_require_captcha_setting.php +++ b/application/migrations/005_add_require_captcha_setting.php @@ -13,8 +13,11 @@ /** * Class Migration_Add_require_captcha_setting + * + * @property CI_DB_query_builder $db + * @property CI_DB_forge $dbforge */ -class Migration_Add_require_captcha_setting extends EA_Migration { +class Migration_Add_require_captcha_setting extends CI_Migration { /** * Upgrade method. * diff --git a/application/migrations/006_add_calendar_view_setting.php b/application/migrations/006_add_calendar_view_setting.php index 9d68a018..2cffaeb7 100644 --- a/application/migrations/006_add_calendar_view_setting.php +++ b/application/migrations/006_add_calendar_view_setting.php @@ -13,8 +13,11 @@ /** * Class Migration_Add_calendar_view_setting + * + * @property CI_DB_query_builder $db + * @property CI_DB_forge $dbforge */ -class Migration_Add_calendar_view_setting extends EA_Migration { +class Migration_Add_calendar_view_setting extends CI_Migration { /** * Upgrade method. */ diff --git a/application/migrations/007_add_service_availabilities_type.php b/application/migrations/007_add_service_availabilities_type.php index a78f8592..74773858 100644 --- a/application/migrations/007_add_service_availabilities_type.php +++ b/application/migrations/007_add_service_availabilities_type.php @@ -13,8 +13,11 @@ /** * Class Migration_Add_service_availabilities_type + * + * @property CI_DB_query_builder $db + * @property CI_DB_forge $dbforge */ -class Migration_Add_service_availabilities_type extends EA_Migration { +class Migration_Add_service_availabilities_type extends CI_Migration { /** * Upgrade method. */ diff --git a/application/migrations/008_add_service_attendants_number.php b/application/migrations/008_add_service_attendants_number.php index e44ff518..547dbeba 100644 --- a/application/migrations/008_add_service_attendants_number.php +++ b/application/migrations/008_add_service_attendants_number.php @@ -13,8 +13,11 @@ /** * Class Migration_Add_service_attendants_number + * + * @property CI_DB_query_builder $db + * @property CI_DB_forge $dbforge */ -class Migration_Add_service_attendants_number extends EA_Migration { +class Migration_Add_service_attendants_number extends CI_Migration { /** * Upgrade method. */ diff --git a/application/migrations/009_change_column_types.php b/application/migrations/009_change_column_types.php index 2e802a9d..fe104601 100644 --- a/application/migrations/009_change_column_types.php +++ b/application/migrations/009_change_column_types.php @@ -13,8 +13,11 @@ /** * Class Migration_Change_column_types + * + * @property CI_DB_query_builder $db + * @property CI_DB_forge $dbforge */ -class Migration_Change_column_types extends EA_Migration { +class Migration_Change_column_types extends CI_Migration { /** * Upgrade method. */ diff --git a/application/migrations/010_add_time_format_setting.php b/application/migrations/010_add_time_format_setting.php index cf243af7..f1f32f5e 100644 --- a/application/migrations/010_add_time_format_setting.php +++ b/application/migrations/010_add_time_format_setting.php @@ -13,8 +13,11 @@ /** * Class Migration_Add_time_format_setting + * + * @property CI_DB_query_builder $db + * @property CI_DB_forge $dbforge */ -class Migration_Add_time_format_setting extends EA_Migration { +class Migration_Add_time_format_setting extends CI_Migration { /** * Upgrade method. */ diff --git a/application/migrations/011_remove_prefix_from_fkey_constraints.php b/application/migrations/011_remove_prefix_from_fkey_constraints.php index 8d3dfefc..78426890 100644 --- a/application/migrations/011_remove_prefix_from_fkey_constraints.php +++ b/application/migrations/011_remove_prefix_from_fkey_constraints.php @@ -13,8 +13,11 @@ /** * Class Migration_Remove_prefix_from_foreign_keys + * + * @property CI_DB_query_builder $db + * @property CI_DB_forge $dbforge */ -class Migration_Remove_prefix_from_fkey_constraints extends EA_Migration { +class Migration_Remove_prefix_from_fkey_constraints extends CI_Migration { /** * Upgrade method. */ diff --git a/application/migrations/012_legal_contents.php b/application/migrations/012_legal_contents.php index 020a1d67..ed7a0823 100644 --- a/application/migrations/012_legal_contents.php +++ b/application/migrations/012_legal_contents.php @@ -13,8 +13,11 @@ /** * Class Migration_Create_consents_table + * + * @property CI_DB_query_builder $db + * @property CI_DB_forge $dbforge */ -class Migration_Legal_contents extends EA_Migration { +class Migration_Legal_contents extends CI_Migration { /** * Upgrade method. */ diff --git a/application/migrations/013_add_weekday_start_setting.php b/application/migrations/013_add_weekday_start_setting.php index 342ebdea..4f38da8d 100644 --- a/application/migrations/013_add_weekday_start_setting.php +++ b/application/migrations/013_add_weekday_start_setting.php @@ -13,8 +13,11 @@ /** * Class Migration_Add_weekday_start_setting + * + * @property CI_DB_query_builder $db + * @property CI_DB_forge $dbforge */ -class Migration_Add_weekday_start_setting extends EA_Migration { +class Migration_Add_weekday_start_setting extends CI_Migration { /** * Upgrade method. */ diff --git a/application/migrations/014_create_appointment_location_column.php b/application/migrations/014_create_appointment_location_column.php index a994b697..47fa18b4 100644 --- a/application/migrations/014_create_appointment_location_column.php +++ b/application/migrations/014_create_appointment_location_column.php @@ -13,8 +13,11 @@ /** * Class Migration_Create_appointment_location_column + * + * @property CI_DB_query_builder $db + * @property CI_DB_forge $dbforge */ -class Migration_Create_appointment_location_column extends EA_Migration { +class Migration_Create_appointment_location_column extends CI_Migration { /** * Upgrade method. */ diff --git a/application/migrations/015_add_working_plan_exceptions_to_user_settings.php b/application/migrations/015_add_working_plan_exceptions_to_user_settings.php index bd5c62c8..31214d26 100644 --- a/application/migrations/015_add_working_plan_exceptions_to_user_settings.php +++ b/application/migrations/015_add_working_plan_exceptions_to_user_settings.php @@ -13,8 +13,11 @@ /** * Class Migration_Add_working_plan_exceptions_to_user_settings + * + * @property CI_DB_query_builder $db + * @property CI_DB_forge $dbforge */ -class Migration_Add_working_plan_exceptions_to_user_settings extends EA_Migration { +class Migration_Add_working_plan_exceptions_to_user_settings extends CI_Migration { /** * Upgrade method. */ diff --git a/application/migrations/016_add_require_phone_number_setting.php b/application/migrations/016_add_require_phone_number_setting.php index d51a919e..42f7712a 100644 --- a/application/migrations/016_add_require_phone_number_setting.php +++ b/application/migrations/016_add_require_phone_number_setting.php @@ -13,8 +13,11 @@ /** * Class Migration_Add_require_phone_number_setting + * + * @property CI_DB_query_builder $db + * @property CI_DB_forge $dbforge */ -class Migration_Add_require_phone_number_setting extends EA_Migration { +class Migration_Add_require_phone_number_setting extends CI_Migration { /** * Upgrade method. */ diff --git a/application/migrations/017_add_api_token_setting.php b/application/migrations/017_add_api_token_setting.php index bd1351f2..7ba49e5a 100644 --- a/application/migrations/017_add_api_token_setting.php +++ b/application/migrations/017_add_api_token_setting.php @@ -13,8 +13,11 @@ /** * Class Migration_Add_api_token_setting + * + * @property CI_DB_query_builder $db + * @property CI_DB_forge $dbforge */ -class Migration_Add_api_token_setting extends EA_Migration { +class Migration_Add_api_token_setting extends CI_Migration { /** * Upgrade method. * diff --git a/application/migrations/018_add_timezone_to_users.php b/application/migrations/018_add_timezone_to_users.php index 79744039..000f9876 100644 --- a/application/migrations/018_add_timezone_to_users.php +++ b/application/migrations/018_add_timezone_to_users.php @@ -13,8 +13,11 @@ /** * Class Migration_Add_timezone_to_users + * + * @property CI_DB_query_builder $db + * @property CI_DB_forge $dbforge */ -class Migration_Add_timezone_to_users extends EA_Migration { +class Migration_Add_timezone_to_users extends CI_Migration { /** * Upgrade method. */ diff --git a/application/migrations/019_add_display_any_provider_setting.php b/application/migrations/019_add_display_any_provider_setting.php index 3d46e44e..015dada9 100644 --- a/application/migrations/019_add_display_any_provider_setting.php +++ b/application/migrations/019_add_display_any_provider_setting.php @@ -13,8 +13,11 @@ /** * Class Migration_Add_display_any_provider_setting + * + * @property CI_DB_query_builder $db + * @property CI_DB_forge $dbforge */ -class Migration_Add_display_any_provider_setting extends EA_Migration { +class Migration_Add_display_any_provider_setting extends CI_Migration { /** * Upgrade method. */ diff --git a/application/migrations/020_add_language_to_users.php b/application/migrations/020_add_language_to_users.php index 68f4440d..bede7aab 100644 --- a/application/migrations/020_add_language_to_users.php +++ b/application/migrations/020_add_language_to_users.php @@ -13,8 +13,11 @@ /** * Class Migration_Add_language_to_users + * + * @property CI_DB_query_builder $db + * @property CI_DB_forge $dbforge */ -class Migration_Add_language_to_users extends EA_Migration { +class Migration_Add_language_to_users extends CI_Migration { /** * Upgrade method. */