Merge pull request #1 from leafsphp/feat/sprout-rewrite

Feat/sprout rewrite

Author: mychidarko

composer.json

@@ -30,5 +30,8 @@
 	"prefer-stable": true,
     "require-dev": {
         "leafs/alchemy": "^2.2"
+    },
+    "require": {
+        "leafs/sprout": "^0.6.0"
     }
 }

src/Billing/Commands/ConfigBillingComand.php

@@ -2,15 +2,15 @@
 
 namespace Leaf\Billing\Commands;
 
-use Aloe\Command;
+use Leaf\Sprout\Command;
 use Symfony\Component\Yaml\Yaml;
 
 class ConfigBillingComand extends Command
 {
-    protected static $defaultName = 'config:billing';
-    public $description = 'Scaffold billing plans on payment provider';
+    protected $signature = 'config:billing';
+    protected $description = 'Scaffold billing plans on payment provider';
 
-    public $help = 'This command will scaffold billing plans on the payment provider. It will also cache your plans in storage/billing';
+    protected $help = 'This command will scaffold billing plans on the payment provider. It will also cache your plans in storage/billing';
 
     protected function handle()
     {

src/Billing/Commands/ScaffoldSubscriptionsCommand.php

@@ -2,21 +2,16 @@
 
 namespace Leaf\Billing\Commands;
 
-use Aloe\Command;
+use Leaf\Sprout\Command;
 use Symfony\Component\Yaml\Yaml;
 
 class ScaffoldSubscriptionsCommand extends Command
 {
-    protected static $defaultName = 'scaffold:subscriptions';
-    public $description = 'Scaffold billing plans for subscriptions';
+    protected $signature = 'scaffold:subscriptions
+        {--scaffold=default : Which scaffold to use for subscriptions (default/react/vue/svelte)}';
+    protected $description = 'Scaffold billing plans for subscriptions';
 
-    public $help = "This command will scaffold billing plans for your application. You can choose between different scaffolds like default, react, vue, svelte etc.";
-
-    protected function config()
-    {
-        $this
-            ->setOption('scaffold', 's', 'optional', 'Which scaffold to use for authentication (default/react/vue/svelte)', 'default');
-    }
+    protected $help = "This command will scaffold billing plans for your application. You can choose between different scaffolds like default, react, vue, svelte etc.";
 
     protected function handle()
     {
@@ -38,12 +33,21 @@ protected function handle()
 
         $this->info("Scaffolding subscriptions using $scaffold + $type");
 
-        \Aloe\Installer::magicCopy(__DIR__ . "/themes/subscriptions/$type");
-        \Aloe\Installer::magicCopy(__DIR__ . "/themes/$scaffold");
+        \Leaf\FS\Directory::copy(
+            __DIR__ . "/themes/subscriptions/$type",
+            getcwd(),
+            ['recursive' => true]
+        );
+
+        \Leaf\FS\Directory::copy(
+            __DIR__ . "/themes/$scaffold",
+            getcwd(),
+            ['recursive' => true]
+        );
 
         $this->info('Scaffold generated successfully, running subscription schemas...');
 
-        \Aloe\Core::run('php leaf db:migrate subscriptions', $this->output());
+        sprout()->process('php leaf db:migrate subscriptions')->run();
 
         if (\Leaf\FS\File::exists($usersSchema = "$directory/app/database/users.yml")) {
             $data = Yaml::parseFile($usersSchema);
@@ -59,7 +63,7 @@ protected function handle()
             }
         }
 
-        \Aloe\Core::run('php leaf db:migrate users', $this->output());
+        sprout()->process('php leaf db:migrate users')->run();
 
         return 0;
     }