Fix build (#17116)

* update SecurityInfo plugin to latest

* update expected files and fix regression

* fix test

25 files changed, 47 insertions, 46 deletions

diff --git a/plugins/API/tests/Integration/RssRendererTest.php b/plugins/API/tests/Integration/RssRendererTest.php
index 4ceb03cc5b..902b35c874 100644
--- a/plugins/API/tests/Integration/RssRendererTest.php
+++ b/plugins/API/tests/Integration/RssRendererTest.php
@@ -147,7 +147,8 @@ class RssRendererTest extends IntegrationTestCase
     
     <generator>matomo</generator>
     <language>en</language>
-    	</channel>
+    
+	</channel>
 </rss>', $response);
     }
 
diff --git a/plugins/SecurityInfo b/plugins/SecurityInfo
-Subproject a0098407e04489c9ae42721be41cc4150db59f4
+Subproject 269452cea2f6d53362832c1bc9634cb7e0ee835
diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuthUsersManager_edit_with_2fa.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuthUsersManager_edit_with_2fa.png
index a930d48542..a649c1f566 100644
--- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuthUsersManager_edit_with_2fa.png
+++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuthUsersManager_edit_with_2fa.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ca138f0e64f0bcec8fee55f32f63ed71848c9289286baae53a2be8738d49d930
-size 27148
+oid sha256:5f5d14bf5b773d0b92f80ce2d27bdbc10b3b7013f33847d83464162fa3bac827
+size 30303
diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuthUsersManager_edit_with_2fa_reset_confirmed.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuthUsersManager_edit_with_2fa_reset_confirmed.png
index cbb1dcae9e..f99a39dbbf 100644
--- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuthUsersManager_edit_with_2fa_reset_confirmed.png
+++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuthUsersManager_edit_with_2fa_reset_confirmed.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:05866360158d97ec36006e96c5fdab019e7838f00448e4c371c3e748960c6546
-size 30501
+oid sha256:3b8feec74a212f4643e059ef8e08ab5daf62d009293613c7180e746b80baee37
+size 33939
diff --git a/plugins/UsersManager/angularjs/user-edit-form/user-edit-form.component.html b/plugins/UsersManager/angularjs/user-edit-form/user-edit-form.component.html
index b550ed17a4..faf465de09 100644
--- a/plugins/UsersManager/angularjs/user-edit-form/user-edit-form.component.html
+++ b/plugins/UsersManager/angularjs/user-edit-form/user-edit-form.component.html
@@ -1,6 +1,6 @@
 <div
     piwik-content-block
