33m 50s
Feb 28, 2025, 10:53 AM

joomla-cms

[5.4] Upmerge changes from 5.3-dev 2025-02-28

richard67
richard67
openedpull request
#45035

Console Logs

1Cloning with 0 retries 0s
2Initialized empty Git repository in /drone/src/.git/ 0s
3+ git fetch origin +refs/heads/5.4-dev: 0s
4From https://github.com/joomla/joomla-cms 38s
5 * branch 5.4-dev -> FETCH_HEAD 38s
6 * [new branch] 5.4-dev -> origin/5.4-dev 38s
7+ git checkout 5.4-dev 38s
8Branch '5.4-dev' set up to track remote branch '5.4-dev' from 'origin'. 38s
9Switched to a new branch '5.4-dev' 38s
10+ git fetch origin refs/pull/45035/head: 38s
11From https://github.com/joomla/joomla-cms 39s
12 * branch refs/pull/45035/head -> FETCH_HEAD 39s
13+ git merge f61dca955a914781f83d7592d9ad0403a2a7101e 39s
14Updating 377000b1c0..f61dca955a 39s
15Fast-forward 39s
16 .php-cs-fixer.dist.php | 6 ++ 39s
17 .../src/Helper/AssociationsHelper.php | 4 +- 39s
18 .../src/View/Associations/HtmlView.php | 5 +- 39s
19 .../com_banners/src/Table/BannerTable.php | 1 + 39s
20 .../src/Controller/CategoryController.php | 2 +- 39s
21 .../com_checkin/src/Model/CheckinModel.php | 4 +- 39s
22 .../src/Controller/ComponentController.php | 2 +- 39s
23 .../com_config/src/Model/ComponentModel.php | 3 +- 39s
24 .../com_contact/src/Extension/ContactComponent.php | 2 +- 39s
25 .../com_content/src/Model/ArticleModel.php | 2 +- 39s
26 .../src/Helper/ContenthistoryHelper.php | 2 +- 39s
27 .../com_cpanel/src/View/Cpanel/HtmlView.php | 2 +- 39s
28 .../components/com_fields/src/Model/FieldModel.php | 23 +++++- 39s
29 .../components/com_fields/src/Model/GroupModel.php | 19 +++-- 39s
30 .../src/Controller/ManageController.php | 2 +- 39s
31 .../components/com_joomlaupdate/extract.php | 2 +- 39s
32 .../com_joomlaupdate/src/Model/UpdateModel.php | 8 +- 39s
33 .../com_mails/src/Helper/MailsHelper.php | 6 +- 39s
34 .../components/com_menus/src/Model/ItemModel.php | 2 +- 39s
35 .../com_menus/src/Model/MenutypesModel.php | 3 +- 39s
36 .../com_modules/src/View/Modules/HtmlView.php | 3 +- 39s
37 .../src/Helper/PostinstallHelper.php | 4 +- 39s
38 .../com_templates/src/Model/TemplateModel.php | 18 +++-- 39s
39 .../com_users/src/Controller/GroupController.php | 2 +- 39s
40 .../com_users/src/Controller/LevelController.php | 2 +- 39s
41 administrator/index.php | 2 +- 39s
42 .../modules/mod_feed/src/Helper/FeedHelper.php | 2 +- 39s
43 .../modules/mod_menu/src/Menu/CssMenu.php | 10 +-- 39s
44 .../src/Helper/PrivacyDashboardHelper.php | 2 +- 39s
45 .../src/Helper/StatsAdminHelper.php | 4 +- 39s
46 .../src/View/Overrides/JsonapiView.php | 3 +- 39s
47 .../com_media/src/Controller/MediaController.php | 2 +- 39s
48 .../com_media/src/Model/AdapterModel.php | 2 +- 39s
49 api/components/com_media/src/Model/MediaModel.php | 2 +- 39s
50 api/components/com_media/src/Model/MediumModel.php | 16 ++-- 39s
51 api/index.php | 2 +- 39s
52 .../scss/components/_media-breadcrumb.scss | 5 +- 39s
53 .../vendor/bootstrap/js/carousel.es6.js | 15 +--- 39s
54 components/com_contact/forms/contact.xml | 1 - 39s
55 .../src/Controller/ContactController.php | 2 +- 39s
56 components/com_content/helpers/icon.php | 2 +- 39s
57 .../com_content/src/View/Category/HtmlView.php | 4 - 39s
58 components/com_finder/src/Model/SearchModel.php | 2 +- 39s
59 components/com_finder/src/Service/Router.php | 2 +- 39s
60 components/com_finder/src/View/Search/HtmlView.php | 2 +- 39s
61 .../com_privacy/src/Dispatcher/Dispatcher.php | 10 +++ 39s
62 components/com_tags/src/Service/Router.php | 2 +- 39s
63 components/com_users/src/Dispatcher/Dispatcher.php | 10 +++ 39s
64 components/com_users/src/View/Profile/HtmlView.php | 4 +- 39s
65 index.php | 2 +- 39s
66 installation/index.php | 2 +- 39s
67 installation/joomla.php | 2 +- 39s
68 installation/language/af-ZA/langmetadata.xml | 2 +- 39s
69 installation/language/ar-AA/langmetadata.xml | 2 +- 39s
70 installation/language/be-BY/langmetadata.xml | 2 +- 39s
71 installation/language/bg-BG/langmetadata.xml | 2 +- 39s
72 installation/language/ca-ES/langmetadata.xml | 2 +- 39s
73 installation/language/cs-CZ/langmetadata.xml | 2 +- 39s
74 installation/language/cy-GB/langmetadata.xml | 2 +- 39s
75 installation/language/da-DK/langmetadata.xml | 2 +- 39s
76 installation/language/el-GR/langmetadata.xml | 2 +- 39s
77 installation/language/en-AU/langmetadata.xml | 2 +- 39s
78 installation/language/en-CA/langmetadata.xml | 2 +- 39s
79 installation/language/en-NZ/langmetadata.xml | 2 +- 39s
80 installation/language/en-US/langmetadata.xml | 2 +- 39s
81 installation/language/es-ES/langmetadata.xml | 2 +- 39s
82 installation/language/et-EE/langmetadata.xml | 2 +- 39s
83 installation/language/eu-ES/langmetadata.xml | 2 +- 39s
84 installation/language/fa-AF/langmetadata.xml | 2 +- 39s
85 installation/language/fa-IR/langmetadata.xml | 2 +- 39s
86 installation/language/fi-FI/langmetadata.xml | 2 +- 39s
87 installation/language/fr-CA/langmetadata.xml | 2 +- 39s
88 installation/language/fr-FR/langmetadata.xml | 2 +- 39s
89 installation/language/he-IL/langmetadata.xml | 2 +- 39s
90 installation/language/hr-HR/langmetadata.xml | 2 +- 39s
91 installation/language/hu-HU/langmetadata.xml | 2 +- 39s
92 installation/language/id-ID/langmetadata.xml | 2 +- 39s
93 installation/language/it-IT/langmetadata.xml | 2 +- 39s
94 installation/language/ja-JP/langmetadata.xml | 2 +- 39s
95 installation/language/ka-GE/langmetadata.xml | 2 +- 39s
96 installation/language/kk-KZ/langmetadata.xml | 2 +- 39s
97 installation/language/ko-KR/langmetadata.xml | 2 +- 39s
98 installation/language/lt-LT/langmetadata.xml | 2 +- 39s
99 installation/language/lv-LV/langmetadata.xml | 2 +- 39s
100 installation/language/mk-MK/langmetadata.xml | 2 +- 39s
101 installation/language/nl-BE/langmetadata.xml | 2 +- 39s
102 installation/language/nl-NL/langmetadata.xml | 2 +- 39s
103 installation/language/pl-PL/langmetadata.xml | 2 +- 39s
104 installation/language/pt-BR/langmetadata.xml | 2 +- 39s
105 installation/language/pt-PT/langmetadata.xml | 2 +- 39s
106 installation/language/ro-RO/langmetadata.xml | 2 +- 39s
107 installation/language/sk-SK/langmetadata.xml | 2 +- 39s
108 installation/language/sl-SI/langmetadata.xml | 2 +- 39s
109 installation/language/sr-YU/langmetadata.xml | 2 +- 39s
110 installation/language/sv-SE/langmetadata.xml | 2 +- 39s
111 installation/language/ta-IN/langmetadata.xml | 2 +- 39s
112 installation/language/th-TH/langmetadata.xml | 2 +- 39s
113 installation/language/tr-TR/langmetadata.xml | 2 +- 39s
114 installation/language/uk-UA/langmetadata.xml | 2 +- 39s
115 installation/language/ur-PK/langmetadata.xml | 2 +- 39s
116 installation/language/vi-VN/langmetadata.xml | 2 +- 39s
117 installation/language/zh-CN/langmetadata.xml | 2 +- 39s
118 installation/language/zh-TW/langmetadata.xml | 2 +- 39s
119 installation/src/Model/ConfigurationModel.php | 1 + 39s
120 language/en-GB/mod_articles_category.ini | 4 +- 39s
121 language/en-GB/mod_articles_category.sys.ini | 4 +- 39s
122 language/en-GB/mod_articles_latest.ini | 4 +- 39s
123 language/en-GB/mod_articles_latest.sys.ini | 4 +- 39s
124 language/en-GB/mod_articles_news.ini | 4 +- 39s
125 language/en-GB/mod_articles_news.sys.ini | 6 +- 39s
126 language/en-GB/mod_articles_popular.ini | 4 +- 39s
127 language/en-GB/mod_articles_popular.sys.ini | 4 +- 39s
128 libraries/src/Application/CMSApplication.php | 6 +- 39s
129 libraries/src/Changelog/Changelog.php | 3 +- 39s
130 libraries/src/Client/FtpClient.php | 2 +- 39s
131 libraries/src/Component/Router/RouterView.php | 2 +- 39s
132 .../src/Component/Router/Rules/NomenuRules.php | 2 +- 39s
133 libraries/src/Console/SetConfigurationCommand.php | 4 +- 39s
134 libraries/src/Dispatcher/ComponentDispatcher.php | 2 +- 39s
135 .../src/Document/Renderer/Html/MessageRenderer.php | 2 +- 39s
136 libraries/src/Environment/Browser.php | 22 +++--- 39s
137 libraries/src/Extension/ExtensionManagerTrait.php | 2 +- 39s
138 libraries/src/Filter/InputFilter.php | 2 +- 39s
139 libraries/src/Form/Field/ChromestyleField.php | 2 - 39s
140 libraries/src/Form/Field/GroupedlistField.php | 2 - 39s
141 libraries/src/Form/Field/HeadertagField.php | 2 - 39s
142 libraries/src/Form/Field/ListField.php | 2 - 39s
143 libraries/src/Form/Field/ModuletagField.php | 2 - 39s
144 libraries/src/Form/Field/TimezoneField.php | 2 +- 39s
145 libraries/src/Form/FormHelper.php | 6 +- 39s
146 libraries/src/Form/Rule/TimeRule.php | 2 +- 39s
147 libraries/src/HTML/HTMLHelper.php | 18 ++--- 39s
148 libraries/src/HTML/Helpers/Bootstrap.php | 65 +++++++++++----- 39s
149 libraries/src/HTML/Helpers/Number.php | 2 +- 39s
150 libraries/src/HTML/Helpers/Select.php | 4 +- 39s
151 libraries/src/Helper/UserGroupsHelper.php | 2 +- 39s
152 libraries/src/Image/Image.php | 4 +- 39s
153 libraries/src/Input/Cli.php | 5 +- 39s
154 libraries/src/Input/Input.php | 2 +- 39s
155 .../src/Installer/Manifest/LibraryManifest.php | 2 +- 39s
156 libraries/src/MVC/Controller/AdminController.php | 6 +- 39s
157 libraries/src/MVC/Controller/BaseController.php | 2 +- 39s
158 libraries/src/Mail/MailTemplate.php | 1 + 39s
159 libraries/src/Response/JsonResponse.php | 2 +- 39s
160 libraries/src/Table/Category.php | 2 +- 39s
161 libraries/src/Table/Content.php | 2 +- 39s
162 libraries/src/Table/ContentType.php | 2 +- 39s
163 libraries/src/Table/Nested.php | 2 +- 39s
164 libraries/src/Updater/Update.php | 3 +- 39s
165 libraries/src/User/User.php | 10 ++- 39s
166 .../src/Helper/ArticlesArchiveHelper.php | 2 +- 39s
167 modules/mod_feed/src/Helper/FeedHelper.php | 2 +- 39s
168 .../src/Helper/RelatedItemsHelper.php | 4 +- 39s
169 modules/mod_stats/src/Helper/StatsHelper.php | 6 +- 39s
170 .../src/Helper/TagsSimilarHelper.php | 2 +- 39s
171 .../src/Helper/UsersLatestHelper.php | 2 +- 39s
172 .../mod_whosonline/src/Helper/WhosonlineHelper.php | 4 +- 39s
173 modules/mod_wrapper/src/Helper/WrapperHelper.php | 2 +- 39s
174 plugins/actionlog/joomla/src/Extension/Joomla.php | 10 +-- 39s
175 .../token/src/Extension/Token.php | 8 +- 39s
176 .../authentication/cookie/src/Extension/Cookie.php | 8 +- 39s
177 plugins/authentication/ldap/src/Extension/Ldap.php | 2 +- 39s
178 .../confirmconsent/src/Field/ConsentBoxField.php | 2 +- 39s
179 .../emailcloak/src/Extension/EmailCloak.php | 27 ++++++- 39s
180 .../src/PluginTraits/ActiveSiteTemplate.php | 2 +- 39s
181 .../tinymce/src/PluginTraits/XTDButtons.php | 8 +- 39s
182 plugins/extension/finder/src/Extension/Finder.php | 2 +- 39s
183 .../filesystem/local/src/Adapter/LocalAdapter.php | 18 ++--- 39s
184 .../installer/override/src/Extension/Override.php | 2 +- 39s
185 .../multifactorauth/email/src/Extension/Email.php | 4 +- 39s
186 .../webauthn/src/Extension/Webauthn.php | 4 +- 39s
187 .../webauthn/src/Helper/Credentials.php | 4 +- 39s
188 .../yubikey/src/Extension/Yubikey.php | 4 +- 39s
189 .../multilang/src/Extension/MultiLanguage.php | 12 +-- 39s
190 plugins/schemaorg/custom/src/Extension/Custom.php | 2 +- 39s
191 .../system/actionlogs/src/Extension/ActionLogs.php | 10 +-- 39s
192 .../debug/src/DataCollector/ProfileCollector.php | 2 +- 39s
193 plugins/system/debug/src/JavascriptRenderer.php | 6 +- 39s
194 .../guidedtours/src/Extension/GuidedTours.php | 2 +- 39s
195 .../src/Extension/LanguageFilter.php | 5 +- 39s
196 plugins/system/log/src/Extension/Log.php | 2 +- 39s
197 .../src/Extension/PrivacyConsent.php | 2 +- 39s
198 plugins/system/redirect/src/Extension/Redirect.php | 2 +- 39s
199 .../src/Extension/ScheduleRunner.php | 2 +- 39s
200 plugins/system/stats/src/Extension/Stats.php | 10 +-- 39s
201 .../src/Extension/TaskNotification.php | 6 +- 39s
202 plugins/system/webauthn/src/Authentication.php | 6 +- 39s
203 .../system/webauthn/src/CredentialRepository.php | 20 ++--- 39s
204 plugins/system/webauthn/src/Extension/Webauthn.php | 2 +- 39s
205 plugins/system/webauthn/src/MetadataRepository.php | 4 +- 39s
206 .../src/PluginTraits/AdditionalLoginButtons.php | 2 +- 39s
207 .../src/PluginTraits/AjaxHandlerChallenge.php | 2 +- 39s
208 .../src/PluginTraits/AjaxHandlerDelete.php | 2 +- 39s
209 .../src/PluginTraits/AjaxHandlerSaveLabel.php | 2 +- 39s
210 .../webauthn/src/PluginTraits/UserDeletion.php | 2 +- 39s
211 .../task/checkfiles/src/Extension/Checkfiles.php | 2 +- 39s
212 .../src/Extension/DeleteActionLogs.php | 2 +- 39s
213 .../globalcheckin/src/Extension/Globalcheckin.php | 4 +- 39s
214 .../src/Extension/PrivacyConsent.php | 10 +-- 39s
215 plugins/task/requests/src/Extension/Requests.php | 2 +- 39s
216 .../task/rotatelogs/src/Extension/RotateLogs.php | 4 +- 39s
217 .../task/sitestatus/src/Extension/SiteStatus.php | 2 +- 39s
218 .../src/Extension/UpdateNotification.php | 4 +- 39s
219 .../src/Extension/ContactCreator.php | 2 +- 39s
220 plugins/user/joomla/src/Extension/Joomla.php | 4 +- 39s
221 plugins/user/profile/src/Extension/Profile.php | 2 +- 39s
222 plugins/user/token/src/Extension/Token.php | 10 +-- 39s
223 plugins/user/token/src/Field/JoomlatokenField.php | 2 +- 39s
224 tests/System/README.md | 2 +- 39s
225 tests/System/data/com_media/test-image-1.jpg | Bin 3480 -> 0 bytes 39s
226 tests/System/data/com_media/test-image-1.png | Bin 255 -> 0 bytes 39s
227 tests/System/data/com_media/test-image-2.png | Bin 255 -> 0 bytes 39s
228 tests/System/fixtures/com_media/test-image-1.jpg | Bin 0 -> 4782 bytes 39s
229 tests/System/fixtures/com_media/test-image-2.jpg | Bin 0 -> 5321 bytes 39s
230 tests/System/fixtures/com_media/test-image-3.jpg | Bin 0 -> 4896 bytes 39s
231 .../administrator/components/com_menu/Menu.cy.js | 2 +- 39s
232 tests/System/integration/api/com_media/Files.cy.js | 84 +++++++++++---------- 39s
233 .../System/integration/install/Installation.cy.js | 3 + 39s
234 tests/System/support/commands/db.mjs | 28 +------ 39s
235 219 files changed, 523 insertions(+), 465 deletions(-) 39s
236 delete mode 100644 tests/System/data/com_media/test-image-1.jpg 39s
237 delete mode 100644 tests/System/data/com_media/test-image-1.png 39s
238 delete mode 100644 tests/System/data/com_media/test-image-2.png 39s
239 create mode 100644 tests/System/fixtures/com_media/test-image-1.jpg 39s
240 create mode 100644 tests/System/fixtures/com_media/test-image-2.jpg 39s
241 create mode 100644 tests/System/fixtures/com_media/test-image-3.jpg 39s
Exit Code 0