Remove user alias from DB (#15714)

* Remove alias

* fix more tests

* fix more system tests

* fix ui tests

* add to developer changelog

* fix typo

28 files changed, 53 insertions, 55 deletions

diff --git a/tests/PHPUnit/Fixtures/UITestFixture.php b/tests/PHPUnit/Fixtures/UITestFixture.php
index 1d0cc5ff5c..4fec37fc7a 100644
--- a/tests/PHPUnit/Fixtures/UITestFixture.php
+++ b/tests/PHPUnit/Fixtures/UITestFixture.php
@@ -97,11 +97,11 @@ class UITestFixture extends SqlDump
         SitesManagerAPI::getInstance()->updateSite(1, null, null, true);
 
         // create non super user
-        UsersManagerAPI::getInstance()->addUser('oliverqueen', 'smartypants', 'oli@queenindustries.com', $this->xssTesting->forTwig('useralias'));
+        UsersManagerAPI::getInstance()->addUser('oliverqueen', 'smartypants', 'oli@queenindustries.com');
         UsersManagerAPI::getInstance()->setUserAccess('oliverqueen', 'view', array(1));
 
         // another non super user
-        UsersManagerAPI::getInstance()->addUser('anotheruser', 'anotheruser', 'someemail@email.com', $this->xssTesting->forAngular('useralias'));
+        UsersManagerAPI::getInstance()->addUser('anotheruser', 'anotheruser', 'someemail@email.com');
         UsersManagerAPI::getInstance()->setUserAccess('anotheruser', 'view', array(1));
 
         // add xss scheduled report
diff --git a/tests/PHPUnit/Framework/Fixture.php b/tests/PHPUnit/Framework/Fixture.php
index 5fb6dae988..8d2e37da54 100644
--- a/tests/PHPUnit/Framework/Fixture.php
+++ b/tests/PHPUnit/Framework/Fixture.php
@@ -737,9 +737,9 @@ class Fixture extends \PHPUnit\Framework\Assert
         }
 
         if (empty($user) || $removeExisting) {
-            $model->addUser($login, $password, 'hello@example.org', $login, Date::now()->getDatetime());
+            $model->addUser($login, $password, 'hello@example.org', Date::now()->getDatetime());
         } else {
-            $model->updateUser($login, $password, 'hello@example.org', $login);
+            $model->updateUser($login, $password, 'hello@example.org');
         }
         try {
             if (!$model->getUserByTokenAuth(self::ADMIN_USER_TOKEN)) {
diff --git a/tests/PHPUnit/Framework/XssTesting.php b/tests/PHPUnit/Framework/XssTesting.php
index ba2853a40e..2f0ea5c5fe 100644
--- a/tests/PHPUnit/Framework/XssTesting.php
+++ b/tests/PHPUnit/Framework/XssTesting.php
@@ -138,8 +138,6 @@ JS;
             'angular-(useragent)',
             'twig-(annotation)',
             'angular-(Annotation note 3)',
-            'twig-(useralias)',
-            'angular-(useralias)',
             'twig-(scheduledreport)',
             'twig-(dimensionname)',
             'twig-(category)',
diff --git a/tests/PHPUnit/Integration/Tracker/RequestTest.php b/tests/PHPUnit/Integration/Tracker/RequestTest.php
index 2323420e3d..bbf5d376b3 100644
--- a/tests/PHPUnit/Integration/Tracker/RequestTest.php
+++ b/tests/PHPUnit/Integration/Tracker/RequestTest.php
@@ -398,7 +398,7 @@ class RequestTest extends IntegrationTestCase
         $user = new Model();
         $token = $user->generateRandomTokenAuth();
 
-        $user->addUser($login, $passwordHash, 'admin@piwik', 'alias', '2014-01-01 00:00:00');
+        $user->addUser($login, $passwordHash, 'admin@piwik', '2014-01-01 00:00:00');
         $user->addUserAccess($login, 'admin', array($idSite));
         $user->addTokenAuth($login, $token, 'createAdminUserForSite', '2014-01-01 00:00:00');
 
diff --git a/tests/UI/expected-screenshots/Comparison_bar_graph.png b/tests/UI/expected-screenshots/Comparison_bar_graph.png
index ba5d01edbe..3f4bc14ae1 100644
--- a/tests/UI/expected-screenshots/Comparison_bar_graph.png
+++ b/tests/UI/expected-screenshots/Comparison_bar_graph.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c99505d3f94c9640d1e68f075c9f85f9b4844fa8d85df7830a162fda996d704f
-size 50440
+oid sha256:ffef537f4e10ee91382f1a79f5b2c9752f3112625a8d8fc204b614dd719ecfb6
+size 50365
diff --git a/tests/UI/expected-screenshots/Comparison_normal_table.png b/tests/UI/expected-screenshots/Comparison_normal_table.png
index bf48daff07..b456293c0c 100644
--- a/tests/UI/expected-screenshots/Comparison_normal_table.png
+++ b/tests/UI/expected-screenshots/Comparison_normal_table.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7a8d5619ac8632aac69aeb34ac25e1d4cf130fd5dda6f6e2679d5e02b6787fca
-size 101275
+oid sha256:756e453aa01d7ef38c0dcc12f5f2ffcf908d819ee3b4c50f3279e1714f84c308
+size 99602
diff --git a/tests/UI/expected-screenshots/Comparison_normal_table_no_periods.png b/tests/UI/expected-screenshots/Comparison_normal_table_no_periods.png
index e68dcc8c43..73d08dbaef 100644
--- a/tests/UI/expected-screenshots/Comparison_normal_table_no_periods.png
+++ b/tests/UI/expected-screenshots/Comparison_normal_table_no_periods.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:44930f68d1737788c57a3cebd83786d349bbacd3ec5a028c2d0ec372cfa12a40
-size 51872
+oid sha256:6c2e1de5be243546d45e01acce0af3d8cad8459ed0a7882ef0625f0e47553f90
+size 50995
diff --git a/tests/UI/expected-screenshots/Comparison_visitors_overview.png b/tests/UI/expected-screenshots/Comparison_visitors_overview.png
index c570ffa5e9..3222b10cef 100644
--- a/tests/UI/expected-screenshots/Comparison_visitors_overview.png
+++ b/tests/UI/expected-screenshots/Comparison_visitors_overview.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4fdd8b580a9bdfd201b4892a27e29f1a51db922207488847ba807f460942e6f8
-size 361710
+oid sha256:825c59f6743ee0473e42bb66cbff2e37f84a4004abded0eb8aff838b4ef1a3fb
+size 361670
diff --git a/tests/UI/expected-screenshots/Comparison_visitors_overview_segment_removed.png b/tests/UI/expected-screenshots/Comparison_visitors_overview_segment_removed.png
index cc68c4871b..cad17bbaf5 100644
--- a/tests/UI/expected-screenshots/Comparison_visitors_overview_segment_removed.png
+++ b/tests/UI/expected-screenshots/Comparison_visitors_overview_segment_removed.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fb50eb19f99ad32fe8ef4cabd11306e8c20c5339a08b30cccfc344c072db6897
-size 191813
+oid sha256:0617cccc1f3b21f70c00e15f9f1bfc54bb0af48afed455c3172b96ea2fd59e3d
+size 191660
diff --git a/tests/UI/expected-screenshots/Comparison_visitors_overview_switched.png b/tests/UI/expected-screenshots/Comparison_visitors_overview_switched.png
index 60ab0ae4d9..3a97308b86 100644
--- a/tests/UI/expected-screenshots/Comparison_visitors_overview_switched.png
+++ b/tests/UI/expected-screenshots/Comparison_visitors_overview_switched.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:56a0c5bf897d8a258ab71cf87a61c6d2457fa4446b1f9758c0364a2c2f58174b
-size 384657
+oid sha256:d362f4eb5d898654ea2e401c501dc7b354aa37904c48e646f7dad17e0c68d100
+size 384580
diff --git a/tests/UI/expected-screenshots/Comparison_visitors_overview_tooltip.png b/tests/UI/expected-screenshots/Comparison_visitors_overview_tooltip.png
index a0241e8cd2..b325ca1ddb 100644
--- a/tests/UI/expected-screenshots/Comparison_visitors_overview_tooltip.png
+++ b/tests/UI/expected-screenshots/Comparison_visitors_overview_tooltip.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:26624f12b81cbcd16856e7e6488c84ee3e82cee0d847c87c88472b8fcd060182
-size 35352
+oid sha256:db25dbdac902521c8b585496c07f9c08bbf9aeeeb74903b0fccc74710ad7bc6f
+size 34649
diff --git a/tests/UI/expected-screenshots/Comparison_visits_overview_widget.png b/tests/UI/expected-screenshots/Comparison_visits_overview_widget.png
index a1146890bb..e4b1420b6a 100644
--- a/tests/UI/expected-screenshots/Comparison_visits_overview_widget.png
+++ b/tests/UI/expected-screenshots/Comparison_visits_overview_widget.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2f07c4096d7cf7ab307b7acc4a4de13f80986412fc5bea4a00a0e126f2af19ed
-size 346280
+oid sha256:a0359845e4893688ec2a1c9a6b77921f8d4f21a11835c487617a9b899911b0d8
+size 346212
diff --git a/tests/UI/expected-screenshots/QuickAccess_search_1.png b/tests/UI/expected-screenshots/QuickAccess_search_1.png
index a30747a50e..e26ab8f29d 100644
--- a/tests/UI/expected-screenshots/QuickAccess_search_1.png
+++ b/tests/UI/expected-screenshots/QuickAccess_search_1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d8e244e4f6259ce86e43489669a2e2d6cf34d0ae3dd2361041c56b97efff67c8
-size 96928
+oid sha256:8269e8055ce52a8dfbbe3455d161456fa82aae32d8a1c490ce05cda91024bdd9
+size 97234
diff --git a/tests/UI/expected-screenshots/QuickAccess_search_2.png b/tests/UI/expected-screenshots/QuickAccess_search_2.png
index 574d133fe6..5c0f64b50c 100644
--- a/tests/UI/expected-screenshots/QuickAccess_search_2.png
+++ b/tests/UI/expected-screenshots/QuickAccess_search_2.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:476172035640c4bd133ca2d0c2b35b4555e3e78b30765adfe838088db4e26532
-size 13642
+oid sha256:d9b89f3645d093b9287ba997b6e830910c8f90a4f4879bf4344d1e254defdb39
+size 13869
diff --git a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_complex_segment.png b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_complex_segment.png
index 8b948588e9..05ff1e2a4f 100644
--- a/tests/UI/expected-screenshots/SegmentSelectorEditorTest_complex_segment.png
+++ b/tests/UI/expected-screenshots/SegmentSelectorEditorTest_complex_segment.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a2467bc4d8086b42c00117f1732d7e0efe2a8b21db5c6c29f1dece40c7526c3a
-size 129878
+oid sha256:ce01f9ce99add3c5e2e5bcca7a74da809b69071138687eeb6d1687eb9ac0400d
+size 136067
diff --git a/tests/UI/expected-screenshots/Theme_home.png b/tests/UI/expected-screenshots/Theme_home.png
index da175a9337..6135199c6c 100644
--- a/tests/UI/expected-screenshots/Theme_home.png
+++ b/tests/UI/expected-screenshots/Theme_home.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6e8a2409ad99268e956e02bda8e0297757ec5bde50f206bf1c2059c7a6bd6b47
-size 708722
+oid sha256:b152b4323a61ee00a22241531d8b199c9a93fece1d75c2c55e15b041f86aa567
+size 708743
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png
index fd84c142c7..87795cd863 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d46b4323d224df365e7a63ba1e0ef49cd78ee4ac9cf9463ff6b613f64405b40d
-size 150549
+oid sha256:c009c8b23fc64b00a3dd260f3a0abeffb80498a61ffd84df88a98497bf8bf793
+size 150530
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_api_error.png b/tests/UI/expected-screenshots/UIIntegrationTest_api_error.png
index fd84c142c7..87795cd863 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_api_error.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_api_error.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d46b4323d224df365e7a63ba1e0ef49cd78ee4ac9cf9463ff6b613f64405b40d
-size 150549
+oid sha256:c009c8b23fc64b00a3dd260f3a0abeffb80498a61ffd84df88a98497bf8bf793
+size 150530
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png
index 9768b47eeb..3655b89fa7 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f1a11ec8692c42b949fd1a009b0eb27b5d728c97c0288725d11ee8b9ce796cdb
-size 632545
+oid sha256:5fcec6f7379f4e7c1424edc3cff271aac03049474cfc5a694413e3cdb1e2e00a
+size 632533
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_email_reports.png b/tests/UI/expected-screenshots/UIIntegrationTest_email_reports.png
index 4c8e4b3c0c..36d681d93f 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_email_reports.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_email_reports.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4d090e26d208d4b05aeeb3bd4ae518f894dae4b583891f15b8cd682a051645ed
-size 96085
+oid sha256:6d2f7282d898c93b54e3a7a0992b0dacd9ff130d2632d9f90f83d7d377ee955a
+size 96134
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_email_reports_editor.png b/tests/UI/expected-screenshots/UIIntegrationTest_email_reports_editor.png
index fd71bac5bd..6d79965ded 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_email_reports_editor.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_email_reports_editor.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ba93bd4f1d2ac1a3af1341bb642eac4389294adb192c4a9a4fddcaa12cbf2b90
-size 464578
+oid sha256:360bfe5b214f4c4f41e77f2a2c3ed7a6761cbb60ae18ea1f0b9ea1a591f3027d
+size 464254
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_glossary.png b/tests/UI/expected-screenshots/UIIntegrationTest_glossary.png
index 850f20aab3..dc41cab6d1 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_glossary.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_glossary.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:226960381da634575be57ba681f1e62e50a71492c6387d6bab51b0b64eb0b695
-size 490306
+oid sha256:db3faab62d92767127155d9fb71a8c2b341baad4aefe0789e6226b858588487b
+size 490116
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_glossary_widgetized.png b/tests/UI/expected-screenshots/UIIntegrationTest_glossary_widgetized.png
index a9ab7d7d97..50d688b511 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_glossary_widgetized.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_glossary_widgetized.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:31eb0d05d26c083e82075e513f36b54edd4c1bde5c5e619d42c353a5fb74c91c
-size 603865
+oid sha256:a940df84e56703c073eaf369660cdfe325752e207f6db61d8159b53151ec5865
+size 603660
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_period_select_date_range_click.png b/tests/UI/expected-screenshots/UIIntegrationTest_period_select_date_range_click.png
index d273ea0147..fb54725876 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_period_select_date_range_click.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_period_select_date_range_click.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:89f2c81bfa432bfceb77c618907357f07b8033e0d35531063d68db80d433e3ca
-size 78653
+oid sha256:7ffdb32533ddec2ccb8f9aad8a9ebcedf64bcd4a3a3dd5a9aac334dcfd163600
+size 78644
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_overview_segment.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_overview_segment.png
index 5142b08188..8d2c8e7340 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_overview_segment.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_overview_segment.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e8dfa1e3fa089b61888120e63bfbaae07844567dba95c660ebbe9dc29fc1c6af
-size 121599
+oid sha256:30b493229449f9e30410dbad0f2843dcb79890c278564a4c2019865f515ec9c3
+size 121588
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_widgets_listing.png b/tests/UI/expected-screenshots/UIIntegrationTest_widgets_listing.png
index 21f91a9316..c852e3ae2e 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_widgets_listing.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_widgets_listing.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1e5aba4ff1b36aeff4bcfeb2fca49525a174812e9d58a9590024a7bb41462408
-size 190316
+oid sha256:dc32b11ed93d15741c0db7cff413e724a9189a953ca469da522b830f4084f82d
+size 190281
diff --git a/tests/UI/expected-screenshots/enable_framed_pages_embed_whole_app.png b/tests/UI/expected-screenshots/enable_framed_pages_embed_whole_app.png
index 620bfbda39..b58266ba77 100644
--- a/tests/UI/expected-screenshots/enable_framed_pages_embed_whole_app.png
+++ b/tests/UI/expected-screenshots/enable_framed_pages_embed_whole_app.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c103ddeb0504044280c0eae8674cbddcc908b39b674841571037915ac62af155
-size 146894
+oid sha256:a86c5658c006da4458db6610949e6896c75251ccdd8909cf941a0c8f5ab2977e
+size 146943
diff --git a/tests/resources/install-matomo.php b/tests/resources/install-matomo.php
index 741471c6bc..b9e03b88ee 100644
--- a/tests/resources/install-matomo.php
+++ b/tests/resources/install-matomo.php
@@ -91,9 +91,9 @@ function createSuperUser() {
     $user  = $model->getUser($login);
 
     if (empty($user)) {
-        $model->addUser($login, $password, 'hello@example.org', $login, Date::now()->getDatetime());
+        $model->addUser($login, $password, 'hello@example.org', Date::now()->getDatetime());
     } else {
-        $model->updateUser($login, $password, 'hello@example.org', $login);
+        $model->updateUser($login, $password, 'hello@example.org');
     }
 
     $setSuperUser = empty($user) || !empty($user['superuser_access']);