From be9a8cd7d611062a737430b4f14c1d0cf194352c Mon Sep 17 00:00:00 2001 From: Mozgito Date: Thu, 9 Jun 2022 14:10:58 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B0=D0=B2=D1=82=D0=BE=D0=B7=D0=B0?= =?UTF-8?q?=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=B8=20=D0=BA=D0=BB=D0=B0=D1=81?= =?UTF-8?q?=D1=81=D0=BE=D0=B2=20=D0=B4=D0=BB=D1=8F=20=D0=BC=D1=83=D0=BB?= =?UTF-8?q?=D1=8C=D1=82=D0=B8=D1=81=D0=B0=D0=B9=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- intaro.retailcrm/RetailcrmClasspathBuilder.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/intaro.retailcrm/RetailcrmClasspathBuilder.php b/intaro.retailcrm/RetailcrmClasspathBuilder.php index 82220357..0d02f0d2 100644 --- a/intaro.retailcrm/RetailcrmClasspathBuilder.php +++ b/intaro.retailcrm/RetailcrmClasspathBuilder.php @@ -33,6 +33,11 @@ class RetailcrmClasspathBuilder */ protected $path = 'classes/general'; + /** + * @var string + */ + protected $bitrixModulesPath = 'bitrix/modules'; + /** * Do not include directory paths as namespaces. * @var bool @@ -272,7 +277,8 @@ class RetailcrmClasspathBuilder */ protected function getSearchPath(): string { - return __DIR__ . DIRECTORY_SEPARATOR . $this->path; + return $this->documentRoot . DIRECTORY_SEPARATOR . $this->bitrixModulesPath . DIRECTORY_SEPARATOR + . $this->moduleId. DIRECTORY_SEPARATOR . $this->path; } /** @@ -284,8 +290,7 @@ class RetailcrmClasspathBuilder { return (string) str_ireplace(implode(DIRECTORY_SEPARATOR, [ $this->documentRoot, - 'bitrix', - 'modules', + $this->bitrixModulesPath, $this->moduleId ]) . DIRECTORY_SEPARATOR, '', $filePath); }