Merge pull request #35 from albinvar/dev

Fix few known errors
albinvar · Feb 18, 2022 · a09eaf6 · a09eaf6
2 parents 8a4c39b + 48224c2
commit a09eaf6
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 26 deletions.
diff --git a/app/Commands/ComposerGlobal.php b/app/Commands/ComposerGlobal.php
@@ -51,7 +51,7 @@ public function handle(): void
 
     public function setString(): void
     {
-        $this->string = "\n" . config('path');
+        $this->string = "\n" . config('composer.PATH_CONFIG');
     }
 
     /**

diff --git a/app/Commands/Installer/Wordpress.php b/app/Commands/Installer/Wordpress.php
@@ -37,7 +37,7 @@ class Wordpress extends Command
     /**
      * Execute the console command.
      */
-    public function handle(): mixed
+    public function handle()
     {
         $this->callSilently('settings:init');
         $this->wordpress = config('wordpress.PATH');

diff --git a/app/Commands/PmaInstaller.php b/app/Commands/PmaInstaller.php
@@ -10,6 +10,7 @@
 use App\Helpers\Zipper;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Support\Facades\File;
+use Illuminate\Support\Facades\Storage;
 use LaravelZero\Framework\Commands\Command;
 
 class PmaInstaller extends Command
@@ -137,7 +138,6 @@ private function getUrl()
             return false;
         }
         return 'https://files.phpmyadmin.net/phpMyAdmin/'.$this->version.'/phpMyAdmin-'.$this->version.'-all-languages.zip';
-        //return 'http://127.0.0.1:8999/phpMyAdmin-5.1.1-all-languages.zip';
     }
 
     private function download(): void
@@ -188,7 +188,7 @@ private function runTasks(): void
         });
 
         $this->task('Setting PhpMyAdmin root ', function () {
-            if ($this->pma->updateRoot(\Storage::disk('local')->getAdapter()->getPathPrefix().'/www/phpMyAdmin-' . $this->version . '-all-languages')) {
+            if ($this->pma->updateRoot(Storage::disk('local')->path('/www/phpMyAdmin-' . $this->version . '-all-languages'))) {
                 return true;
             }
             return false;

diff --git a/app/Helpers/ComposerPackageInstaller.php b/app/Helpers/ComposerPackageInstaller.php
@@ -47,7 +47,7 @@ public function install(): void
     {
         if (is_bool($this->path)) {
             try {
-                $this->mainPath = Storage::disk('projects')->getAdapter()->getPathPrefix() . $this->frameworkDisk;
+                $this->mainPath = Storage::disk('projects')->path($this->frameworkDisk);
             } catch (\Exception $e) {
                 $this->mainPath = '/sdcard/www';
             }

diff --git a/builds/webzone b/builds/webzone
diff --git a/config/composer.php b/config/composer.php
@@ -0,0 +1,16 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | PATH Environment Variable
+    |--------------------------------------------------------------------------
+    |
+    | used on bash.bashrc
+    |
+    */
+     'PATH_CONFIG' => 'export PATH="/data/data/com.termux/files/home/.composer/vendor/bin:$PATH"'
+
+
+];
diff --git a/config/laravel-installer.php b/config/laravel-installer.php
@@ -2,7 +2,7 @@
 
 return [
 
-	/*
+    /*
     |--------------------------------------------------------------------------
     | Laravel Name
     |--------------------------------------------------------------------------
@@ -11,8 +11,8 @@
     |
     */
      'NAME' => 'laravel',
-     
-	/*
+
+    /*
     |--------------------------------------------------------------------------
     | Laravel Installer full Path
     |--------------------------------------------------------------------------
@@ -21,7 +21,7 @@
     |
     */
      'FULl_PATH' => '/data/data/com.termux/files/home/.composer/vendor/bin/laravel',
-     
+
      /*
     |--------------------------------------------------------------------------
     | Laravel Installer Path
@@ -31,7 +31,7 @@
     |
     */
      'PATH' => '/data/data/com.termux/files/home/.composer/vendor/bin',
-     
+
      /*
     |--------------------------------------------------------------------------
     | Laravel installer Package Name
@@ -41,4 +41,4 @@
     |
     */
      'PACKAGE_NAME' => 'laravel/installer',
-];
+];
diff --git a/config/manager.php b/config/manager.php
@@ -21,7 +21,7 @@
     */
      'PATH' => 'manager',
      'FULL-PATH' => '/data/data/com.termux/files/usr/var/webzone/manager',
-     
+
      /*
     |--------------------------------------------------------------------------
     | File Manager Port

diff --git a/config/php-cs-fixer.php b/config/php-cs-fixer.php
@@ -2,7 +2,7 @@
 
 return [
 
-	/*
+    /*
     |--------------------------------------------------------------------------
     | PHP-CS-FIXER Name
     |--------------------------------------------------------------------------
@@ -11,8 +11,8 @@
     |
     */
      'NAME' => 'php-cs-fixer',
-     
-	/*
+
+    /*
     |--------------------------------------------------------------------------
     | PHP-CS-FIXER full Path
     |--------------------------------------------------------------------------
@@ -21,7 +21,7 @@
     |
     */
      'FULl_PATH' => '/data/data/com.termux/files/home/.composer/vendor/bin/php-cs-fixer',
-     
+
      /*
     |--------------------------------------------------------------------------
     | PHP-CS-FIXER Path
@@ -31,7 +31,7 @@
     |
     */
      'PATH' => '/data/data/com.termux/files/home/.composer/vendor/bin',
-     
+
      /*
     |--------------------------------------------------------------------------
     | PHP-CS-FIXER Package Name
@@ -41,4 +41,4 @@
     |
     */
      'PACKAGE_NAME' => 'friendsofphp/php-cs-fixer',
-];
+];
diff --git a/config/phpstan-installer.php b/config/phpstan-installer.php
@@ -2,7 +2,7 @@
 
 return [
 
-	/*
+    /*
     |--------------------------------------------------------------------------
     | Phpstan Name
     |--------------------------------------------------------------------------
@@ -11,8 +11,8 @@
     |
     */
      'NAME' => 'phpstan',
-     
-	/*
+
+    /*
     |--------------------------------------------------------------------------
     | Phpstan full Path
     |--------------------------------------------------------------------------
@@ -21,7 +21,7 @@
     |
     */
      'FULl_PATH' => '/data/data/com.termux/files/home/.composer/vendor/bin/phpstan',
-     
+
      /*
     |--------------------------------------------------------------------------
     | Phpstan installation Path
@@ -31,7 +31,7 @@
     |
     */
      'PATH' => '/data/data/com.termux/files/home/.composer/vendor/bin',
-     
+
      /*
     |--------------------------------------------------------------------------
     | Laravel installer Package Name
@@ -41,4 +41,4 @@
     |
     */
      'PACKAGE_NAME' => 'phpstan/phpstan',
-];
+];
diff --git a/config/symfony.php b/config/symfony.php
@@ -23,10 +23,10 @@
     */
 
     'CLI_PATH' => '/data/data/com.termux/files/usr/bin/symfony',
-    
+
     /*
     |--------------------------------------------------------------------------
-    | Path which all commands are stored. 
+    | Path which all commands are stored.
     |--------------------------------------------------------------------------
     |
     | location of symfony cli.
-Original file line number
+Diff line change
@@ Expand Up / @@ -51,7 +51,7 @@ public function handle(): void @@
         public function setString(): void
         {
-            $this->string = "\n" . config('path');
+            $this->string = "\n" . config('composer.PATH_CONFIG');
         }
         /**
@@ Expand Down @@