From cccf05db39b3b0a2e0c17baa2bb59340e1f3833f Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Fri, 23 Jul 2021 15:17:24 +0300 Subject: [PATCH] rename boolean => bool --- .../Select/ActionHistoryRecord/BoolFilters/OnlyMy.php | 2 +- .../Espo/Classes/Select/Email/BoolFilters/OnlyMy.php | 2 +- .../Espo/Classes/Select/EmailFilter/BoolFilters/OnlyMy.php | 2 +- application/Espo/Classes/Select/Team/BoolFilters/OnlyMy.php | 2 +- .../Espo/Classes/Select/User/BoolFilters/OnlyMyTeam.php | 2 +- .../Espo/Core/Select/Applier/Appliers/BoolFilterList.php | 2 +- application/Espo/Core/Select/{Boolean => Bool}/Filter.php | 2 +- .../Espo/Core/Select/{Boolean => Bool}/FilterFactory.php | 6 +++--- .../Espo/Core/Select/{Boolean => Bool}/Filters/Followed.php | 4 ++-- .../Modules/Crm/Classes/Select/CaseObj/BoolFilters/Open.php | 2 +- .../Crm/Classes/Select/Meeting/BoolFilters/OnlyMy.php | 2 +- .../Modules/Crm/Classes/Select/Task/BoolFilters/Actual.php | 2 +- .../Crm/Classes/Select/Task/BoolFilters/Completed.php | 2 +- .../Select/Applier/Appliers/BoolFilterListApplierTest.php | 4 ++-- .../Core/Select/{Boolean => Bool}/FilterFactoryTest.php | 6 +++--- 15 files changed, 21 insertions(+), 21 deletions(-) rename application/Espo/Core/Select/{Boolean => Bool}/Filter.php (97%) rename application/Espo/Core/Select/{Boolean => Bool}/FilterFactory.php (95%) rename application/Espo/Core/Select/{Boolean => Bool}/Filters/Followed.php (96%) rename tests/unit/Espo/Core/Select/{Boolean => Bool}/FilterFactoryTest.php (96%) diff --git a/application/Espo/Classes/Select/ActionHistoryRecord/BoolFilters/OnlyMy.php b/application/Espo/Classes/Select/ActionHistoryRecord/BoolFilters/OnlyMy.php index 444ee0bc73..219134414b 100644 --- a/application/Espo/Classes/Select/ActionHistoryRecord/BoolFilters/OnlyMy.php +++ b/application/Espo/Classes/Select/ActionHistoryRecord/BoolFilters/OnlyMy.php @@ -30,7 +30,7 @@ namespace Espo\Classes\Select\ActionHistoryRecord\BoolFilters; use Espo\{ - Core\Select\Boolean\Filter, + Core\Select\Bool\Filter, ORM\Query\SelectBuilder as QueryBuilder, ORM\Query\Part\WhereClause, ORM\Query\Part\Where\OrGroupBuilder, diff --git a/application/Espo/Classes/Select/Email/BoolFilters/OnlyMy.php b/application/Espo/Classes/Select/Email/BoolFilters/OnlyMy.php index b3367b03a2..aea77f6c57 100644 --- a/application/Espo/Classes/Select/Email/BoolFilters/OnlyMy.php +++ b/application/Espo/Classes/Select/Email/BoolFilters/OnlyMy.php @@ -30,7 +30,7 @@ namespace Espo\Classes\Select\Email\BoolFilters; use Espo\{ - Core\Select\Boolean\Filter, + Core\Select\Bool\Filter, ORM\Query\SelectBuilder as QueryBuilder, ORM\Query\Part\WhereClause, ORM\Query\Part\Where\OrGroupBuilder, diff --git a/application/Espo/Classes/Select/EmailFilter/BoolFilters/OnlyMy.php b/application/Espo/Classes/Select/EmailFilter/BoolFilters/OnlyMy.php index 1a374ca132..4a44ca6fa4 100644 --- a/application/Espo/Classes/Select/EmailFilter/BoolFilters/OnlyMy.php +++ b/application/Espo/Classes/Select/EmailFilter/BoolFilters/OnlyMy.php @@ -30,7 +30,7 @@ namespace Espo\Classes\Select\EmailFilter\BoolFilters; use Espo\{ - Core\Select\Boolean\Filter, + Core\Select\Bool\Filter, ORM\Query\SelectBuilder as QueryBuilder, ORM\Query\Part\WhereClause, ORM\Query\Part\Where\OrGroupBuilder, diff --git a/application/Espo/Classes/Select/Team/BoolFilters/OnlyMy.php b/application/Espo/Classes/Select/Team/BoolFilters/OnlyMy.php index d60bfb0705..684f2d7e0d 100644 --- a/application/Espo/Classes/Select/Team/BoolFilters/OnlyMy.php +++ b/application/Espo/Classes/Select/Team/BoolFilters/OnlyMy.php @@ -31,7 +31,7 @@ namespace Espo\Classes\Select\Team\BoolFilters; use Espo\Entities\User; -use Espo\Core\Select\Boolean\Filter; +use Espo\Core\Select\Bool\Filter; use Espo\ORM\Query\{ SelectBuilder, diff --git a/application/Espo/Classes/Select/User/BoolFilters/OnlyMyTeam.php b/application/Espo/Classes/Select/User/BoolFilters/OnlyMyTeam.php index 1a289bc39e..e903cdc025 100644 --- a/application/Espo/Classes/Select/User/BoolFilters/OnlyMyTeam.php +++ b/application/Espo/Classes/Select/User/BoolFilters/OnlyMyTeam.php @@ -31,7 +31,7 @@ namespace Espo\Classes\Select\User\BoolFilters; use Espo\Entities\User; -use Espo\Core\Select\Boolean\Filter; +use Espo\Core\Select\Bool\Filter; use Espo\ORM\Query\{ SelectBuilder, diff --git a/application/Espo/Core/Select/Applier/Appliers/BoolFilterList.php b/application/Espo/Core/Select/Applier/Appliers/BoolFilterList.php index 70f6879a85..17612d4c03 100644 --- a/application/Espo/Core/Select/Applier/Appliers/BoolFilterList.php +++ b/application/Espo/Core/Select/Applier/Appliers/BoolFilterList.php @@ -32,7 +32,7 @@ namespace Espo\Core\Select\Applier\Appliers; use Espo\Core\{ Exceptions\Error, Select\SelectManager, - Select\Boolean\FilterFactory as BoolFilterFactory, + Select\Bool\FilterFactory as BoolFilterFactory, }; use Espo\{ diff --git a/application/Espo/Core/Select/Boolean/Filter.php b/application/Espo/Core/Select/Bool/Filter.php similarity index 97% rename from application/Espo/Core/Select/Boolean/Filter.php rename to application/Espo/Core/Select/Bool/Filter.php index 89b9d93f40..5f3dafbc18 100644 --- a/application/Espo/Core/Select/Boolean/Filter.php +++ b/application/Espo/Core/Select/Bool/Filter.php @@ -27,7 +27,7 @@ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word. ************************************************************************/ -namespace Espo\Core\Select\Boolean; +namespace Espo\Core\Select\Bool; use Espo\{ ORM\Query\SelectBuilder as QueryBuilder, diff --git a/application/Espo/Core/Select/Boolean/FilterFactory.php b/application/Espo/Core/Select/Bool/FilterFactory.php similarity index 95% rename from application/Espo/Core/Select/Boolean/FilterFactory.php rename to application/Espo/Core/Select/Bool/FilterFactory.php index 2fae1e286a..f844e12e7c 100644 --- a/application/Espo/Core/Select/Boolean/FilterFactory.php +++ b/application/Espo/Core/Select/Bool/FilterFactory.php @@ -27,11 +27,11 @@ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word. ************************************************************************/ -namespace Espo\Core\Select\Boolean; +namespace Espo\Core\Select\Bool; use Espo\Core\{ Exceptions\Error, - Select\Boolean\Filter, + Select\Bool\Filter, InjectableFactory, Utils\Metadata, Binding\BindingContainer, @@ -106,7 +106,7 @@ class FilterFactory protected function getDefaultClassName(string $name): ?string { - $className = 'Espo\\Core\\Select\\Boolean\\Filters\\' . ucfirst($name); + $className = 'Espo\\Core\\Select\\Bool\\Filters\\' . ucfirst($name); if (!class_exists($className)) { return null; diff --git a/application/Espo/Core/Select/Boolean/Filters/Followed.php b/application/Espo/Core/Select/Bool/Filters/Followed.php similarity index 96% rename from application/Espo/Core/Select/Boolean/Filters/Followed.php rename to application/Espo/Core/Select/Bool/Filters/Followed.php index baf50df869..36caf93dff 100644 --- a/application/Espo/Core/Select/Boolean/Filters/Followed.php +++ b/application/Espo/Core/Select/Bool/Filters/Followed.php @@ -27,13 +27,13 @@ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word. ************************************************************************/ -namespace Espo\Core\Select\Boolean\Filters; +namespace Espo\Core\Select\Bool\Filters; use Espo\{ ORM\Query\SelectBuilder as QueryBuilder, ORM\Query\Part\WhereClause, ORM\Query\Part\Where\OrGroupBuilder, - Core\Select\Boolean\Filter, + Core\Select\Bool\Filter, Entities\User, }; diff --git a/application/Espo/Modules/Crm/Classes/Select/CaseObj/BoolFilters/Open.php b/application/Espo/Modules/Crm/Classes/Select/CaseObj/BoolFilters/Open.php index 405e95dc14..d6613d7400 100644 --- a/application/Espo/Modules/Crm/Classes/Select/CaseObj/BoolFilters/Open.php +++ b/application/Espo/Modules/Crm/Classes/Select/CaseObj/BoolFilters/Open.php @@ -29,7 +29,7 @@ namespace Espo\Modules\Crm\Classes\Select\CaseObj\BoolFilters; -use Espo\Core\Select\Boolean\Filter; +use Espo\Core\Select\Bool\Filter; use Espo\Core\Utils\Metadata; use Espo\ORM\Query\SelectBuilder; diff --git a/application/Espo/Modules/Crm/Classes/Select/Meeting/BoolFilters/OnlyMy.php b/application/Espo/Modules/Crm/Classes/Select/Meeting/BoolFilters/OnlyMy.php index 3d53c60e3d..7f5fb58b81 100644 --- a/application/Espo/Modules/Crm/Classes/Select/Meeting/BoolFilters/OnlyMy.php +++ b/application/Espo/Modules/Crm/Classes/Select/Meeting/BoolFilters/OnlyMy.php @@ -29,7 +29,7 @@ namespace Espo\Modules\Crm\Classes\Select\Meeting\BoolFilters; -use Espo\Core\Select\Boolean\Filter; +use Espo\Core\Select\Bool\Filter; use Espo\ORM\Query\SelectBuilder; use Espo\ORM\Query\Part\Where\OrGroupBuilder; use Espo\ORM\Query\Part\Condition as Cond; diff --git a/application/Espo/Modules/Crm/Classes/Select/Task/BoolFilters/Actual.php b/application/Espo/Modules/Crm/Classes/Select/Task/BoolFilters/Actual.php index de1d2bb786..6ed712962d 100644 --- a/application/Espo/Modules/Crm/Classes/Select/Task/BoolFilters/Actual.php +++ b/application/Espo/Modules/Crm/Classes/Select/Task/BoolFilters/Actual.php @@ -29,7 +29,7 @@ namespace Espo\Modules\Crm\Classes\Select\Task\BoolFilters; -use Espo\Core\Select\Boolean\Filter; +use Espo\Core\Select\Bool\Filter; use Espo\Core\Utils\Metadata; use Espo\ORM\Query\SelectBuilder; diff --git a/application/Espo/Modules/Crm/Classes/Select/Task/BoolFilters/Completed.php b/application/Espo/Modules/Crm/Classes/Select/Task/BoolFilters/Completed.php index 20692ce2c5..ed479eb038 100644 --- a/application/Espo/Modules/Crm/Classes/Select/Task/BoolFilters/Completed.php +++ b/application/Espo/Modules/Crm/Classes/Select/Task/BoolFilters/Completed.php @@ -29,7 +29,7 @@ namespace Espo\Modules\Crm\Classes\Select\Task\BoolFilters; -use Espo\Core\Select\Boolean\Filter; +use Espo\Core\Select\Bool\Filter; use Espo\ORM\Query\SelectBuilder; use Espo\ORM\Query\Part\Where\OrGroupBuilder; diff --git a/tests/unit/Espo/Core/Select/Applier/Appliers/BoolFilterListApplierTest.php b/tests/unit/Espo/Core/Select/Applier/Appliers/BoolFilterListApplierTest.php index a8c29abe06..10904ae38f 100644 --- a/tests/unit/Espo/Core/Select/Applier/Appliers/BoolFilterListApplierTest.php +++ b/tests/unit/Espo/Core/Select/Applier/Appliers/BoolFilterListApplierTest.php @@ -32,8 +32,8 @@ namespace tests\unit\Espo\Core\Select\Applier\Appliers; use Espo\Core\{ Exceptions\Error, Select\Applier\Appliers\BoolFilterList as BoolFilterListApplier, - Select\Boolean\FilterFactory as BoolFilterFactory, - Select\Boolean\Filter as BoolFilter, + Select\Bool\FilterFactory as BoolFilterFactory, + Select\Bool\Filter as BoolFilter, Select\SelectManager, }; diff --git a/tests/unit/Espo/Core/Select/Boolean/FilterFactoryTest.php b/tests/unit/Espo/Core/Select/Bool/FilterFactoryTest.php similarity index 96% rename from tests/unit/Espo/Core/Select/Boolean/FilterFactoryTest.php rename to tests/unit/Espo/Core/Select/Bool/FilterFactoryTest.php index 699707f470..32f6ef9c19 100644 --- a/tests/unit/Espo/Core/Select/Boolean/FilterFactoryTest.php +++ b/tests/unit/Espo/Core/Select/Bool/FilterFactoryTest.php @@ -27,11 +27,11 @@ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word. ************************************************************************/ -namespace tests\unit\Espo\Core\Select\Boolean; +namespace tests\unit\Espo\Core\Select\Bool; use Espo\Core\{ - Select\Boolean\FilterFactory as BoolFilterFactory, - Select\Boolean\Filters\Followed, + Select\Bool\FilterFactory as BoolFilterFactory, + Select\Bool\Filters\Followed, Utils\Metadata, InjectableFactory, Binding\BindingContainer,