Skip to content

EspoCRM – Open Source CRM Application

Deprecations removal

Yuriiee32604f6459
diff --git a/application/Espo/Controllers/Extension.php b/application/Espo/Controllers/Extension.php
index eee5490d81..7b980142d6 100644
--- a/application/Espo/Controllers/Extension.php
+++ b/application/Espo/Controllers/Extension.php
@@ -32,7 +32,6 @@ namespace Espo\Controllers;
use Espo\Core\Exceptions\Error;
use Espo\Core\Exceptions\Forbidden;
use Espo\Core\Exceptions\BadRequest;
-
use Espo\Core\Api\Request;
use Espo\Core\Api\Response;
use Espo\Core\Controllers\RecordBase;
@@ -68,7 +67,7 @@ class Extension extends RecordBase
throw new BadRequest();
}
- $manager = new ExtensionManager($this->getContainer());
+ $manager = $this->createManager();
$id = $manager->upload($body);
@@ -94,7 +93,7 @@ class Extension extends RecordBase
throw new Forbidden();
}
- $manager = new ExtensionManager($this->getContainer());
+ $manager = $this->createManager();
$manager->install(get_object_vars($data));
@@ -113,7 +112,7 @@ class Extension extends RecordBase
throw new Forbidden();
}
- $manager = new ExtensionManager($this->getContainer());
+ $manager = $this->createManager();
$manager->uninstall(get_object_vars($data));
@@ -132,7 +131,7 @@ class Extension extends RecordBase
throw new Forbidden();
}
- $manager = new ExtensionManager($this->getContainer());
+ $manager = $this->createManager();
$manager->delete($params);
@@ -148,4 +147,9 @@ class Extension extends RecordBase
{
throw new Forbidden();
}
+
+ private function createManager(): ExtensionManager
+ {
+ return $this->injectableFactory->create(ExtensionManager::class);
+ }
}
diff --git a/application/Espo/Controllers/ExternalAccount.php b/application/Espo/Controllers/ExternalAccount.php
index fe93f52d78..22c82d196a 100644
--- a/application/Espo/Controllers/ExternalAccount.php
+++ b/application/Espo/Controllers/ExternalAccount.php
@@ -66,7 +66,6 @@ class ExternalAccount extends RecordBase
$entity->get('enabled') &&
$this->metadata->get('integrations.' . $entity->getId() .'.allowUserAccounts')
) {
- /** @var string $id */
$id = $entity->getId();
$userAccountAclScope = $this->metadata
@@ -137,7 +136,7 @@ class ExternalAccount extends RecordBase
$data = $request->getParsedBody();
- list($integration, $userId) = explode('__', $id);
+ [, $userId] = explode('__', $id);
if ($this->user->getId() !== $userId && !$this->user->isAdmin()) {
throw new Forbidden();
diff --git a/application/Espo/Controllers/InboundEmail.php b/application/Espo/Controllers/InboundEmail.php
index e4481e8d5a..394936af88 100644
--- a/application/Espo/Controllers/InboundEmail.php
+++ b/application/Espo/Controllers/InboundEmail.php
@@ -42,7 +42,7 @@ class InboundEmail extends Record
{
protected function checkAccess(): bool
{
- return $this->getUser()->isAdmin();
+ return $this->user->isAdmin();
}
/**
diff --git a/application/Espo/Controllers/LayoutSet.php b/application/Espo/Controllers/LayoutSet.php
index ddab66f285..f86a99df12 100644
--- a/application/Espo/Controllers/LayoutSet.php
+++ b/application/Espo/Controllers/LayoutSet.php
@@ -35,6 +35,6 @@ class LayoutSet extends Record
{
protected function checkAccess(): bool
{
- return $this->getUser()->isAdmin();
+ return $this->user->isAdmin();
}
}
diff --git a/application/Espo/Core/Controllers/Base.php b/application/Espo/Core/Controllers/Base.php
index 28af94e6ab..fd5162a34d 100644
--- a/application/Espo/Core/Controllers/Base.php
+++ b/application/Espo/Core/Controllers/Base.php
@@ -31,9 +31,7 @@ namespace Espo\Core\Controllers;
use Espo\Core\Acl;
use Espo\Core\AclManager;
-use Espo\Core\Container;
use Espo\Core\Exceptions\Forbidden;
-use Espo\Core\ServiceFactory;
use Espo\Core\Utils\Config;
use Espo\Core\Utils\Metadata;
@@ -56,11 +54,6 @@ abstract class Base
*/
public static $defaultAction = 'index';
- /**
- * @deprecated
- * @var Container
- */
- private $container;
/**
* @var User
@@ -95,34 +88,24 @@ abstract class Base
*/
protected $metadata;
- /**
- * @deprecated
- * @var ServiceFactory
- */
- protected $serviceFactory;
-
/**
* @throws Forbidden
* @internal Most dependencies are for backward compatibility.
*/
public function __construct(
- Container $container,
User $user,
Acl $acl,
AclManager $aclManager,
Config $config,
Preferences $preferences,
Metadata $metadata,
- ServiceFactory $serviceFactory
) {
- $this->container = $container;
$this->user = $user;
$this->acl = $acl;
$this->aclManager = $aclManager;
$this->config = $config;
$this->preferences = $preferences;
$this->metadata = $metadata;
- $this->serviceFactory = $serviceFactory;
if (empty($this->name)) {
$name = get_class($this);
@@ -167,99 +150,4 @@ abstract class Base
protected function checkControllerAccess()
{
}
-
- /**
- * @deprecated
- * @param string $name
- */
- protected function getService($name): object
- {
- return $this->serviceFactory->create($name);
- }
-
- /**
- * @deprecated Use Aware interfaces to inject dependencies.
- *
- * @return Container
- */
- protected function getContainer()
- {
- return $this->container;
- }
-
- /**
- * @deprecated
- *
- * @return User
- */
- protected function getUser()
- {
- /** @var User */
- return $this->container->get('user');
- }
-
- /**
- * @deprecated
- *
- * @return Acl
- */
- protected function getAcl()
- {
- /** @var Acl */
- return $this->container->get('acl');
- }
-
- /**
- * @deprecated
- *
- * @return AclManager
- */
- protected function getAclManager()
- {
- /** @var AclManager */
- return $this->container->get('aclManager');
- }
-
- /**
- * @deprecated
- *
- * @return Config
- */
- protected function getConfig()
- {
- /** @var Config */
- return $this->container->get('config');
- }
-
- /**
- * @deprecated
- * @return Preferences
- */
- protected function getPreferences()
- {
- /** @var Preferences */
- return $this->container->get('preferences');
- }
-
- /**
- * @deprecated
- *
- * @return Metadata
- */
- protected function getMetadata()
- {
- /** @var Metadata */
- return $this->container->get('metadata');
- }
-
- /**
- * @deprecated
- *
- * @return ServiceFactory
- */
- protected function getServiceFactory()
- {
- /** @var ServiceFactory */
- return $this->container->get('serviceFactory');
- }
}
diff --git a/application/Espo/Core/Controllers/RecordBase.php b/application/Espo/Core/Controllers/RecordBase.php
index 8427f6dc2f..d79be6be30 100644
--- a/application/Espo/Core/Controllers/RecordBase.php
+++ b/application/Espo/Core/Controllers/RecordBase.php
@@ -99,11 +99,9 @@ class RecordBase extends Base implements
User $user,
Acl $acl,
// Parameters below are for backward compatibility.
- Container $container,
AclManager $aclManager,
Preferences $preferences,
Metadata $metadata,
- ServiceFactory $serviceFactory
) {
$this->recordServiceContainer = $recordServiceContainer;
$this->config = $config;
@@ -111,14 +109,12 @@ class RecordBase extends Base implements
$this->acl = $acl;
parent::__construct(
- $container,
$user,
$acl,
$aclManager,
$config,
$preferences,
$metadata,
- $serviceFactory
);
}
@@ -331,13 +327,4 @@ class RecordBase extends Base implements
return true;
}
-
- /**
- * @deprecated
- * @return EntityManager
- */
- protected function getEntityManager()
- {
- return $this->entityManager;
- }
}
diff --git a/tests/unit/Espo/ORM/Repository/RDBRepositoryTest.php b/tests/unit/Espo/ORM/Repository/RDBRepositoryTest.php
index ad49d0905c..91ff680bfb 100644
--- a/tests/unit/Espo/ORM/Repository/RDBRepositoryTest.php
+++ b/tests/unit/Espo/ORM/Repository/RDBRepositoryTest.php
@@ -255,29 +255,6 @@ class RDBRepositoryTest extends TestCase
->findOne();
}
- public function testFindOneWithDeletedLegacy(): void
- {
- $paramsExpected = Select::fromRaw([
- 'from' => 'Test',
- 'whereClause' => [
- 'name' => 'test',
- ],
- 'withDeleted' => true,
- 'offset' => 0,
- 'limit' => 1,
- ]);
-
- $this->mapper
- ->expects($this->once())
- ->method('select')
- ->willReturn($this->collection)
- ->with($paramsExpected);
-
- $this->repository
- ->where(['name' => 'test'])
- ->findOne(['withDeleted' => true]);
- }
-
/**
* @deprecated
*/