Merge pull request #13067 from annando/issue-13052

Issue 13052: The limit parameter now behaves like the Mastodon counterpart

diff --git a/tests/src/Util/ACLFormaterTest.php b/tests/src/Util/ACLFormaterTest.php
deleted file mode 100644 (file)
index afbf435..0000000
--- a/tests/src/Util/ACLFormaterTest.php
+++ /dev/null
@@ -1,192 +0,0 @@
-<?php
-/**
- * @copyright Copyright (C) 2010-2023, the Friendica project
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-
-namespace Friendica\Test\src\Util;
-
-use Friendica\Model\Group;
-use Friendica\Util\ACLFormatter;
-use PHPUnit\Framework\TestCase;
-
-/**
- * ACLFormatter utility testing class
- */
-class ACLFormatterTest extends TestCase
-{
-       public function assertAcl($text, array $assert = [])
-       {
-               $aclFormatter = new ACLFormatter();
-
-               $acl = $aclFormatter->expand($text);
-
-               self::assertEquals($assert, $acl);
-
-               self::assertMergeable($acl);
-       }
-
-       public function assertMergeable(array $aclOne, array $aclTwo = [])
-       {
-               self::assertTrue(is_array($aclOne));
-               self::assertTrue(is_array($aclTwo));
-
-               $aclMerged = array_unique(array_merge($aclOne, $aclTwo));
-               self::assertTrue(is_array($aclMerged));
-
-               return $aclMerged;
-       }
-
-       public function dataExpand()
-       {
-               return [
-                       'normal' => [
-                               'input' => '<1><2><3><' . Group::FOLLOWERS . '><' . Group::MUTUALS . '>',
-                               'assert' => ['1', '2', '3', Group::FOLLOWERS, Group::MUTUALS],
-                       ],
-                       'nigNumber' => [
-                               'input' => '<1><' . PHP_INT_MAX . '><15>',
-                               'assert' => ['1', (string)PHP_INT_MAX, '15'],
-                       ],
-                       'string' => [
-                               'input' => '<1><279012><tt>',
-                               'assert' => ['1', '279012'],
-                       ],
-                       'space' => [
-                               'input' => '<1><279 012><32>',
-                               'assert' => ['1', '32'],
-                       ],
-                       'empty' => [
-                               'input' => '',
-                               'assert' => [],
-                       ],
-                       /// @todo should there be an exception?
-                       'noBrackets' => [
-                               'input' => 'According to documentation, that\'s invalid. ', //should be invalid
-                               'assert' => [],
-                       ],
-                       /// @todo should there be an exception?
-                       'justOneBracket' => [
-                               'input' => '<Another invalid string', //should be invalid
-                               'assert' => [],
-                       ],
-                       /// @todo should there be an exception?
-                       'justOneBracket2' => [
-                               'input' => 'Another invalid> string', //should be invalid
-                               'assert' => [],
-                       ],
-                       /// @todo should there be an exception?
-                       'closeOnly' => [
-                               'input' => 'Another> invalid> string>', //should be invalid
-                               'assert' => [],
-                       ],
-                       /// @todo should there be an exception?
-                       'openOnly' => [
-                               'input' => '<Another< invalid string<', //should be invalid
-                               'assert' => [],
-                       ],
-                       /// @todo should there be an exception?
-                       'noMatching1' => [
-                               'input' => '<Another<> invalid <string>', //should be invalid
-                               'assert' => [],
-                       ],
-                       'emptyMatch' => [
-                               'input' => '<1><><3>',
-                               'assert' => ['1', '3'],
-                       ],
-               ];
-       }
-
-       /**
-        * @dataProvider dataExpand
-        */
-       public function testExpand($input, array $assert)
-       {
-               self::assertAcl($input, $assert);
-       }
-
-       /**
-        * Test nullable expand (=> no ACL set)
-        */
-       public function testExpandNull()
-       {
-               $aclFormatter = new ACLFormatter();
-
-               $allow_people = $aclFormatter->expand();
-               $allow_groups = $aclFormatter->expand();
-
-               self::assertEmpty($aclFormatter->expand(null));
-               self::assertEmpty($aclFormatter->expand());
-
-               $recipients   = array_unique(array_merge($allow_people, $allow_groups));
-               self::assertEmpty($recipients);
-       }
-
-       public function dataAclToString()
-       {
-               return [
-                       'empty'   => [
-                               'input'  => '',
-                               'assert' => '',
-                       ],
-                       'string'  => [
-                               'input'  => '1,2,3,4',
-                               'assert' => '<1><2><3><4>',
-                       ],
-                       'array'   => [
-                               'input'  => [1, 2, 3, 4],
-                               'assert' => '<1><2><3><4>',
-                       ],
-                       'invalid' => [
-                               'input'  => [1, 'a', 3, 4],
-                               'assert' => '<1><3><4>',
-                       ],
-                       'invalidString' => [
-                               'input'  => 'a,bsd23,4',
-                               'assert' => '<4>',
-                       ],
-                       /** @see https://github.com/friendica/friendica/pull/7787 */
-                       'bug-7778-angle-brackets' => [
-                               'input' => ["<40195>"],
-                               'assert' => "<40195>",
-                       ],
-                       Group::FOLLOWERS => [
-                               'input' => [Group::FOLLOWERS, 1],
-                               'assert' => '<' . Group::FOLLOWERS . '><1>',
-                       ],
-                       Group::MUTUALS => [
-                               'input' => [Group::MUTUALS, 1],
-                               'assert' => '<' . Group::MUTUALS . '><1>',
-                       ],
-                       'wrong-angle-brackets' => [
-                               'input' => ["<asd>","<123>"],
-                               'assert' => "<123>",
-                       ],
-               ];
-       }
-
-       /**
-        * @dataProvider dataAclToString
-        */
-       public function testAclToString($input, string $assert)
-       {
-               $aclFormatter = new ACLFormatter();
-
-               self::assertEquals($assert, $aclFormatter->toString($input));
-       }
-}

