EspoCRM – Open Source CRM Application
PHP calendarcontactscrmcrm-platformcrm-systemcustomer-portalcustomer-supportcustomizabledocumentsemail-marketingkanbanleadsopen-sourcephpplatformsales-automationsingle-page-applicationsupport
select applier factory ref
Yuri Kuznetsovc39052a0d3c3
diff --git a/application/Espo/Core/Select/AccessControl/FilterFactory.php b/application/Espo/Core/Select/AccessControl/FilterFactory.phpindex cba908e764..0d7edccafc 100644--- a/application/Espo/Core/Select/AccessControl/FilterFactory.php+++ b/application/Espo/Core/Select/AccessControl/FilterFactory.php@@ -37,9 +37,7 @@ use Espo\Core\Binding\BindingData;use Espo\Core\InjectableFactory;use Espo\Core\Select\Helpers\FieldHelper;use Espo\Core\Utils\Metadata;-use Espo\Entities\User;-use RuntimeException;class FilterFactory@@ -47,7 +45,8 @@ class FilterFactorypublic function __construct(private InjectableFactory $injectableFactory,private Metadata $metadata,- private AclManager $aclManager+ private AclManager $aclManager,+ private Acl $acl,) {}public function create(string $entityType, User $user, string $name): Filter@@ -55,18 +54,22 @@ class FilterFactory$className = $this->getClassName($entityType, $name);if (!$className) {- throw new RuntimeException("Access control filter '{$name}' for '{$entityType}' does not exist.");+ throw new RuntimeException("Access control filter '$name' for '$entityType' does not exist.");}$bindingData = new BindingData();$binder = new Binder($bindingData);+$binder->bindInstance(User::class, $user)- ->bindInstance(Acl::class, $this->aclManager->createUserAcl($user));+ ->bindInstance(AclManager::class, $this->aclManager)+ ->bindInstance(Acl::class, $this->acl);+$binder->for($className)->bindValue('$entityType', $entityType);+$binder->for(FieldHelper::class)->bindValue('$entityType', $entityType);diff --git a/application/Espo/Core/Select/AccessControl/FilterResolverFactory.php b/application/Espo/Core/Select/AccessControl/FilterResolverFactory.phpindex 5d11480714..13252014f6 100644--- a/application/Espo/Core/Select/AccessControl/FilterResolverFactory.php+++ b/application/Espo/Core/Select/AccessControl/FilterResolverFactory.php@@ -29,11 +29,11 @@namespace Espo\Core\Select\AccessControl;+use Espo\Core\AclManager;use Espo\Core\InjectableFactory;use Espo\Core\Acl;use Espo\Core\Portal\Acl as PortalAcl;use Espo\Core\Utils\Metadata;-use Espo\Core\Utils\Acl\UserAclManagerProvider;use Espo\Core\Binding\BindingContainer;use Espo\Core\Binding\Binder;use Espo\Core\Binding\BindingData;@@ -44,7 +44,8 @@ class FilterResolverFactorypublic function __construct(private InjectableFactory $injectableFactory,private Metadata $metadata,- private UserAclManagerProvider $userAclManagerProvider+ private AclManager $aclManager,+ private Acl $acl,) {}public function create(string $entityType, User $user): FilterResolver@@ -53,19 +54,17 @@ class FilterResolverFactory$this->getClassName($entityType) :$this->getPortalClassName($entityType);- $acl = $this->userAclManagerProvider- ->get($user)- ->createUserAcl($user);-$bindingData = new BindingData();$binder = new Binder($bindingData);+$binder->bindInstance(User::class, $user)- ->bindInstance(Acl::class, $acl);+ ->bindInstance(AclManager::class, $this->aclManager)+ ->bindInstance(Acl::class, $this->acl);if ($user->isPortal()) {- $binder->bindInstance(PortalAcl::class, $acl);+ $binder->bindInstance(PortalAcl::class, $this->acl);}$binderdiff --git a/application/Espo/Core/Select/Applier/Factory.php b/application/Espo/Core/Select/Applier/Factory.phpindex 513ffdb4f4..2a23455801 100644--- a/application/Espo/Core/Select/Applier/Factory.php+++ b/application/Espo/Core/Select/Applier/Factory.php@@ -29,6 +29,7 @@namespace Espo\Core\Select\Applier;+use Espo\Core\Acl;use Espo\Core\AclManager;use Espo\Core\Select\Text\Applier as TextFilterApplier;use Espo\Core\Select\AccessControl\Applier as AccessControlFilterApplier;@@ -80,7 +81,7 @@ class Factorypublic function __construct(private InjectableFactory $injectableFactory,private UserAclManagerProvider $userAclManagerProvider,- private SelectManagerFactory $selectManagerFactory+ private SelectManagerFactory $selectManagerFactory,) {}private function create(string $entityType, User $user, string $type): object@@ -91,14 +92,19 @@ class Factory$selectManager = $this->selectManagerFactory->create($entityType, $user);$aclManager = $this->userAclManagerProvider->get($user);+ $acl = $aclManager->createUserAcl($user);$bindingData = new BindingData();$binder = new Binder($bindingData);+$binder->bindInstance(User::class, $user)->bindInstance(AclManager::class, $aclManager)- ->bindInstance(SelectManager::class, $selectManager)+ ->bindInstance(Acl::class, $acl)+ ->bindInstance(SelectManager::class, $selectManager);++ $binder->for($className)->bindValue('$entityType', $entityType)->bindValue('$selectManager', $selectManager);diff --git a/tests/unit/Espo/Core/Select/AccessControl/FilterFactoryTest.php b/tests/unit/Espo/Core/Select/AccessControl/FilterFactoryTest.phpindex 16998540a0..ff71d54d86 100644--- a/tests/unit/Espo/Core/Select/AccessControl/FilterFactoryTest.php+++ b/tests/unit/Espo/Core/Select/AccessControl/FilterFactoryTest.php@@ -45,6 +45,11 @@ use PHPUnit\Framework\TestCase;class FilterFactoryTest extends TestCase{+ protected $aclManager;+ protected $acl;+ protected $metadata;+ protected $injectableFactory;+protected function setUp() : void{$this->injectableFactory = $this->createMock(InjectableFactory::class);@@ -52,19 +57,13 @@ class FilterFactoryTest extends TestCase$this->user = $this->createMock(User::class);$this->fieldHelper = $this->createMock(FieldHelper::class);$this->aclManager = $this->createMock(AclManager::class);-$this->acl = $this->createMock(Acl::class);- $this->aclManager- ->expects($this->any())- ->method('createUserAcl')- ->with($this->user)- ->willReturn($this->acl);-$this->factory = new FilterFactory($this->injectableFactory,$this->metadata,- $this->aclManager+ $this->aclManager,+ $this->acl,);}@@ -99,6 +98,7 @@ class FilterFactoryTest extends TestCase$binder->bindInstance(User::class, $this->user)+ ->bindInstance(AclManager::class, $this->aclManager)->bindInstance(Acl::class, $this->acl);$binderdiff --git a/tests/unit/Espo/Core/Select/AccessControl/FilterResolverFactoryTest.php b/tests/unit/Espo/Core/Select/AccessControl/FilterResolverFactoryTest.phpindex ceaae56f4f..1d8243b26e 100644--- a/tests/unit/Espo/Core/Select/AccessControl/FilterResolverFactoryTest.php+++ b/tests/unit/Espo/Core/Select/AccessControl/FilterResolverFactoryTest.php@@ -31,53 +31,37 @@ namespace tests\unit\Espo\Core\Select\AccessControl;use Espo\Core\Utils\Acl\UserAclManagerProvider;-use Espo\Core\{- Select\AccessControl\FilterResolverFactory,- Select\AccessControl\DefaultFilterResolver,- Select\AccessControl\DefaultPortalFilterResolver,- Utils\Metadata,- InjectableFactory,- AclManager,- Acl,- Portal\Acl as PortalAcl,- Portal\AclManager as PortalAclManager,- Binding\BindingContainer,- Binding\Binder,- Binding\BindingData,-};--use Espo\{- Entities\User,-};--class FilterResolverFactoryTest extends \PHPUnit\Framework\TestCase+use Espo\Core\Acl;+use Espo\Core\AclManager;+use Espo\Core\Binding\Binder;+use Espo\Core\Binding\BindingContainer;+use Espo\Core\Binding\BindingData;+use Espo\Core\InjectableFactory;+use Espo\Core\Portal\Acl as PortalAcl;+use Espo\Core\Portal\AclManager as PortalAclManager;+use Espo\Core\Select\AccessControl\DefaultFilterResolver;+use Espo\Core\Select\AccessControl\DefaultPortalFilterResolver;+use Espo\Core\Select\AccessControl\FilterResolverFactory;+use Espo\Core\Utils\Metadata;+use Espo\Entities\User;+use PHPUnit\Framework\TestCase;++class FilterResolverFactoryTest extends TestCase{protected function setUp() : void{$this->injectableFactory = $this->createMock(InjectableFactory::class);$this->metadata = $this->createMock(Metadata::class);$this->user = $this->createMock(User::class);- $this->userAclFilterResolver = $this->createMock(UserAclManagerProvider::class);$this->aclManager = $this->createMock(AclManager::class);$this->acl = $this->createMock(Acl::class);$this->factory = new FilterResolverFactory($this->injectableFactory,$this->metadata,- $this->userAclFilterResolver+ $this->aclManager,+ $this->acl,);-- $this->userAclFilterResolver- ->expects($this->any())- ->method('get')- ->with($this->user)- ->willReturn($this->aclManager);-- $this->aclManager- ->expects($this->any())- ->method('createUserAcl')- ->with($this->user)- ->willReturn($this->acl);}public function testCreate1()@@ -97,14 +81,6 @@ class FilterResolverFactoryTest extends \PHPUnit\Framework\TestCase->method('isPortal')->willReturn(true);- $this->aclManager = $this->createMock(PortalAclManager::class);-- $this->aclManager- ->expects($this->any())- ->method('createUserAcl')- ->with($this->user)- ->willReturn($this->acl);-$this->prepareFactoryTest(null);}@@ -137,8 +113,10 @@ class FilterResolverFactoryTest extends \PHPUnit\Framework\TestCase$binder->bindInstance(User::class, $this->user)+ ->bindInstance(AclManager::class, $this->aclManager)->bindInstance(Acl::class, $this->acl);+if ($this->user->isPortal()) {$binder->bindInstance(PortalAcl::class, $this->acl);}diff --git a/tests/unit/Espo/Core/Select/Applier/FactoryTest.php b/tests/unit/Espo/Core/Select/Applier/FactoryTest.phpindex 1135d27029..416bc73046 100644--- a/tests/unit/Espo/Core/Select/Applier/FactoryTest.php+++ b/tests/unit/Espo/Core/Select/Applier/FactoryTest.php@@ -29,6 +29,7 @@namespace tests\unit\Espo\Core\Select\Applier;+use Espo\Core\Acl;use Espo\Core\AclManager;use Espo\Core\Binding\Binder;use Espo\Core\Binding\BindingContainer;@@ -54,6 +55,7 @@ use PHPUnit\Framework\TestCase;class FactoryTest extends TestCase{private $aclManager;+ private $acl;protected function setUp(): void{@@ -77,6 +79,13 @@ class FactoryTest extends TestCase$userAclManagerProvider,$this->selectManagerFactory);++ $this->acl = $this->createMock(Acl::class);++ $this->aclManager+ ->expects($this->any())+ ->method('createUserAcl')+ ->willReturn($this->acl);}public function testCreate1()@@ -149,6 +158,7 @@ class FactoryTest extends TestCase->bindInstance(User::class, $this->user)->bindInstance(SelectManager::class, $this->selectManager)->bindInstance(AclManager::class, $this->aclManager)+ ->bindInstance(Acl::class, $this->acl)->for($applierClassName)->bindValue('$entityType', $entityType)->bindValue('$selectManager', $this->selectManager);