From 23eb9f6f5b1d46acb2ff8128e9b6c1145bdf0daf Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Sat, 9 Nov 2024 13:11:20 +0200 Subject: [PATCH] deprecation removal --- .../Core/Container/ContainerConfiguration.php | 6 -- application/Espo/Core/Notificators/Base.php | 38 ---------- .../Core/Notificators/DefaultNotificator.php | 76 ------------------- .../Espo/Core/Record/EntityProvider.php | 14 +--- .../AccessControl/BypassFilterResolver.php | 36 --------- .../Espo/Resources/metadata/app/metadata.json | 1 - 6 files changed, 1 insertion(+), 170 deletions(-) delete mode 100644 application/Espo/Core/Notificators/Base.php delete mode 100644 application/Espo/Core/Notificators/DefaultNotificator.php delete mode 100644 application/Espo/Core/Select/AccessControl/BypassFilterResolver.php diff --git a/application/Espo/Core/Container/ContainerConfiguration.php b/application/Espo/Core/Container/ContainerConfiguration.php index 6f737da19b..a93c552c31 100644 --- a/application/Espo/Core/Container/ContainerConfiguration.php +++ b/application/Espo/Core/Container/ContainerConfiguration.php @@ -64,12 +64,6 @@ class ContainerConfiguration implements Configuration try { $className = $this->metadata->get(['app', 'containerServices', $name, 'loaderClassName']); - - if (!$className) { - /** @deprecated */ - /** @todo Remove in v9.0. */ - $className = $this->metadata->get(['app', 'loaders', ucfirst($name)]); - } } catch (Exception) {} if ($className && class_exists($className)) { diff --git a/application/Espo/Core/Notificators/Base.php b/application/Espo/Core/Notificators/Base.php deleted file mode 100644 index 6355991138..0000000000 --- a/application/Espo/Core/Notificators/Base.php +++ /dev/null @@ -1,38 +0,0 @@ -. - * - * The interactive user interfaces in modified source and object code versions - * of this program must display Appropriate Legal Notices, as required under - * Section 5 of the GNU Affero General Public License version 3. - * - * In accordance with Section 7(b) of the GNU Affero General Public License version 3, - * these Appropriate Legal Notices must retain the display of the "EspoCRM" word. - ************************************************************************/ - -namespace Espo\Core\Notificators; - -/** - * @deprecated As of v6.0. - * @todo Remove in v9.0. - */ -class Base extends DefaultNotificator -{ -} diff --git a/application/Espo/Core/Notificators/DefaultNotificator.php b/application/Espo/Core/Notificators/DefaultNotificator.php deleted file mode 100644 index bded1bd490..0000000000 --- a/application/Espo/Core/Notificators/DefaultNotificator.php +++ /dev/null @@ -1,76 +0,0 @@ -. - * - * The interactive user interfaces in modified source and object code versions - * of this program must display Appropriate Legal Notices, as required under - * Section 5 of the GNU Affero General Public License version 3. - * - * In accordance with Section 7(b) of the GNU Affero General Public License version 3, - * these Appropriate Legal Notices must retain the display of the "EspoCRM" word. - ************************************************************************/ - -namespace Espo\Core\Notificators; - -use Espo\ORM\Entity; -use Espo\Entities\User; -use Espo\Core\Notification\AssignmentNotificator\Params; -use Espo\Core\Notification\DefaultAssignmentNotificator; -use Espo\Core\ORM\EntityManager; - -/** - * @deprecated As of v7.0. Use plain classes that implement `Espo\Core\Notification\AssignmentNotificator`. - * @todo Remove in v9.0. - */ -class DefaultNotificator -{ - protected $entityType; /** @phpstan-ignore-line */ - protected $user; /** @phpstan-ignore-line */ - protected $entityManager; /** @phpstan-ignore-line */ - private $base; /** @phpstan-ignore-line */ - - public function __construct(User $user, EntityManager $entityManager, DefaultAssignmentNotificator $base) - { - $this->user = $user; - $this->entityManager = $entityManager; - $this->base = $base; - } - - public function process(Entity $entity, array $options = []) /** @phpstan-ignore-line */ - { - $this->base->process($entity, Params::create()->withRawOptions($options)); - } - - /** - * For backward compatibility. - */ - protected function getEntityManager() /** @phpstan-ignore-line */ - { - return $this->entityManager; - } - - /** - * For backward compatibility. - */ - protected function getUser() /** @phpstan-ignore-line */ - { - return $this->user; - } -} diff --git a/application/Espo/Core/Record/EntityProvider.php b/application/Espo/Core/Record/EntityProvider.php index a5f77dc358..46b59886fc 100644 --- a/application/Espo/Core/Record/EntityProvider.php +++ b/application/Espo/Core/Record/EntityProvider.php @@ -35,8 +35,6 @@ use Espo\Core\Exceptions\NotFound; use Espo\ORM\Entity; use Espo\ORM\EntityManager; -use const E_USER_DEPRECATED; - /** * Fetches entities. * @@ -75,20 +73,10 @@ class EntityProvider * @return Entity * @throws NotFound * @throws Forbidden - * @since 8.5.0 + * @since 9.0.0 */ public function get(string $entityType, string $id): Entity { - if (!$this->entityManager->hasRepository($entityType)) { - // @todo Remove in v9.0. - trigger_error( - 'EntityProvider::get should receive an entity type, not a class name.', - E_USER_DEPRECATED - ); - /** @phpstan-ignore-next-line */ - return $this->getByClass($entityType, $id); - } - $entity = $this->entityManager->getEntityById($entityType, $id); return $this->processGet($entity); diff --git a/application/Espo/Core/Select/AccessControl/BypassFilterResolver.php b/application/Espo/Core/Select/AccessControl/BypassFilterResolver.php deleted file mode 100644 index 5958cdd953..0000000000 --- a/application/Espo/Core/Select/AccessControl/BypassFilterResolver.php +++ /dev/null @@ -1,36 +0,0 @@ -. - * - * The interactive user interfaces in modified source and object code versions - * of this program must display Appropriate Legal Notices, as required under - * Section 5 of the GNU Affero General Public License version 3. - * - * In accordance with Section 7(b) of the GNU Affero General Public License version 3, - * these Appropriate Legal Notices must retain the display of the "EspoCRM" word. - ************************************************************************/ - -namespace Espo\Core\Select\AccessControl; - -/** - * @deprecated Use `\Espo\Core\Select\AccessControl\FilterResolvers\Bypass` instead. - * @todo Remove in v9.0. - */ -class BypassFilterResolver extends \Espo\Core\Select\AccessControl\FilterResolvers\Bypass {} diff --git a/application/Espo/Resources/metadata/app/metadata.json b/application/Espo/Resources/metadata/app/metadata.json index c208e4eaaf..3f88a254e2 100644 --- a/application/Espo/Resources/metadata/app/metadata.json +++ b/application/Espo/Resources/metadata/app/metadata.json @@ -1,7 +1,6 @@ { "frontendHiddenPathList": [ ["app", "metadata"], - ["app", "loaders"], ["app", "containerServices"], ["app", "portalContainerServices"], ["app", "consoleCommands"],