as2252258/kiri-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

modify

Browse Source
This commit is contained in:
as2252258@163.com
2021-04-08 00:40:59 +08:00
parent 482581b97b
commit 3b01e2dabc
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Annotation/Loader.php
+4 -3
View File
@@ -143,7 +143,6 @@ class Loader extends BaseObject
continue; continue;
} }
try { try {
$this->appendFileToDirectory($path->getRealPath());
$replace = Snowflake::getDi()->getReflect($this->explodeFileName($path, $namespace)); $replace = Snowflake::getDi()->getReflect($this->explodeFileName($path, $namespace));
if (empty($replace) || !$replace->isInstantiable()) { if (empty($replace) || !$replace->isInstantiable()) {
@@ -153,6 +152,7 @@ class Loader extends BaseObject
if (!$replace->getAttributes(Target::class)) { if (!$replace->getAttributes(Target::class)) {
continue; continue;
} }
$this->appendFileToDirectory($path->getRealPath(), $replace->getName());
$_array = ['handler' => $replace->newInstanceWithoutConstructor(), 'target' => [], 'methods' => [], 'property' => []]; $_array = ['handler' => $replace->newInstanceWithoutConstructor(), 'target' => [], 'methods' => [], 'property' => []];
foreach ($replace->getAttributes() as $attribute) { foreach ($replace->getAttributes() as $attribute) {
@@ -293,8 +293,9 @@ class Loader extends BaseObject
/** /**
* @param string $filePath * @param string $filePath
* @param string $className
*/ */
public function appendFileToDirectory(string $filePath) public function appendFileToDirectory(string $filePath, string $className)
{ {
$DIRECTORY = explode(DIRECTORY_SEPARATOR, $filePath); $DIRECTORY = explode(DIRECTORY_SEPARATOR, $filePath);
array_pop($DIRECTORY); array_pop($DIRECTORY);
@@ -303,7 +304,7 @@ class Loader extends BaseObject
foreach ($DIRECTORY as $value) { foreach ($DIRECTORY as $value) {
$path = $this->makeMoneyDirectoryArray($path, $value); $path = $this->makeMoneyDirectoryArray($path, $value);
$this->_directoryMap[$path][] = $filePath; $this->_directoryMap[$path][] = $className;
} }
} }