diff --git a/CHANGELOG.md b/CHANGELOG.md index a0cc7d54..4a85a0f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -56,6 +56,7 @@ - Bug #237: Handle not found base item in access tree (@arogachev) - Enh #245: Handle same names during renaming item in `AssignmentsStorage` (@arogachev) - Chg #208: Rename `getAccessTree()` to `getHierarchy()` in `ItemsStorageInterface` (@arogachev) +- Enh #248: Add `SimpleRuleFactory` (@arogachev) ## 1.0.2 April 20, 2023 diff --git a/tests/Support/SimpleRuleFactory.php b/src/SimpleRuleFactory.php similarity index 83% rename from tests/Support/SimpleRuleFactory.php rename to src/SimpleRuleFactory.php index 4e1751e3..2af133c0 100644 --- a/tests/Support/SimpleRuleFactory.php +++ b/src/SimpleRuleFactory.php @@ -2,11 +2,9 @@ declare(strict_types=1); -namespace Yiisoft\Rbac\Tests\Support; +namespace Yiisoft\Rbac; use Yiisoft\Rbac\Exception\RuleNotFoundException; -use Yiisoft\Rbac\RuleFactoryInterface; -use Yiisoft\Rbac\RuleInterface; use function array_key_exists; diff --git a/tests/Common/ManagerConfigurationTestTrait.php b/tests/Common/ManagerConfigurationTestTrait.php index 5e47809e..5d853f36 100644 --- a/tests/Common/ManagerConfigurationTestTrait.php +++ b/tests/Common/ManagerConfigurationTestTrait.php @@ -11,11 +11,11 @@ use Yiisoft\Rbac\Permission; use Yiisoft\Rbac\Role; use Yiisoft\Rbac\RuleFactoryInterface; +use Yiisoft\Rbac\SimpleRuleFactory; use Yiisoft\Rbac\Tests\Support\AuthorRule; use Yiisoft\Rbac\Tests\Support\EasyRule; use Yiisoft\Rbac\Tests\Support\FakeAssignmentsStorage; use Yiisoft\Rbac\Tests\Support\FakeItemsStorage; -use Yiisoft\Rbac\Tests\Support\SimpleRuleFactory; trait ManagerConfigurationTestTrait { diff --git a/tests/Common/ManagerLogicTestTrait.php b/tests/Common/ManagerLogicTestTrait.php index bb473897..b23fc47e 100644 --- a/tests/Common/ManagerLogicTestTrait.php +++ b/tests/Common/ManagerLogicTestTrait.php @@ -15,14 +15,14 @@ use Yiisoft\Rbac\Exception\RuleNotFoundException; use Yiisoft\Rbac\Permission; use Yiisoft\Rbac\Role; +use Yiisoft\Rbac\SimpleRuleFactory; use Yiisoft\Rbac\Tests\Support\AdsRule; -use Yiisoft\Rbac\Tests\Support\GuestRule; use Yiisoft\Rbac\Tests\Support\AuthorRule; use Yiisoft\Rbac\Tests\Support\BanRule; use Yiisoft\Rbac\Tests\Support\EasyRule; use Yiisoft\Rbac\Tests\Support\FakeAssignmentsStorage; use Yiisoft\Rbac\Tests\Support\FakeItemsStorage; -use Yiisoft\Rbac\Tests\Support\SimpleRuleFactory; +use Yiisoft\Rbac\Tests\Support\GuestRule; use Yiisoft\Rbac\Tests\Support\SubscriptionRule; trait ManagerLogicTestTrait diff --git a/tests/CompositeRuleTest.php b/tests/CompositeRuleTest.php index 1f251f78..33421515 100644 --- a/tests/CompositeRuleTest.php +++ b/tests/CompositeRuleTest.php @@ -9,8 +9,8 @@ use Yiisoft\Rbac\CompositeRule; use Yiisoft\Rbac\Permission; use Yiisoft\Rbac\RuleContext; +use Yiisoft\Rbac\SimpleRuleFactory; use Yiisoft\Rbac\Tests\Support\EasyRule; -use Yiisoft\Rbac\Tests\Support\SimpleRuleFactory; final class CompositeRuleTest extends TestCase { diff --git a/tests/ConfigTest.php b/tests/ConfigTest.php index b05a9979..f79912c4 100644 --- a/tests/ConfigTest.php +++ b/tests/ConfigTest.php @@ -13,9 +13,9 @@ use Yiisoft\Rbac\Manager; use Yiisoft\Rbac\ManagerInterface; use Yiisoft\Rbac\RuleFactoryInterface; +use Yiisoft\Rbac\SimpleRuleFactory; use Yiisoft\Rbac\Tests\Support\FakeAssignmentsStorage; use Yiisoft\Rbac\Tests\Support\FakeItemsStorage; -use Yiisoft\Rbac\Tests\Support\SimpleRuleFactory; final class ConfigTest extends TestCase { diff --git a/tests/RuleContextTest.php b/tests/RuleContextTest.php index 1399f844..c27ea187 100644 --- a/tests/RuleContextTest.php +++ b/tests/RuleContextTest.php @@ -6,8 +6,8 @@ use PHPUnit\Framework\TestCase; use Yiisoft\Rbac\RuleContext; +use Yiisoft\Rbac\SimpleRuleFactory; use Yiisoft\Rbac\Tests\Support\EasyRule; -use Yiisoft\Rbac\Tests\Support\SimpleRuleFactory; final class RuleContextTest extends TestCase {