-    content-title="{{ $ctrl.getFormTitle() }} '{{ $ctrl.user.login }}'"
+    content-title="{{ $ctrl.getFormTitle() }} {{ !$ctrl.isAdd ? ('\'' + $ctrl.user.login + '\'') : '' }}"
     class="userEditForm"
     ng-class="{ loading: $ctrl.isSavingUserInfo }"
 >
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_edit_permissions.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_edit_permissions.png
index 5cf7d9c578..9090dc7a3f 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_edit_permissions.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_edit_permissions.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ed8b282fa6aee9b4430393eca9cb01125f5166ae929b9c9d4e22aa1e89d5a177
-size 81179
+oid sha256:4454de8d9445a791f221206ebb6899cd1743978b81d73a4964aea7078ce070dd
+size 83311
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_edit_user_basic_info.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_edit_user_basic_info.png
index 26c2ee4e6f..eceb4bb2fc 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_edit_user_basic_info.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_edit_user_basic_info.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:78d0dbec317156bd8697c9665783fb6d3d8273fb8dbb222136cafd146485db8f
-size 12793
+oid sha256:556b8e5feedeb5c84d0d1125f7576ca7490d526c7909d58f73a1d523e1481f0d
+size 14881
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_edit_user_basic_confirmed_wrong_password.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_edit_user_basic_confirmed_wrong_password.png
index 896f137279..72409206c3 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_edit_user_basic_confirmed_wrong_password.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_edit_user_basic_confirmed_wrong_password.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9decfbba214d8684958217547550f6ff9a713f530f479a55df8a966de9d0b6de
-size 29462
+oid sha256:c807a46f887c8306c060a14c2d84157eb71044fa2a9ddf8d69c7f322a4e71609
+size 31203
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_edit_user_form.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_edit_user_form.png
index 54445f27e9..274303b9bc 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_edit_user_form.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_edit_user_form.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3cc0e4c61197107b903c755fe902b80005a2c370518918833b3d7e3a85131beb
-size 22557
+oid sha256:5c188edc2479b3a59eed6ae8e74acfeda5926933a4730216566d004e07e127da
+size 24379
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_all_rows_in_search.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_all_rows_in_search.png
index 3905af7a73..ac31172541 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_all_rows_in_search.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_all_rows_in_search.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8e715e9c4e7f2fe36d89bc2e70ff8ecae5f034aafa5db68d837c779cf619b223
-size 92053
+oid sha256:fe3764e42f8d7d298cdb8ebad7960497d19929f099021bab5425313953d6a39c
+size 94852
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_all_sites_access.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_all_sites_access.png
index 7db1015366..c713a7052e 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_all_sites_access.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_all_sites_access.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:259271d4cf385f8d1e985fd6ce01d9f2fae48a32d7fdad3a5100b190a6803143
-size 99773
+oid sha256:673e81e82d1e0cdbcdb4e4139e3a0099a0c96d1daee37054ef00009043926ebc
+size 102888
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set.png
index e6fb916fbc..84d1e9c9c4 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1adc0aefc0706ecf254950a24e77bc6af1fe8368b029d815f86767aab21d26aa
-size 108545
+oid sha256:c0149a8e188f6fc8473dec8efa69d685fdc3d2f0734af437302448f8ffda0682
+size 111393
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set_all.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set_all.png
index e96e5e6d06..cfb6d685a1 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set_all.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set_all.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8ee471b1f4b031a72e361ac63b54f7d8f4ae37dacecfe25c8a1fade52a8d26b1
-size 77859
+oid sha256:a7e48ebda86eb79b95b5550cbbaef7b4e6380b4c1ae53bf2e8ad8edd12f7ca52
+size 80758
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_capability_single_site.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_capability_single_site.png
index 20dfbf0d39..203f09097f 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_capability_single_site.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_capability_single_site.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4c80479abbe7f25ae43bb0a9db024cef7ba5726f34aaf692007080f6d0e3f36c
-size 90856
+oid sha256:a22549a14e657635ee6be8789aa567e5533f4c0d32f99dcc0fdbcb17aaaee338
+size 93631
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_filters.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_filters.png
index 3371f9d678..7e877d8c56 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_filters.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_filters.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cd09e3615fc601700ac31f87393a07fbf8e5b9fc918ad43d5d7efeddcd40b82f
-size 64744
+oid sha256:c4b109528525141f0e12a774b43e0a3d102c20d7b36628688d9b9e6742b41153
+size 67226
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_next.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_next.png
index cbfd6ba54c..69b4cd8701 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_next.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_next.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dbcbf7e65213f590992bcefb0e93f298aaed887616e15f5ec672eb72aa1c4507
-size 88752
+oid sha256:df178bc1121fa5c6a3ecdd9b7c96171eb21b90a5c7110f6ec4e783065317ea18
+size 91662
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_remove_access.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_remove_access.png
index e854ec7af8..71be191b20 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_remove_access.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_remove_access.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4a67d407c56d0a9740435a6925297ba7bd8b048723ccba6f8eb509fd6b1c4f8d
-size 44888
+oid sha256:f924e2c3cd5164931a37be080b9fd3bc42d2261ac3de4b2c53372b8134f54447
+size 47831
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_remove_single.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_remove_single.png
index 7c39730899..2ed4096482 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_remove_single.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_remove_single.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:166f8b1bcbae315fe9587ffd4080471da912353e0d7565c43bb87ed7a45064a5
-size 87040
+oid sha256:e75717a3ede6d86f09885c4b991525bba5a36abcd0964eeafcad75979a670316
+size 89885
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_select_all.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_select_all.png
index 3346d2c291..2617d46327 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_select_all.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_select_all.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4292b24535577c46a68376fec4ddbba23ddd62066fee28a9796a3f46f3ea7e65
-size 66431
+oid sha256:0604c2ca6b16049488411e0950224d376e53fc63e2ee103f10394d4de3b696a4
+size 69540
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_select_multiple.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_select_multiple.png
index 5ee56d481d..4d8df8b991 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_select_multiple.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_select_multiple.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e17d447afa702a8d3e85b2773116db6396a98c55732ef9fb35e107f996f8292a
-size 88866
+oid sha256:b601b529c526d85bc2c51f57815bcf06cc3b94822cccd4b13833be6e69b1f5e8
+size 91835
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_single_site_access.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_single_site_access.png
index 08d501d630..90324c3a2e 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_single_site_access.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_single_site_access.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2ee7153dd5024e828f8d40a9e1990e44d78b60648bef1e573dcfabe07f9cd078
-size 87198
+oid sha256:f30463a47a53bbbbce899378d777ebd5578a985c2d1fa4d3d3aa483b7b1891d1
+size 90011
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_superuser_set.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_superuser_set.png
index 7bb0f35cb0..2ea3faca14 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_superuser_set.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_superuser_set.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6e88d0a2492beed0a30e8cf352694c767efb0785a8aaf5e3d95e9e4163b4172f
-size 35940
+oid sha256:995be0f70d05c5534bae7e6c75b07cf8a6da91554b7535a4734ee10620a286be
+size 38920
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_superuser_tab.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_superuser_tab.png
index 4e47bd2877..9d17de0a13 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_superuser_tab.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_superuser_tab.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a31ad2554c1efceaf1960e884a5b250379531fd004daf88c34267cf8f873461b
-size 35862
+oid sha256:b278d426d0d36171cb524f84c2572c4fd4c741a1e891b085abd6164a99cd6041
+size 38826
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_user_created.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_user_created.png
index 53e40e3e24..2d655f47e1 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_user_created.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_user_created.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c843dc52375738b8bad2f9fdc1c30ecca98681a3c2085e11df25533e5ac1dc73
-size 22225
+oid sha256:1048f0f98eff9613ff7ac7fb07b8459abcb683777b2c54949da204cab461f892
+size 25100
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png
index 3d229b3af6..eacc4174e8 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:176e8f1ec1b794c1db86c8862ef2581d5af8b0d824e53776968bb54dbc9d87e7
-size 4830739
+oid sha256:016e2247b881bcd3974c5f6c672cc57b889c97f7bc9ff91f6efe106e2dd988f1
+size 4849185