This commit is contained in:
2021-08-05 16:30:45 +08:00
parent b2e3f7442a
commit 73a452fdf1
3 changed files with 9 additions and 6 deletions
+3 -4
View File
@@ -8,7 +8,6 @@ use DirectoryIterator;
use Exception; use Exception;
use ReflectionException; use ReflectionException;
use Snowflake\Abstracts\Component; use Snowflake\Abstracts\Component;
use Snowflake\Exception\NotFindClassException;
/** /**
* Class Annotation * Class Annotation
@@ -179,13 +178,13 @@ class Annotation extends Component
/** /**
* @param string $path * @param string $path
* @param string $namespace * @param string $namespace
* @param string $alias * @param array $exclude
* @return void * @return void
* @throws Exception * @throws Exception
*/ */
public function read(string $path, string $namespace = 'App', string $alias = 'root'): void public function read(string $path, string $namespace = 'App', array $exclude = []): void
{ {
$this->_loader->_scanDir(new DirectoryIterator($path), $namespace); $this->_loader->_scanDir(new DirectoryIterator($path), $namespace, $exclude);
} }
+5 -1
View File
@@ -95,14 +95,18 @@ class Loader extends BaseObject
/** /**
* @param DirectoryIterator $paths * @param DirectoryIterator $paths
* @param $namespace * @param $namespace
* @param array $exclude
* @throws Exception * @throws Exception
*/ */
public function _scanDir(DirectoryIterator $paths, $namespace) public function _scanDir(DirectoryIterator $paths, $namespace, array $exclude = [])
{ {
foreach ($paths as $path) { foreach ($paths as $path) {
if ($path->isDot() || str_starts_with($path->getFilename(), '.')) { if ($path->isDot() || str_starts_with($path->getFilename(), '.')) {
continue; continue;
} }
if ($this->inExclude($exclude, $path->getRealPath())) {
continue;
}
if ($path->isDir()) { if ($path->isDir()) {
$iterator = new DirectoryIterator($path->getRealPath()); $iterator = new DirectoryIterator($path->getRealPath());
$directory = rtrim($path->getRealPath(), '/'); $directory = rtrim($path->getRealPath(), '/');
+1 -1
View File
@@ -98,7 +98,7 @@ if (!function_exists('scan_directory')) {
function scan_directory($dir, $namespace, array $exclude = []) function scan_directory($dir, $namespace, array $exclude = [])
{ {
$annotation = Snowflake::app()->getAnnotation(); $annotation = Snowflake::app()->getAnnotation();
$annotation->read($dir, $namespace); $annotation->read($dir, $namespace, $exclude);
injectRuntime($dir, $exclude); injectRuntime($dir, $exclude);
} }