From 0dfe4fb5c6e366dac6a146476cd3e54a0d609ae1 Mon Sep 17 00:00:00 2001
From: JaguarJack <njphper@gmail.com>
Date: Thu, 19 Nov 2020 17:44:11 +0800
Subject: [PATCH] fixed

---
 extend/catcher/generate/Generator.php          | 2 +-
 extend/catcher/generate/factory/Controller.php | 3 +--
 extend/catcher/library/Composer.php            | 3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/extend/catcher/generate/Generator.php b/extend/catcher/generate/Generator.php
index 425ab94..c413c2a 100644
--- a/extend/catcher/generate/Generator.php
+++ b/extend/catcher/generate/Generator.php
@@ -97,7 +97,7 @@ class Generator
 
         switch ($type) {
             case 'controller':
-                return (new Controller())->dones();
+                return (new Controller())->getContent($controller);
             case 'model':
                 return (new Model())->getContent($model);
             default:
diff --git a/extend/catcher/generate/factory/Controller.php b/extend/catcher/generate/factory/Controller.php
index 74149a7..7cfdbd8 100644
--- a/extend/catcher/generate/factory/Controller.php
+++ b/extend/catcher/generate/factory/Controller.php
@@ -86,9 +86,8 @@ class Controller extends Factory
                                     }
 
                                     $class->addProperty(
-                                        (new Property($asModel))->public()
+                                        (new Property($asModel))->protected()
                                     );
-
                                 })
                                 ->getContent();
     }
diff --git a/extend/catcher/library/Composer.php b/extend/catcher/library/Composer.php
index aaf716c..839c8d2 100644
--- a/extend/catcher/library/Composer.php
+++ b/extend/catcher/library/Composer.php
@@ -58,8 +58,7 @@ class Composer
     {
         $packages = array_merge($this->requires(), $this->requireDev());
 
-
-        return in_array($name, $packages);
+        return in_array($name, array_keys($packages));
     }
 
     /**