diff --git a/data/mysql/cleandata.sql b/data/mysql/cleandata.sql index 99ebfdefdb..e086d201d9 100644 --- a/data/mysql/cleandata.sql +++ b/data/mysql/cleandata.sql @@ -285,8 +285,8 @@ VALUES (1), (2), (3), (4), (5), (6), (7), (8), (9), (10), (11), (12), (13), (14) (34), (35), (36), (37); INSERT INTO `ezuser` (`contentobject_id`, `email`, `login`, `password_hash`, `password_hash_type`) -VALUES (10,'nospam@ez.no','anonymous','$2y$10$35gOSQs6JK4u4whyERaeUuVeQBi2TUBIZIfP7HEj7sfz.MxvTuOeC',7), - (14,'nospam@ez.no','admin','$2y$10$FDn9NPwzhq85cLLxfD5Wu.L3SL3Z/LNCvhkltJUV0wcJj7ciJg2oy',7); +VALUES (10,'anonymous@link.invalid','anonymous','$2y$10$35gOSQs6JK4u4whyERaeUuVeQBi2TUBIZIfP7HEj7sfz.MxvTuOeC',7), + (14,'admin@link.invalid','admin','$2y$10$FDn9NPwzhq85cLLxfD5Wu.L3SL3Z/LNCvhkltJUV0wcJj7ciJg2oy',7); INSERT INTO `ezuser_role` (`contentobject_id`, `id`, `limit_identifier`, `limit_value`, `role_id`) VALUES (11,28,'','',1), diff --git a/data/postgresql/cleandata.sql b/data/postgresql/cleandata.sql index fb81992704..c1748edc82 100644 --- a/data/postgresql/cleandata.sql +++ b/data/postgresql/cleandata.sql @@ -285,8 +285,8 @@ VALUES (1), (2), (3), (4), (5), (6), (7), (8), (9), (10), (11), (12), (13), (14) (34), (35), (36), (37); INSERT INTO "ezuser" ("contentobject_id", "email", "login", "password_hash", "password_hash_type") -VALUES (10,'nospam@ez.no','anonymous','$2y$10$35gOSQs6JK4u4whyERaeUuVeQBi2TUBIZIfP7HEj7sfz.MxvTuOeC',7), - (14,'nospam@ez.no','admin','$2y$10$FDn9NPwzhq85cLLxfD5Wu.L3SL3Z/LNCvhkltJUV0wcJj7ciJg2oy',7); +VALUES (10,'anonymous@link.invalid','anonymous','$2y$10$35gOSQs6JK4u4whyERaeUuVeQBi2TUBIZIfP7HEj7sfz.MxvTuOeC',7), + (14,'admin@link.invalid','admin','$2y$10$FDn9NPwzhq85cLLxfD5Wu.L3SL3Z/LNCvhkltJUV0wcJj7ciJg2oy',7); INSERT INTO "ezuser_role" ("contentobject_id", "id", "limit_identifier", "limit_value", "role_id") VALUES (11,28,'','',1), diff --git a/eZ/Publish/API/Repository/Tests/Filtering/BaseRepositoryFilteringTestCase.php b/eZ/Publish/API/Repository/Tests/Filtering/BaseRepositoryFilteringTestCase.php index 62cba3a968..3c9b90b8c4 100644 --- a/eZ/Publish/API/Repository/Tests/Filtering/BaseRepositoryFilteringTestCase.php +++ b/eZ/Publish/API/Repository/Tests/Filtering/BaseRepositoryFilteringTestCase.php @@ -228,8 +228,8 @@ public function getCriteriaForInitialData(): iterable yield 'SectionIdentifier=standard' => new Criterion\SectionIdentifier('standard'); yield 'Sibling IN 2, 1]' => new Criterion\Sibling(2, 1); yield 'Subtree=/1/2/' => new Criterion\Subtree('/1/2/'); - yield 'UserEmail=nospam@ez.no' => new Criterion\UserEmail('nospam@ez.no'); - yield 'UserEmail=nospam@*' => new Criterion\UserEmail('*@ez.no', Criterion\Operator::LIKE); + yield 'UserEmail=admin@link.invalid' => new Criterion\UserEmail('admin@link.invalid'); + yield 'UserEmail=admin@*' => new Criterion\UserEmail('*@link.invalid', Criterion\Operator::LIKE); yield 'UserId=14' => new Criterion\UserId(14); yield 'UserLogin=admin' => new Criterion\UserLogin('admin'); yield 'UserLogin=a*' => new Criterion\UserLogin('a*', Criterion\Operator::LIKE); diff --git a/eZ/Publish/API/Repository/Tests/SearchServiceTest.php b/eZ/Publish/API/Repository/Tests/SearchServiceTest.php index 015820689f..fac4ba2092 100644 --- a/eZ/Publish/API/Repository/Tests/SearchServiceTest.php +++ b/eZ/Publish/API/Repository/Tests/SearchServiceTest.php @@ -753,7 +753,7 @@ public function getContentQuerySearches() ], [ [ - 'query' => new Criterion\UserEmail('*nospam*', Operator::LIKE), + 'query' => new Criterion\UserEmail('*anonymous*', Operator::LIKE), 'sortClauses' => [new SortClause\ContentId()], 'limit' => 50, ], @@ -761,7 +761,7 @@ public function getContentQuerySearches() ], [ [ - 'query' => new Criterion\UserEmail('nospam@ez.no', Operator::EQ), + 'query' => new Criterion\UserEmail('anonymous@link.invalid', Operator::EQ), 'sortClauses' => [new SortClause\ContentId()], 'limit' => 50, ], @@ -769,7 +769,7 @@ public function getContentQuerySearches() ], [ [ - 'query' => new Criterion\UserEmail(['nospam@ez.no'], Operator::IN), + 'query' => new Criterion\UserEmail(['anonymous@link.invalid'], Operator::IN), 'sortClauses' => [new SortClause\ContentId()], 'limit' => 50, ], diff --git a/eZ/Publish/API/Repository/Tests/_fixtures/Legacy/data/test_data.yaml b/eZ/Publish/API/Repository/Tests/_fixtures/Legacy/data/test_data.yaml index 85df39e24e..d8cef45ea3 100644 --- a/eZ/Publish/API/Repository/Tests/_fixtures/Legacy/data/test_data.yaml +++ b/eZ/Publish/API/Repository/Tests/_fixtures/Legacy/data/test_data.yaml @@ -824,8 +824,8 @@ ezurlalias_ml_incr: - { id: 41 } ezurlwildcard: { } ezuser: - - { contentobject_id: 10, email: nospam@ez.no, login: anonymous, password_hash: $2y$10$35gOSQs6JK4u4whyERaeUuVeQBi2TUBIZIfP7HEj7sfz.MxvTuOeC, password_hash_type: 7 } - - { contentobject_id: 14, email: spam@ez.no, login: admin, password_hash: $2y$10$FDn9NPwzhq85cLLxfD5Wu.L3SL3Z/LNCvhkltJUV0wcJj7ciJg2oy, password_hash_type: 7 } + - { contentobject_id: 10, email: anonymous@link.invalid, login: anonymous, password_hash: $2y$10$35gOSQs6JK4u4whyERaeUuVeQBi2TUBIZIfP7HEj7sfz.MxvTuOeC, password_hash_type: 7 } + - { contentobject_id: 14, email: admin@link.invalid, login: admin, password_hash: $2y$10$FDn9NPwzhq85cLLxfD5Wu.L3SL3Z/LNCvhkltJUV0wcJj7ciJg2oy, password_hash_type: 7 } ezuser_accountkey: { } ezuser_role: - { contentobject_id: 12, id: 25, limit_identifier: '', limit_value: '', role_id: 2 } diff --git a/eZ/Publish/Core/FieldType/Tests/Integration/User/UserStorage/UserStorageGatewayTest.php b/eZ/Publish/Core/FieldType/Tests/Integration/User/UserStorage/UserStorageGatewayTest.php index 10e744b989..943ea01a30 100644 --- a/eZ/Publish/Core/FieldType/Tests/Integration/User/UserStorage/UserStorageGatewayTest.php +++ b/eZ/Publish/Core/FieldType/Tests/Integration/User/UserStorage/UserStorageGatewayTest.php @@ -26,7 +26,7 @@ public function providerForGetFieldData(): array 'hasStoredLogin' => true, 'contentId' => 10, 'login' => 'anonymous', - 'email' => 'nospam@ez.no', + 'email' => 'anonymous@link.invalid', 'passwordHash' => '$2y$10$35gOSQs6JK4u4whyERaeUuVeQBi2TUBIZIfP7HEj7sfz.MxvTuOeC', 'passwordHashType' => User::PASSWORD_HASH_PHP_DEFAULT, 'enabled' => true, @@ -37,7 +37,7 @@ public function providerForGetFieldData(): array 'hasStoredLogin' => true, 'contentId' => 14, 'login' => 'admin', - 'email' => 'spam@ez.no', + 'email' => 'admin@link.invalid', 'passwordHash' => '$2y$10$FDn9NPwzhq85cLLxfD5Wu.L3SL3Z/LNCvhkltJUV0wcJj7ciJg2oy', 'passwordHashType' => User::PASSWORD_HASH_PHP_DEFAULT, 'enabled' => true, diff --git a/eZ/Publish/Core/FieldType/Tests/Integration/User/UserStorage/_fixtures/unsupported_hash.yaml b/eZ/Publish/Core/FieldType/Tests/Integration/User/UserStorage/_fixtures/unsupported_hash.yaml index b29eeea799..646c6a1082 100644 --- a/eZ/Publish/Core/FieldType/Tests/Integration/User/UserStorage/_fixtures/unsupported_hash.yaml +++ b/eZ/Publish/Core/FieldType/Tests/Integration/User/UserStorage/_fixtures/unsupported_hash.yaml @@ -1,4 +1,4 @@ ezuser: - - { contentobject_id: 10, email: nospam@ez.no, login: anonymous, password_hash: $2y$10$35gOSQs6JK4u4whyERaeUuVeQBi2TUBIZIfP7HEj7sfz.MxvTuOeC, password_hash_type: 7 } + - { contentobject_id: 10, email: anonymous@link.invalid, login: anonymous, password_hash: $2y$10$35gOSQs6JK4u4whyERaeUuVeQBi2TUBIZIfP7HEj7sfz.MxvTuOeC, password_hash_type: 7 } - { contentobject_id: 16, email: test@link.invalid, login: test, password_hash: $2y$10$35gOSQs6JK4u4whyERaeUuVeQBi2TUBIZIfP7HEj7sfz.MxvTuOeC, password_hash_type: 5 } - - { contentobject_id: 14, email: spam@ez.no, login: admin, password_hash: $2y$10$FDn9NPwzhq85cLLxfD5Wu.L3SL3Z/LNCvhkltJUV0wcJj7ciJg2oy, password_hash_type: 7 } + - { contentobject_id: 14, email: admin@link.invalid, login: admin, password_hash: $2y$10$FDn9NPwzhq85cLLxfD5Wu.L3SL3Z/LNCvhkltJUV0wcJj7ciJg2oy, password_hash_type: 7 } diff --git a/eZ/Publish/Core/Persistence/Cache/Tests/UserHandlerTest.php b/eZ/Publish/Core/Persistence/Cache/Tests/UserHandlerTest.php index b341768d7b..dfef82550c 100644 --- a/eZ/Publish/Core/Persistence/Cache/Tests/UserHandlerTest.php +++ b/eZ/Publish/Core/Persistence/Cache/Tests/UserHandlerTest.php @@ -82,8 +82,8 @@ public function providerForCachedLoadMethods(): array return [ ['load', [14], 'ez-user-14', $user], ['loadByLogin', ['admin'], 'ez-user-admin-by-login', $user], - ['loadByEmail', ['nospam@ez.no'], 'ez-user-nospam_Aez.no-by-email', $user], - ['loadUsersByEmail', ['nospam@ez.no'], 'ez-users-nospam_Aez.no-by-email', [$user]], + ['loadByEmail', ['admin@link.invalid'], 'ez-user-admin_Alink.invalid-by-email', $user], + ['loadUsersByEmail', ['admin@link.invalid'], 'ez-users-admin_Alink.invalid-by-email', [$user]], ['loadUserByToken', ['hash'], 'ez-user-hash-by-account-key', $user], ['loadRole', [9], 'ez-role-9', $role], ['loadRoleByIdentifier', ['member'], 'ez-role-member-by-identifier', $role], diff --git a/eZ/Publish/Core/Persistence/Legacy/Tests/Content/_fixtures/contentobjects.php b/eZ/Publish/Core/Persistence/Legacy/Tests/Content/_fixtures/contentobjects.php index 70e8294520..46b565592b 100644 --- a/eZ/Publish/Core/Persistence/Legacy/Tests/Content/_fixtures/contentobjects.php +++ b/eZ/Publish/Core/Persistence/Legacy/Tests/Content/_fixtures/contentobjects.php @@ -2660,7 +2660,7 @@ 'data_float' => '0', 'data_int' => null, 'data_text' => ' - + ', 'data_type_string' => 'ezauthor', 'id' => '333', @@ -2784,7 +2784,7 @@ 'data_float' => '0', 'data_int' => null, 'data_text' => ' - + ', 'data_type_string' => 'ezauthor', 'id' => '345', @@ -2908,7 +2908,7 @@ 'data_float' => '0', 'data_int' => null, 'data_text' => ' - + ', 'data_type_string' => 'ezauthor', 'id' => '357', @@ -3107,7 +3107,7 @@ 'data_float' => '0', 'data_int' => null, 'data_text' => ' - + ', 'data_type_string' => 'ezauthor', 'id' => '376', @@ -3231,7 +3231,7 @@ 'data_float' => '0', 'data_int' => null, 'data_text' => ' - + ', 'data_type_string' => 'ezauthor', 'id' => '388', @@ -3355,7 +3355,7 @@ 'data_float' => '0', 'data_int' => null, 'data_text' => ' - + ', 'data_type_string' => 'ezauthor', 'id' => '400', @@ -3674,7 +3674,7 @@ 'data_float' => '0', 'data_int' => null, 'data_text' => ' - + ', 'data_type_string' => 'ezauthor', 'id' => '433', @@ -3798,7 +3798,7 @@ 'data_float' => '0', 'data_int' => null, 'data_text' => ' - + ', 'data_type_string' => 'ezauthor', 'id' => '445', @@ -3922,7 +3922,7 @@ 'data_float' => '0', 'data_int' => null, 'data_text' => ' - + ', 'data_type_string' => 'ezauthor', 'id' => '457', @@ -4706,7 +4706,7 @@ 'data_float' => '0', 'data_int' => null, 'data_text' => ' - + ', 'data_type_string' => 'ezauthor', 'id' => '531', @@ -8614,7 +8614,7 @@ 'data_float' => '0', 'data_int' => null, 'data_text' => ' - + ', 'data_type_string' => 'ezauthor', 'id' => '893', @@ -8738,7 +8738,7 @@ 'data_float' => '0', 'data_int' => null, 'data_text' => ' - + ', 'data_type_string' => 'ezauthor', 'id' => '905', @@ -8937,7 +8937,7 @@ 'data_float' => '0', 'data_int' => null, 'data_text' => ' - + ', 'data_type_string' => 'ezauthor', 'id' => '924', @@ -9061,7 +9061,7 @@ 'data_float' => '0', 'data_int' => null, 'data_text' => ' - + ', 'data_type_string' => 'ezauthor', 'id' => '936', @@ -9185,7 +9185,7 @@ 'data_float' => '0', 'data_int' => null, 'data_text' => ' - + ', 'data_type_string' => 'ezauthor', 'id' => '948', @@ -9459,7 +9459,7 @@ 'data_float' => '0', 'data_int' => null, 'data_text' => ' - + ', 'data_type_string' => 'ezauthor', 'id' => '974', @@ -10904,7 +10904,7 @@ 'data_float' => '0', 'data_int' => null, 'data_text' => ' - + ', 'data_type_string' => 'ezauthor', 'id' => '1103', @@ -11075,7 +11075,7 @@ 'data_float' => '0', 'data_int' => null, 'data_text' => ' - + ', 'data_type_string' => 'ezauthor', 'id' => '1119', @@ -11575,7 +11575,7 @@ 'data_float' => '0', 'data_int' => null, 'data_text' => ' - + ', 'data_type_string' => 'ezauthor', 'id' => '1163', @@ -12075,7 +12075,7 @@ 'data_float' => '0', 'data_int' => null, 'data_text' => ' - + ', 'data_type_string' => 'ezauthor', 'id' => '1207', diff --git a/eZ/Publish/Core/Repository/SiteAccessAware/Tests/UserServiceTest.php b/eZ/Publish/Core/Repository/SiteAccessAware/Tests/UserServiceTest.php index 7217bc5e26..2fc7555e8c 100644 --- a/eZ/Publish/Core/Repository/SiteAccessAware/Tests/UserServiceTest.php +++ b/eZ/Publish/Core/Repository/SiteAccessAware/Tests/UserServiceTest.php @@ -94,8 +94,8 @@ public function providerForLanguagesLookupMethods() ['loadSubUserGroups', [$userGroup, 50, 50, self::LANG_ARG], [$userGroup], 3], ['loadUser', [14, self::LANG_ARG], $user, 1], ['loadUserByLogin', ['admin', self::LANG_ARG], $user, 1], - ['loadUserByEmail', ['nospam@ez.no', self::LANG_ARG], $user, 1], - ['loadUsersByEmail', ['nospam@ez.no', self::LANG_ARG], [$user], 1], + ['loadUserByEmail', ['admin@link.invalid', self::LANG_ARG], $user, 1], + ['loadUsersByEmail', ['admin@link.invalid', self::LANG_ARG], [$user], 1], ['loadUserGroupsOfUser', [$user, 50, 50, self::LANG_ARG], [$userGroup], 3], ['loadUsersOfUserGroup', [$userGroup, 50, 50, self::LANG_ARG], [$user], 3], ['loadUserByToken', ['43ir43jrt43', self::LANG_ARG], $user, 1], diff --git a/eZ/Publish/Core/Search/Legacy/Tests/_fixtures/full_dump.php b/eZ/Publish/Core/Search/Legacy/Tests/_fixtures/full_dump.php index 612f7a2de8..0899aaa795 100644 --- a/eZ/Publish/Core/Search/Legacy/Tests/_fixtures/full_dump.php +++ b/eZ/Publish/Core/Search/Legacy/Tests/_fixtures/full_dump.php @@ -10937,7 +10937,7 @@ 'data_float' => '0', 'data_int' => null, 'data_text' => ' - + ', 'data_type_string' => 'ezauthor', 'id' => '333', @@ -11061,7 +11061,7 @@ 'data_float' => '0', 'data_int' => null, 'data_text' => ' - + ', 'data_type_string' => 'ezauthor', 'id' => '345', @@ -11185,7 +11185,7 @@ 'data_float' => '0', 'data_int' => null, 'data_text' => ' - + ', 'data_type_string' => 'ezauthor', 'id' => '357', @@ -11384,7 +11384,7 @@ 'data_float' => '0', 'data_int' => null, 'data_text' => ' - + ', 'data_type_string' => 'ezauthor', 'id' => '376', @@ -11508,7 +11508,7 @@ 'data_float' => '0', 'data_int' => null, 'data_text' => ' - + ', 'data_type_string' => 'ezauthor', 'id' => '388', @@ -11632,7 +11632,7 @@ 'data_float' => '0', 'data_int' => null, 'data_text' => ' - + ', 'data_type_string' => 'ezauthor', 'id' => '400', @@ -11951,7 +11951,7 @@ 'data_float' => '0', 'data_int' => null, 'data_text' => ' - + ', 'data_type_string' => 'ezauthor', 'id' => '433', @@ -12075,7 +12075,7 @@ 'data_float' => '0', 'data_int' => null, 'data_text' => ' - + ', 'data_type_string' => 'ezauthor', 'id' => '445', @@ -12199,7 +12199,7 @@ 'data_float' => '0', 'data_int' => null, 'data_text' => ' - + ', 'data_type_string' => 'ezauthor', 'id' => '457', @@ -12983,7 +12983,7 @@ 'data_float' => '0', 'data_int' => null, 'data_text' => ' - + ', 'data_type_string' => 'ezauthor', 'id' => '531', @@ -16891,7 +16891,7 @@ 'data_float' => '0', 'data_int' => null, 'data_text' => ' - + ', 'data_type_string' => 'ezauthor', 'id' => '893', @@ -17015,7 +17015,7 @@ 'data_float' => '0', 'data_int' => null, 'data_text' => ' - + ', 'data_type_string' => 'ezauthor', 'id' => '905', @@ -17214,7 +17214,7 @@ 'data_float' => '0', 'data_int' => null, 'data_text' => ' - + ', 'data_type_string' => 'ezauthor', 'id' => '924', @@ -17338,7 +17338,7 @@ 'data_float' => '0', 'data_int' => null, 'data_text' => ' - + ', 'data_type_string' => 'ezauthor', 'id' => '936', @@ -17462,7 +17462,7 @@ 'data_float' => '0', 'data_int' => null, 'data_text' => ' - + ', 'data_type_string' => 'ezauthor', 'id' => '948', @@ -17736,7 +17736,7 @@ 'data_float' => '0', 'data_int' => null, 'data_text' => ' - + ', 'data_type_string' => 'ezauthor', 'id' => '974', @@ -19181,7 +19181,7 @@ 'data_float' => '0', 'data_int' => null, 'data_text' => ' - + ', 'data_type_string' => 'ezauthor', 'id' => '1103', @@ -19352,7 +19352,7 @@ 'data_float' => '0', 'data_int' => null, 'data_text' => ' - + ', 'data_type_string' => 'ezauthor', 'id' => '1119', @@ -19852,7 +19852,7 @@ 'data_float' => '0', 'data_int' => null, 'data_text' => ' - + ', 'data_type_string' => 'ezauthor', 'id' => '1163', @@ -20352,7 +20352,7 @@ 'data_float' => '0', 'data_int' => null, 'data_text' => ' - + ', 'data_type_string' => 'ezauthor', 'id' => '1207', @@ -37448,14 +37448,14 @@ 'ezuser' => [ 0 => [ 'contentobject_id' => '10', - 'email' => 'nospam@ez.no', + 'email' => 'anonymous@link.invalid', 'login' => 'anonymous', 'password_hash' => '$2y$10$35gOSQs6JK4u4whyERaeUuVeQBi2TUBIZIfP7HEj7sfz.MxvTuOeC', 'password_hash_type' => '7', ], 1 => [ 'contentobject_id' => '14', - 'email' => 'kn@ez.no', + 'email' => 'admin@link.invalid', 'login' => 'admin', 'password_hash' => '$2y$10$FDn9NPwzhq85cLLxfD5Wu.L3SL3Z/LNCvhkltJUV0wcJj7ciJg2oy', 'password_hash_type' => '7', diff --git a/eZ/Publish/SPI/Tests/FieldType/EmailAddressIntegrationTest.php b/eZ/Publish/SPI/Tests/FieldType/EmailAddressIntegrationTest.php index 11a929cf37..cd87bd6663 100644 --- a/eZ/Publish/SPI/Tests/FieldType/EmailAddressIntegrationTest.php +++ b/eZ/Publish/SPI/Tests/FieldType/EmailAddressIntegrationTest.php @@ -106,9 +106,9 @@ public function getInitialValue() { return new Content\FieldValue( [ - 'data' => 'nospam@ez.no', + 'data' => 'admin@link.invalid', 'externalData' => null, - 'sortKey' => 'nospam@ez.no', + 'sortKey' => 'admin@link.invalid', ] ); }