浏览代码

修复无法自动注册扩展问题

jqh 4 年之前
父节点
当前提交
ae10f2a2c8
共有 2 个文件被更改,包括 3 次插入3 次删除
  1. 2 2
      src/Extend/Manager.php
  2. 1 1
      src/Extend/ServiceProvider.php

+ 2 - 2
src/Extend/Manager.php

@@ -302,10 +302,10 @@ class Manager
     public function addExtension(ServiceProvider $serviceProvider)
     {
         if (! $serviceProvider->getName()) {
-            $json = dirname(Helper::guessClassFileName($serviceProvider)).'/composer.json';
+            $json = dirname(dirname(Helper::guessClassFileName($serviceProvider))).'/composer.json';
 
             if (! is_file($json)) {
-                throw new RuntimeException('Error extension "%s"', get_class($serviceProvider));
+                throw new RuntimeException(sprintf('Error extension "%s"', get_class($serviceProvider)));
             }
 
             $serviceProvider->withComposerProperty(Composer::parse($json));

+ 1 - 1
src/Extend/ServiceProvider.php

@@ -126,7 +126,7 @@ abstract class ServiceProvider extends LaravelServiceProvider
      */
     protected function autoRegister()
     {
-        if (! $this->getName()) {
+        if ($this->getName()) {
             return;
         }