diff --git a/tests/src/Util/ACLFormatterTest.php b/tests/src/Util/ACLFormatterTest.php
new file mode 100644 (file)
index 0000000..afbf435
--- /dev/null
+++ b/tests/src/Util/ACLFormatterTest.php
@@ -0,0 +1,192 @@
+<?php
+/**
+ * @copyright Copyright (C) 2010-2023, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace Friendica\Test\src\Util;
+
+use Friendica\Model\Group;
+use Friendica\Util\ACLFormatter;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * ACLFormatter utility testing class
+ */
+class ACLFormatterTest extends TestCase
+{
+       public function assertAcl($text, array $assert = [])
+       {
+               $aclFormatter = new ACLFormatter();
+
+               $acl = $aclFormatter->expand($text);
+
+               self::assertEquals($assert, $acl);
+
+               self::assertMergeable($acl);
+       }
+
+       public function assertMergeable(array $aclOne, array $aclTwo = [])
+       {
+               self::assertTrue(is_array($aclOne));
+               self::assertTrue(is_array($aclTwo));
+
+               $aclMerged = array_unique(array_merge($aclOne, $aclTwo));
+               self::assertTrue(is_array($aclMerged));
+
+               return $aclMerged;
+       }
+
+       public function dataExpand()
+       {
+               return [
+                       'normal' => [
+                               'input' => '<1><2><3><' . Group::FOLLOWERS . '><' . Group::MUTUALS . '>',
+                               'assert' => ['1', '2', '3', Group::FOLLOWERS, Group::MUTUALS],
+                       ],
+                       'nigNumber' => [
+                               'input' => '<1><' . PHP_INT_MAX . '><15>',
+                               'assert' => ['1', (string)PHP_INT_MAX, '15'],
+                       ],
+                       'string' => [
+                               'input' => '<1><279012><tt>',
+                               'assert' => ['1', '279012'],
+                       ],
+                       'space' => [
+                               'input' => '<1><279 012><32>',
+                               'assert' => ['1', '32'],
+                       ],
+                       'empty' => [
+                               'input' => '',
+                               'assert' => [],
+                       ],
+                       /// @todo should there be an exception?
+                       'noBrackets' => [
+                               'input' => 'According to documentation, that\'s invalid. ', //should be invalid
+                               'assert' => [],
+                       ],
+                       /// @todo should there be an exception?
+                       'justOneBracket' => [
+                               'input' => '<Another invalid string', //should be invalid
+                               'assert' => [],
+                       ],
+                       /// @todo should there be an exception?
+                       'justOneBracket2' => [
+                               'input' => 'Another invalid> string', //should be invalid
+                               'assert' => [],
+                       ],
+                       /// @todo should there be an exception?
+                       'closeOnly' => [
+                               'input' => 'Another> invalid> string>', //should be invalid
+                               'assert' => [],
+                       ],
+                       /// @todo should there be an exception?
+                       'openOnly' => [
+                               'input' => '<Another< invalid string<', //should be invalid
+                               'assert' => [],
+                       ],
+                       /// @todo should there be an exception?
+                       'noMatching1' => [
+                               'input' => '<Another<> invalid <string>', //should be invalid
+                               'assert' => [],
+                       ],
+                       'emptyMatch' => [
+                               'input' => '<1><><3>',
+                               'assert' => ['1', '3'],
+                       ],
+               ];
+       }
+
+       /**
+        * @dataProvider dataExpand
+        */
+       public function testExpand($input, array $assert)
+       {
+               self::assertAcl($input, $assert);
+       }
+
+       /**
+        * Test nullable expand (=> no ACL set)
+        */
+       public function testExpandNull()
+       {
+               $aclFormatter = new ACLFormatter();
+
+               $allow_people = $aclFormatter->expand();
+               $allow_groups = $aclFormatter->expand();
+
+               self::assertEmpty($aclFormatter->expand(null));
+               self::assertEmpty($aclFormatter->expand());
+
+               $recipients   = array_unique(array_merge($allow_people, $allow_groups));
+               self::assertEmpty($recipients);
+       }
+
+       public function dataAclToString()
+       {
+               return [
+                       'empty'   => [
+                               'input'  => '',
+                               'assert' => '',
+                       ],
+                       'string'  => [
+                               'input'  => '1,2,3,4',
+                               'assert' => '<1><2><3><4>',
+                       ],
+                       'array'   => [
+                               'input'  => [1, 2, 3, 4],
+                               'assert' => '<1><2><3><4>',
+                       ],
+                       'invalid' => [
+                               'input'  => [1, 'a', 3, 4],
+                               'assert' => '<1><3><4>',
+                       ],
+                       'invalidString' => [
+                               'input'  => 'a,bsd23,4',
+                               'assert' => '<4>',
+                       ],
+                       /** @see https://github.com/friendica/friendica/pull/7787 */
+                       'bug-7778-angle-brackets' => [
+                               'input' => ["<40195>"],
+                               'assert' => "<40195>",
+                       ],
+                       Group::FOLLOWERS => [
+                               'input' => [Group::FOLLOWERS, 1],
+                               'assert' => '<' . Group::FOLLOWERS . '><1>',
+                       ],
+                       Group::MUTUALS => [
+                               'input' => [Group::MUTUALS, 1],
+                               'assert' => '<' . Group::MUTUALS . '><1>',
+                       ],
+                       'wrong-angle-brackets' => [
+                               'input' => ["<asd>","<123>"],
+                               'assert' => "<123>",
+                       ],
+               ];
+       }
+
+       /**
+        * @dataProvider dataAclToString
+        */
+       public function testAclToString($input, string $assert)
+       {
+               $aclFormatter = new ACLFormatter();
+
+               self::assertEquals($assert, $aclFormatter->toString($input));
+       }
+}