| @@ -105,6 +105,4 @@ | ||
| 105 | 105 | $this->sut->execute($responseMock); | 
| 106 | 106 | $content2 = file_get_contents($this->configUrl); | 
| 107 | 107 | |
| 108 | - $this->assertNotSame($content1, $content2); | |
| 109 | - } | |
| 110 | -} | |
| 108 | + $this->assertNotSame($content1, $content2 | |
| 111 | 109 | \ No newline at end of file | 
| @@ -12,208 +12,3 @@ | ||
| 12 | 12 | class CombinedAdapterTest extends TestCase | 
| 13 | 13 |  { | 
| 14 | 14 | protected const EXAMPLE_CONFIG = <<<'EOF' | 
| 15 | - [policy_definition] | |
| 16 | - p = sub, obj, act | |
| 17 | - | |
| 18 | - [role_definition] | |
| 19 | - g = _, _ | |
| 20 | - EOF; | |
| 21 | - | |
| 22 | - /** @var CombinedAdapter - System Under Test */ | |
| 23 | - protected CombinedAdapter $sut; | |
| 24 | - | |
| 25 | - /** @var CasbinAdapter|MockObject */ | |
| 26 | - protected $defaultAdapterMock; | |
| 27 | - | |
| 28 | - /** @var CacheManager|MockObject */ | |
| 29 | - protected $cacheManagerMock; | |
| 30 | - | |
| 31 | - public function setUp(): void | |
| 32 | -    { | |
| 33 | - $this->defaultAdapterMock = $this->createMock(CasbinAdapter::class); | |
| 34 | - | |
| 35 | - $this->cacheManagerMock = $this->createMock(CacheManager::class); | |
| 36 | - | |
| 37 | - $this->sut = new CombinedAdapter($this->defaultAdapterMock, $this->cacheManagerMock); | |
| 38 | - | |
| 39 | - parent::setUp(); | |
| 40 | - } | |
| 41 | - | |
| 42 | - public function createSutWithoutCacheManager(): void | |
| 43 | -    { | |
| 44 | - $this->cacheManagerMock = null; | |
| 45 | - | |
| 46 | - $this->sut = new CombinedAdapter($this->defaultAdapterMock); | |
| 47 | - } | |
| 48 | - | |
| 49 | - /** | |
| 50 | - * @return array | |
| 51 | - */ | |
| 52 | - public function loadPolicyWithoutCacheManagerProvider(): array | |
| 53 | -    { | |
| 54 | - $adapterMock0 = $this->createMock(CasbinAdapter::class); | |
| 55 | - $adapterMock1 = $this->createMock(CasbinAdapter::class); | |
| 56 | - $adapterMock2 = $this->createMock(CasbinAdapter::class); | |
| 57 | - | |
| 58 | - return [ | |
| 59 | - 'no-adapters' => [[]], | |
| 60 | - 'one-adapter' => [[$adapterMock0]], | |
| 61 | - 'two-adapters' => [[$adapterMock1, $adapterMock2]], | |
| 62 | - ]; | |
| 63 | - } | |
| 64 | - | |
| 65 | - /** | |
| 66 | - * @dataProvider loadPolicyWithoutCacheManagerProvider | |
| 67 | - * | |
| 68 | - * @param array $adaptersMocks | |
| 69 | - */ | |
| 70 | - public function testLoadPolicyCallsAdaptersByDefault(array $adaptersMocks): void | |
| 71 | -    { | |
| 72 | - $this->createSutWithoutCacheManager(); | |
| 73 | - | |
| 74 | - $model = new CasbinModel(); | |
| 75 | - | |
| 76 | -        $this->defaultAdapterMock->expects($this->once())->method('loadPolicy')->with($model); | |
| 77 | - | |
| 78 | -        foreach ($adaptersMocks as $adapter) { | |
| 79 | -            $adapter->expects($this->once())->method('loadPolicy')->with($model); | |
| 80 | - $this->sut->registerAdapter($adapter); | |
| 81 | - } | |
| 82 | - | |
| 83 | - $this->sut->loadPolicy($model); | |
| 84 | - } | |
| 85 | - | |
| 86 | - public function testLoadPolicyCanLoadPoliciesFromCache(): void | |
| 87 | -    { | |
| 88 | - $cacheData = ['g' => [], 'p' => []]; | |
| 89 | - | |
| 90 | - $model = new CasbinModel(); | |
| 91 | - | |
| 92 | -        $this->cacheManagerMock->expects($this->once())->method('getAll')->willReturn($cacheData); | |
| 93 | - | |
| 94 | -        $this->defaultAdapterMock->expects($this->never())->method('loadPolicy'); | |
| 95 | - | |
| 96 | - $this->sut->loadPolicy($model); | |
| 97 | - } | |
| 98 | - | |
| 99 | - public function testLoadPolicyCanPopulatePoliciesFromCache(): void | |
| 100 | -    { | |
| 101 | - $cachedData = [ | |
| 102 | - 'g' => [ | |
| 103 | - ['joe', 'admin', '', '', ','], | |
| 104 | - ['jane', 'user', '', '', ','], | |
| 105 | - ], | |
| 106 | - 'p' => [ | |
| 107 | - ['user', 'admin_resource_users', 'read', '', ','], | |
| 108 | - ['admin', 'admin_resource_users', 'write', '', ','], | |
| 109 | - ], | |
| 110 | - ]; | |
| 111 | - | |
| 112 | - $model = new CasbinModel(); | |
| 113 | - $model->loadModelFromText(static::EXAMPLE_CONFIG); | |
| 114 | - | |
| 115 | -        $this->cacheManagerMock->expects($this->once())->method('getAll')->willReturn($cachedData); | |
| 116 | - | |
| 117 | -        $this->defaultAdapterMock->expects($this->never())->method('loadPolicy'); | |
| 118 | - | |
| 119 | - $this->sut->loadPolicy($model); | |
| 120 | - } | |
| 121 | - | |
| 122 | - public function testLoadPolicyCanStorePoliciesInCache(): void | |
| 123 | -    { | |
| 124 | - $cachedData = [ | |
| 125 | - 'g' => [ | |
| 126 | - ['joe', 'admin', '', '', ','], | |
| 127 | - ['jane', 'user', '', '', ','], | |
| 128 | - ], | |
| 129 | - 'p' => [ | |
| 130 | - ['user', 'admin_resource_users', 'read', '', ','], | |
| 131 | - ['admin', 'admin_resource_users', 'write', '', ','], | |
| 132 | - ], | |
| 133 | - ]; | |
| 134 | - | |
| 135 | - $model = new CasbinModel(); | |
| 136 | - $model->loadModelFromText(static::EXAMPLE_CONFIG); | |
| 137 | - | |
| 138 | -        $model->addPolicies('g', 'g', $cachedData['g']); | |
| 139 | -        $model->addPolicies('p', 'p', $cachedData['p']); | |
| 140 | - | |
| 141 | -        $this->cacheManagerMock->expects($this->once())->method('getAll')->willReturn([]); | |
| 142 | - | |
| 143 | -        $this->defaultAdapterMock->expects($this->once())->method('loadPolicy')->with($model); | |
| 144 | - | |
| 145 | -        $this->cacheManagerMock->expects($this->once())->method('storeAll')->willReturn(true); | |
| 146 | - | |
| 147 | - $this->sut->loadPolicy($model); | |
| 148 | - } | |
| 149 | - | |
| 150 | - public function testSavePolicyCallsDefaultAdapter(): void | |
| 151 | -    { | |
| 152 | - $model = new CasbinModel(); | |
| 153 | - | |
| 154 | - $this->defaultAdapterMock | |
| 155 | - ->expects($this->once()) | |
| 156 | -            ->method('savePolicy') | |
| 157 | - ->with($model); | |
| 158 | - | |
| 159 | - $this->sut->savePolicy($model); | |
| 160 | - } | |
| 161 | - | |
| 162 | - public function testAddPolicyCallsDefaultAdapter(): void | |
| 163 | -    { | |
| 164 | - $sec = 'foo'; | |
| 165 | - $ptype = 'bar'; | |
| 166 | - $rule = 'baz'; | |
| 167 | - | |
| 168 | - $this->defaultAdapterMock | |
| 169 | - ->expects($this->once()) | |
| 170 | -            ->method('addPolicy') | |
| 171 | - ->with($sec, $ptype, [$rule]); | |
| 172 | - | |
| 173 | - $this->sut->addPolicy($sec, $ptype, [$rule]); | |
| 174 | - } | |
| 175 | - | |
| 176 | - public function testRemovePolicyCallsDefaultAdapter(): void | |
| 177 | -    { | |
| 178 | - $sec = 'foo'; | |
| 179 | - $ptype = 'bar'; | |
| 180 | - $rule = 'baz'; | |
| 181 | - | |
| 182 | - $this->defaultAdapterMock | |
| 183 | - ->expects($this->once()) | |
| 184 | -            ->method('removePolicy') | |
| 185 | - ->with($sec, $ptype, [$rule]); | |
| 186 | - | |
| 187 | - $this->sut->removePolicy($sec, $ptype, [$rule]); | |
| 188 | - } | |
| 189 | - | |
| 190 | - public function testRemoveFilteredPolicyWithoutFieldValuesCallsDefaultAdapter(): void | |
| 191 | -    { | |
| 192 | - $sec = 'foo'; | |
| 193 | - $ptype = 'bar'; | |
| 194 | - $fieldIndex = 0; | |
| 195 | - | |
| 196 | - $this->defaultAdapterMock | |
| 197 | - ->expects($this->once()) | |
| 198 | -            ->method('removeFilteredPolicy') | |
| 199 | - ->with($sec, $ptype, $fieldIndex); | |
| 200 | - | |
| 201 | - $this->sut->removeFilteredPolicy($sec, $ptype, $fieldIndex); | |
| 202 | - } | |
| 203 | - | |
| 204 | - public function testRemoveFilteredPolicyWithFieldValuesCallsDefaultAdapter(): void | |
| 205 | -    { | |
| 206 | - $sec = 'foo'; | |
| 207 | - $ptype = 'bar'; | |
| 208 | - $fieldIndex = 0; | |
| 209 | - $fieldValue0 = 'quix'; | |
| 210 | - $fieldValue1 = 'tata'; | |
| 211 | - | |
| 212 | - $this->defaultAdapterMock | |
| 213 | - ->expects($this->once()) | |
| 214 | -            ->method('removeFilteredPolicy') | |
| 215 | - ->with($sec, $ptype, $fieldIndex, $fieldValue0, $fieldValue1); | |
| 216 | - | |
| 217 | - $this->sut->removeFilteredPolicy($sec, $ptype, $fieldIndex, $fieldValue0, $fieldValue1); | |
| 218 | - } | |
| 219 | -} | |
| @@ -41,173 +41,3 @@ | ||
| 41 | 41 | * %2$s - nodes (filters) | 
| 42 | 42 | */ | 
| 43 | 43 | protected const DEFAULT_TEMPLATE = <<<'EOT' | 
| 44 | - <div class="hidable"> | |
| 45 | - <p class="hider">%1$s</p> | |
| 46 | - <div class="hidee">%2$s</div> | |
| 47 | - </div> | |
| 48 | - EOT; | |
| 49 | - | |
| 50 | - protected string $template = self::DEFAULT_TEMPLATE; | |
| 51 | - | |
| 52 | - /** @var IFilter[] */ | |
| 53 | - protected array $content = []; | |
| 54 | - | |
| 55 | - protected string $nodeClass = IFilter::class; | |
| 56 | - | |
| 57 | - protected Action $hiderBtn; | |
| 58 | - protected Action $filterBtn; | |
| 59 | - protected Action $resetBtn; | |
| 60 | - | |
| 61 | - /** @var array<string,Attribute> */ | |
| 62 | - protected array $formAttributes; | |
| 63 | - | |
| 64 | - /** @var array<string,Attribute> */ | |
| 65 | - protected array $searchAttributes; | |
| 66 | - | |
| 67 | - /** @var array<string,Attribute> */ | |
| 68 | - protected array $resetAttributes; | |
| 69 | - | |
| 70 | - /** | |
| 71 | - * Filters constructor. | |
| 72 | - * | |
| 73 | - * @param string[] $intents | |
| 74 | - * @param array<string,Attribute>|null $attributes | |
| 75 | - * @param string|null $tag | |
| 76 | - */ | |
| 77 | - public function __construct(array $intents = [], ?array $attributes = null, ?string $tag = null) | |
| 78 | -    { | |
| 79 | - parent::__construct(null, $intents, $attributes, $tag); | |
| 80 | - | |
| 81 | - $this->formAttributes = Attributes::fromArray(static::ATTRIBUTES_FORM); | |
| 82 | - $this->searchAttributes = Attributes::fromArray(static::ATTRIBUTES_SEARCH); | |
| 83 | - $this->resetAttributes = Attributes::fromArray(static::ATTRIBUTES_RESET); | |
| 84 | - | |
| 85 | - $this->hiderBtn = new Action(static::BTN_CONTENT_FILTERS, [Action::INTENT_INFO]); | |
| 86 | - $this->filterBtn = new Action(static::BTN_CONTENT_FILTER, [Action::INTENT_PRIMARY], $this->searchAttributes); | |
| 87 | - $this->resetBtn = new Action(static::BTN_CONTENT_RESET, [Action::INTENT_SECONDARY], $this->resetAttributes); | |
| 88 | - } | |
| 89 | - | |
| 90 | - /** | |
| 91 | - * @param array $params | |
| 92 | - * | |
| 93 | - * @return $this | |
| 94 | - */ | |
| 95 | - public function setParams(array $params): Filters | |
| 96 | -    { | |
| 97 | -        foreach ($this->content as $filter) { | |
| 98 | - $filter->setParams($params); | |
| 99 | - } | |
| 100 | - | |
| 101 | - return $this; | |
| 102 | - } | |
| 103 | - | |
| 104 | - /** | |
| 105 | - * @param string $baseUrl | |
| 106 | - * | |
| 107 | - * @return string | |
| 108 | - */ | |
| 109 | - public function getUrl(string $baseUrl): string | |
| 110 | -    { | |
| 111 | - $queryParts = []; | |
| 112 | -        foreach ($this->content as $filter) { | |
| 113 | - $queryPart = $filter->getQueryPart(); | |
| 114 | -            if (!$queryPart) { | |
| 115 | - continue; | |
| 116 | - } | |
| 117 | - | |
| 118 | - $queryParts[] = $queryPart; | |
| 119 | - } | |
| 120 | - | |
| 121 | -        if (empty($queryParts)) { | |
| 122 | - return $baseUrl; | |
| 123 | - } | |
| 124 | - | |
| 125 | -        return sprintf('%s%s&', $baseUrl, implode('&', $queryParts)); | |
| 126 | - } | |
| 127 | - | |
| 128 | - /** | |
| 129 | - * @return array | |
| 130 | - */ | |
| 131 | - public function getWhereConditions(): array | |
| 132 | -    { | |
| 133 | - $conditions = []; | |
| 134 | -        foreach ($this->content as $filter) { | |
| 135 | - $conditions = array_merge($conditions, $filter->getWhereConditions()); | |
| 136 | - } | |
| 137 | - | |
| 138 | - return $conditions; | |
| 139 | - } | |
| 140 | - | |
| 141 | - /** | |
| 142 | - * @return array<string,string> | |
| 143 | - */ | |
| 144 | - public function getSqlParams(): array | |
| 145 | -    { | |
| 146 | - $params = []; | |
| 147 | -        foreach ($this->content as $filter) { | |
| 148 | - $params = array_merge($params, $filter->getQueryParams()); | |
| 149 | - } | |
| 150 | - | |
| 151 | - return $params; | |
| 152 | - } | |
| 153 | - | |
| 154 | - /** | |
| 155 | - * @return INode[] | |
| 156 | - */ | |
| 157 | - public function getExtendedNodes(): array | |
| 158 | -    { | |
| 159 | - return array_merge([$this->hiderBtn, $this->filterBtn, $this->resetBtn], $this->getNodes()); | |
| 160 | - } | |
| 161 | - | |
| 162 | - /** | |
| 163 | - * @param string $template | |
| 164 | - * | |
| 165 | - * @return INode | |
| 166 | - */ | |
| 167 | - public function setTemplate(string $template): INode | |
| 168 | -    { | |
| 169 | - $this->template = $template; | |
| 170 | - | |
| 171 | - return $this; | |
| 172 | - } | |
| 173 | - | |
| 174 | - /** | |
| 175 | - * @return string | |
| 176 | - */ | |
| 177 | - public function __toString(): string | |
| 178 | -    { | |
| 179 | - $nodes = Tag::__toString(); | |
| 180 | - | |
| 181 | - $form = TagHelper::toString($this->tag, $nodes, $this->formAttributes); | |
| 182 | - | |
| 183 | - return sprintf( | |
| 184 | - $this->template, | |
| 185 | - (string)$this->hiderBtn, | |
| 186 | - $form | |
| 187 | - ); | |
| 188 | - } | |
| 189 | - | |
| 190 | - /** | |
| 191 | - * @return Action | |
| 192 | - */ | |
| 193 | - public function getHiderBtn(): Action | |
| 194 | -    { | |
| 195 | - return $this->hiderBtn; | |
| 196 | - } | |
| 197 | - | |
| 198 | - /** | |
| 199 | - * @return Action | |
| 200 | - */ | |
| 201 | - public function getFilterBtn(): Action | |
| 202 | -    { | |
| 203 | - return $this->filterBtn; | |
| 204 | - } | |
| 205 | - | |
| 206 | - /** | |
| 207 | - * @return Action | |
| 208 | - */ | |
| 209 | - public function getResetBtn(): Action | |
| 210 | -    { | |
| 211 | - return $this->resetBtn; | |
| 212 | - } | |
| 213 | -} | |
| @@ -185,6 +185,4 @@ | ||
| 185 | 185 | */ | 
| 186 | 186 | public function getHeaders(): array | 
| 187 | 187 |      { | 
| 188 | - return $this->headers; | |
| 189 | - } | |
| 190 | -} | |
| 188 | + return $this->headers | |
| 191 | 189 | \ No newline at end of file |