Update
This commit is contained in:
root
@@ -16,6 +16,7 @@ foreach (
|
||||
'GeoIp2' => '/vendor/geoip2/geoip2/src',
|
||||
'MaxMind\\Db' => '/vendor/maxmind-db/reader/src/MaxMind/Db',
|
||||
'PhpParser' => '/vendor/nikic/php-parser/lib/PhpParser',
|
||||
'Recurr' => '/vendor/simshaun/recurr/src/Recurr',
|
||||
]
|
||||
as $namespace => $namespacePath
|
||||
)
|
||||
@@ -235,7 +236,6 @@ Loader::registerAutoLoadClasses(
|
||||
'CAjax' => 'ajax_tools.php',
|
||||
'CAllUser' => 'classes/general/user.php',
|
||||
'CUser' => 'classes/general/user.php',
|
||||
'CAllEvent' => 'classes/general/event.php',
|
||||
'CEvent' => 'classes/general/event.php',
|
||||
'CAllEventMessage' => 'classes/general/eventmessage.php',
|
||||
'CEventMessage' => 'classes/general/eventmessage.php',
|
||||
@@ -308,3 +308,6 @@ Loader::registerHandler([\Bitrix\Main\ORM\Loader::class, 'autoLoad']);
|
||||
|
||||
// old class names compatibility
|
||||
require_once __DIR__ . '/compatibility.php';
|
||||
|
||||
// register composer classes
|
||||
Loader::includeComposerAutoload();
|
||||
|
||||
@@ -1,74 +1,70 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* All classes will be loaded immediately.
|
||||
* In case of performance issues need to make alias-on-demand.
|
||||
* E.g. Loader::registerClassAlias(original, alias), and call class_alias only when Loader gets request on particular class.
|
||||
* UPDATE: Loader idea doesn't work because of type hints and instanceof - alias should be loaded before these constructions.
|
||||
*/
|
||||
use Bitrix\Main\Loader;
|
||||
|
||||
class_alias('Bitrix\Main\ORM\Fields\IReadable', 'Bitrix\Main\Entity\Field\IReadable');
|
||||
class_alias('Bitrix\Main\ORM\Fields\IStorable', 'Bitrix\Main\Entity\Field\IStorable');
|
||||
class_alias('Bitrix\Main\ORM\Fields\BooleanField', 'Bitrix\Main\Entity\BooleanField');
|
||||
class_alias('Bitrix\Main\ORM\Fields\DateField', 'Bitrix\Main\Entity\DateField');
|
||||
class_alias('Bitrix\Main\ORM\Fields\DatetimeField', 'Bitrix\Main\Entity\DatetimeField');
|
||||
class_alias('Bitrix\Main\ORM\Fields\EnumField', 'Bitrix\Main\Entity\EnumField');
|
||||
class_alias('Bitrix\Main\ORM\Fields\ExpressionField', 'Bitrix\Main\Entity\ExpressionField');
|
||||
class_alias('Bitrix\Main\ORM\Fields\IntegerField', 'Bitrix\Main\Entity\IntegerField');
|
||||
class_alias('Bitrix\Main\ORM\Fields\FloatField', 'Bitrix\Main\Entity\FloatField');
|
||||
class_alias('Bitrix\Main\ORM\Fields\StringField', 'Bitrix\Main\Entity\StringField');
|
||||
class_alias('Bitrix\Main\ORM\Fields\TextField', 'Bitrix\Main\Entity\TextField');
|
||||
class_alias('Bitrix\Main\ORM\Fields\CryptoField', 'Bitrix\Main\Entity\CryptoField');
|
||||
class_alias('Bitrix\Main\ORM\Fields\Relations\Reference', 'Bitrix\Main\Entity\ReferenceField');
|
||||
class_alias('Bitrix\Main\ORM\Fields\ScalarField', 'Bitrix\Main\Entity\ScalarField');
|
||||
class_alias('Bitrix\Main\ORM\Fields\Field', 'Bitrix\Main\Entity\Field');
|
||||
class_alias('Bitrix\Main\ORM\Fields\FieldError', 'Bitrix\Main\Entity\FieldError');
|
||||
Loader::registerClassAliases([
|
||||
'Bitrix\Main\Entity\Field\IReadable' => 'Bitrix\Main\ORM\Fields\IReadable',
|
||||
'Bitrix\Main\Entity\Field\IStorable' => 'Bitrix\Main\ORM\Fields\IStorable',
|
||||
'Bitrix\Main\Entity\BooleanField' => 'Bitrix\Main\ORM\Fields\BooleanField',
|
||||
'Bitrix\Main\Entity\DateField' => 'Bitrix\Main\ORM\Fields\DateField',
|
||||
'Bitrix\Main\Entity\DatetimeField' => 'Bitrix\Main\ORM\Fields\DatetimeField',
|
||||
'Bitrix\Main\Entity\EnumField' => 'Bitrix\Main\ORM\Fields\EnumField',
|
||||
'Bitrix\Main\Entity\ExpressionField' => 'Bitrix\Main\ORM\Fields\ExpressionField',
|
||||
'Bitrix\Main\Entity\IntegerField' => 'Bitrix\Main\ORM\Fields\IntegerField',
|
||||
'Bitrix\Main\Entity\FloatField' => 'Bitrix\Main\ORM\Fields\FloatField',
|
||||
'Bitrix\Main\Entity\StringField' => 'Bitrix\Main\ORM\Fields\StringField',
|
||||
'Bitrix\Main\Entity\TextField' => 'Bitrix\Main\ORM\Fields\TextField',
|
||||
'Bitrix\Main\Entity\CryptoField' => 'Bitrix\Main\ORM\Fields\CryptoField',
|
||||
'Bitrix\Main\Entity\ReferenceField' => 'Bitrix\Main\ORM\Fields\Relations\Reference',
|
||||
'Bitrix\Main\Entity\ScalarField' => 'Bitrix\Main\ORM\Fields\ScalarField',
|
||||
'Bitrix\Main\Entity\Field' => 'Bitrix\Main\ORM\Fields\Field',
|
||||
'Bitrix\Main\Entity\FieldError' => 'Bitrix\Main\ORM\Fields\FieldError',
|
||||
|
||||
class_alias('Bitrix\Main\ORM\Fields\Validators\IValidator', 'Bitrix\Main\Entity\IValidator');
|
||||
class_alias('Bitrix\Main\ORM\Fields\Validators\Validator', 'Bitrix\Main\Entity\Validator\Base');
|
||||
class_alias('Bitrix\Main\ORM\Fields\Validators\DateValidator', 'Bitrix\Main\Entity\Validator\Date');
|
||||
class_alias('Bitrix\Main\ORM\Fields\Validators\EnumValidator', 'Bitrix\Main\Entity\Validator\Enum');
|
||||
class_alias('Bitrix\Main\ORM\Fields\Validators\ForeignValidator', 'Bitrix\Main\Entity\Validator\Foreign');
|
||||
class_alias('Bitrix\Main\ORM\Fields\Validators\LengthValidator', 'Bitrix\Main\Entity\Validator\Length');
|
||||
class_alias('Bitrix\Main\ORM\Fields\Validators\RangeValidator', 'Bitrix\Main\Entity\Validator\Range');
|
||||
class_alias('Bitrix\Main\ORM\Fields\Validators\RegExpValidator', 'Bitrix\Main\Entity\Validator\RegExp');
|
||||
class_alias('Bitrix\Main\ORM\Fields\Validators\UniqueValidator', 'Bitrix\Main\Entity\Validator\Unique');
|
||||
'Bitrix\Main\Entity\IValidator' => 'Bitrix\Main\ORM\Fields\Validators\IValidator',
|
||||
'Bitrix\Main\Entity\Validator\Base' => 'Bitrix\Main\ORM\Fields\Validators\Validator',
|
||||
'Bitrix\Main\Entity\Validator\Date' => 'Bitrix\Main\ORM\Fields\Validators\DateValidator',
|
||||
'Bitrix\Main\Entity\Validator\Enum' => 'Bitrix\Main\ORM\Fields\Validators\EnumValidator',
|
||||
'Bitrix\Main\Entity\Validator\Foreign' => 'Bitrix\Main\ORM\Fields\Validators\ForeignValidator',
|
||||
'Bitrix\Main\Entity\Validator\Length' => 'Bitrix\Main\ORM\Fields\Validators\LengthValidator',
|
||||
'Bitrix\Main\Entity\Validator\Range' => 'Bitrix\Main\ORM\Fields\Validators\RangeValidator',
|
||||
'Bitrix\Main\Entity\Validator\RegExp' => 'Bitrix\Main\ORM\Fields\Validators\RegExpValidator',
|
||||
'Bitrix\Main\Entity\Validator\Unique' => 'Bitrix\Main\ORM\Fields\Validators\UniqueValidator',
|
||||
|
||||
class_alias('Bitrix\Main\ORM\Query\INosqlPrimarySelector', 'Bitrix\Main\Entity\INosqlPrimarySelector');
|
||||
class_alias('Bitrix\Main\ORM\Query\NosqlPrimarySelector', 'Bitrix\Main\Entity\NosqlPrimarySelector');
|
||||
class_alias('Bitrix\Main\ORM\Query\Query', 'Bitrix\Main\Entity\Query');
|
||||
class_alias('Bitrix\Main\ORM\Query\Chain', 'Bitrix\Main\Entity\QueryChain');
|
||||
class_alias('Bitrix\Main\ORM\Query\ChainElement', 'Bitrix\Main\Entity\QueryChainElement');
|
||||
'Bitrix\Main\Entity\INosqlPrimarySelector' => 'Bitrix\Main\ORM\Query\INosqlPrimarySelector',
|
||||
'Bitrix\Main\Entity\NosqlPrimarySelector' => 'Bitrix\Main\ORM\Query\NosqlPrimarySelector',
|
||||
'Bitrix\Main\Entity\Query' => 'Bitrix\Main\ORM\Query\Query',
|
||||
'Bitrix\Main\Entity\QueryChain' => 'Bitrix\Main\ORM\Query\Chain',
|
||||
'Bitrix\Main\Entity\QueryChainElement' => 'Bitrix\Main\ORM\Query\ChainElement',
|
||||
|
||||
class_alias('Bitrix\Main\ORM\Query\Filter\Expressions\Expression', 'Bitrix\Main\Entity\Query\Filter\Expression\Base');
|
||||
class_alias('Bitrix\Main\ORM\Query\Filter\Expressions\ColumnExpression', 'Bitrix\Main\Entity\Query\Filter\Expression\Column');
|
||||
class_alias('Bitrix\Main\ORM\Query\Filter\Expressions\NullExpression', 'Bitrix\Main\Entity\Query\Filter\Expression\NullEx');
|
||||
'Bitrix\Main\Entity\Query\Filter\Expression\Base' => 'Bitrix\Main\ORM\Query\Filter\Expressions\Expression',
|
||||
'Bitrix\Main\Entity\Query\Filter\Expression\Column' => 'Bitrix\Main\ORM\Query\Filter\Expressions\ColumnExpression',
|
||||
'Bitrix\Main\Entity\Query\Filter\Expression\NullEx' => 'Bitrix\Main\ORM\Query\Filter\Expressions\NullExpression',
|
||||
|
||||
class_alias('Bitrix\Main\ORM\Data\DataManager', 'Bitrix\Main\Entity\DataManager');
|
||||
class_alias('Bitrix\Main\ORM\Data\Result', 'Bitrix\Main\Entity\Result');
|
||||
class_alias('Bitrix\Main\ORM\Data\AddResult', 'Bitrix\Main\Entity\AddResult');
|
||||
class_alias('Bitrix\Main\ORM\Data\UpdateResult', 'Bitrix\Main\Entity\UpdateResult');
|
||||
class_alias('Bitrix\Main\ORM\Data\DeleteResult', 'Bitrix\Main\Entity\DeleteResult');
|
||||
'Bitrix\Main\Entity\DataManager' => 'Bitrix\Main\ORM\Data\DataManager',
|
||||
'Bitrix\Main\Entity\Result' => 'Bitrix\Main\ORM\Data\Result',
|
||||
'Bitrix\Main\Entity\AddResult' => 'Bitrix\Main\ORM\Data\AddResult',
|
||||
'Bitrix\Main\Entity\UpdateResult' => 'Bitrix\Main\ORM\Data\UpdateResult',
|
||||
'Bitrix\Main\Entity\DeleteResult' => 'Bitrix\Main\ORM\Data\DeleteResult',
|
||||
|
||||
class_alias('Bitrix\Main\ORM\Query\Filter\Condition', 'Bitrix\Main\Entity\Query\Filter\Condition');
|
||||
class_alias('Bitrix\Main\ORM\Query\Filter\ConditionTree', 'Bitrix\Main\Entity\Query\Filter\ConditionTree');
|
||||
class_alias('Bitrix\Main\ORM\Query\Filter\Helper', 'Bitrix\Main\Entity\Query\Filter\Helper');
|
||||
class_alias('Bitrix\Main\ORM\Query\Filter\Operator', 'Bitrix\Main\Entity\Query\Filter\Operator');
|
||||
'Bitrix\Main\Entity\Query\Filter\Condition' => 'Bitrix\Main\ORM\Query\Filter\Condition',
|
||||
'Bitrix\Main\Entity\Query\Filter\ConditionTree' => 'Bitrix\Main\ORM\Query\Filter\ConditionTree',
|
||||
'Bitrix\Main\Entity\Query\Filter\Helper' => 'Bitrix\Main\ORM\Query\Filter\Helper',
|
||||
'Bitrix\Main\Entity\Query\Filter\Operator' => 'Bitrix\Main\ORM\Query\Filter\Operator',
|
||||
|
||||
class_alias('Bitrix\Main\ORM\Query\Expression', 'Bitrix\Main\Entity\Query\Expression');
|
||||
class_alias('Bitrix\Main\ORM\Query\Join', 'Bitrix\Main\Entity\Query\Join');
|
||||
class_alias('Bitrix\Main\ORM\Query\Union', 'Bitrix\Main\Entity\Query\Union');
|
||||
class_alias('Bitrix\Main\ORM\Query\UnionCondition', 'Bitrix\Main\Entity\Query\UnionCondition');
|
||||
'Bitrix\Main\Entity\Query\Expression' => 'Bitrix\Main\ORM\Query\Expression',
|
||||
'Bitrix\Main\Entity\Query\Join' => 'Bitrix\Main\ORM\Query\Join',
|
||||
'Bitrix\Main\Entity\Query\Union' => 'Bitrix\Main\ORM\Query\Union',
|
||||
'Bitrix\Main\Entity\Query\UnionCondition' => 'Bitrix\Main\ORM\Query\UnionCondition',
|
||||
|
||||
class_alias('Bitrix\Main\ORM\Entity', 'Bitrix\Main\Entity\Base');
|
||||
class_alias('Bitrix\Main\ORM\EntityError', 'Bitrix\Main\Entity\EntityError');
|
||||
class_alias('Bitrix\Main\ORM\Event', 'Bitrix\Main\Entity\Event');
|
||||
class_alias('Bitrix\Main\ORM\EventResult', 'Bitrix\Main\Entity\EventResult');
|
||||
'Bitrix\Main\Entity\Base' => 'Bitrix\Main\ORM\Entity',
|
||||
'Bitrix\Main\Entity\EntityError' => 'Bitrix\Main\ORM\EntityError',
|
||||
'Bitrix\Main\Entity\Event' => 'Bitrix\Main\ORM\Event',
|
||||
'Bitrix\Main\Entity\EventResult' => 'Bitrix\Main\ORM\EventResult',
|
||||
|
||||
\Bitrix\Main\Loader::registerAutoLoadClasses(
|
||||
'Bitrix\Main\ORM\UField' => 'Bitrix\Main\Entity\UField',
|
||||
'Bitrix\Main\Type\ArrayHelper' => 'Bitrix\Main\Type\Collection',
|
||||
]);
|
||||
|
||||
Loader::registerAutoLoadClasses(
|
||||
"main", ["Bitrix\\Main\\Entity\\UField" => "include/deprecated/ufield.php"]
|
||||
);
|
||||
|
||||
class_alias('Bitrix\Main\Entity\UField', 'Bitrix\Main\ORM\UField');
|
||||
|
||||
class_alias('Bitrix\Main\Type\Collection', 'Bitrix\Main\Type\ArrayHelper');
|
||||
|
||||
Reference in New Issue
Block a user