Добавление вендора в базовый неймспейс

Author: Sergey Surkov

composer.json

@@ -5,7 +5,7 @@
     "symbiotic/ui_backend": "1.*"
   },
   "license": "MIT",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "autoload": {
     "psr-4": {
       "Symbiotic\\Develop\\": "src/"
@@ -22,7 +22,7 @@
         "name": "Develop",
         "routing": "\\Symbiotic\\Develop\\Routing",
         "controllers_namespace": "\\Symbiotic\\Develop\\Http\\Controllers",
-        "version": "1.0.0",
+        "version": "1.2.1",
         "providers": [
           "\\Symbiotic\\Develop\\Providers\\AppProvider"
         ],

src/Http/Controllers/Backend/Index.php

@@ -3,6 +3,7 @@
 
 
 use Symbiotic\Apps\ApplicationInterface;
+use Symbiotic\Core\CoreInterface;
 use Symbiotic\Core\Events\CacheClear;
 use Symbiotic\Core\View\View;
 use function _DS\event;
@@ -20,9 +21,24 @@ public function index(ApplicationInterface $app)
 
     }
 
-    public function cache_clean()
+    public function cache_clean(CoreInterface $app)
     {
         event(new CacheClear('all'));
-        return 'Ложки не существует!';
+        $path = $app('cache_path');
+
+        $files = new \RecursiveIteratorIterator(
+            new \RecursiveDirectoryIterator($path, \RecursiveDirectoryIterator::SKIP_DOTS),
+            \RecursiveIteratorIterator::CHILD_FIRST
+        );
+        $result = [];
+        /**
+         * @var \SplFileInfo $file
+         */
+        foreach ($files as $file) {
+            $result[] = $file->getRealPath();
+
+        }
+
+        return $result;
     }
 }

src/Http/Controllers/Backend/PackagesBuilding/PackagesCreator.php

@@ -5,6 +5,7 @@
 
 use Symbiotic\Apps\ApplicationInterface;
 use Symbiotic\Core\CoreInterface;
+use Symbiotic\Core\Support\Str;
 use Symbiotic\Develop\Services\Packages\Builder\PackageCreatorBuilder;
 
 use Symbiotic\Http\ServerRequest;
@@ -41,15 +42,22 @@ public function create(ServerRequest $request, CoreInterface $app, PackageCreato
         if (!is_dir($packages_path) || !is_writable($packages_path)) {
             throw  new \Exception('Директория приложений не существует или не доступная для записи [' . $packages_path . ']!');
         }
+
         $vendor = $request->getInput('vendor');
         $package_name = $request->getInput('package_name');
         $name = $request->getInput('name');
+
         $package = $builder->createAppPackage(
             $packages_path,
             \strtolower($package_name),
             $name
         );
+
         $package->withVendor($vendor);
+
+        if($vendor !== 'symbiotic') {
+            $package->setBaseNamespace(ucfirst(Str::camel($vendor)).'\\'.ucfirst(Str::camel($package_name)));
+        }
         $package->withPackageName($package_name);
 
         if (!empty($request->getInput('with_demo'))) {

src/Routing.php

@@ -17,21 +17,17 @@ public function backendRoutes(RouterInterface $router)
         $router->group([ 'namespace' => 'Backend'], function(RouterInterface $router){
             $router->get('/timer/', [
                 'uses' => 'Monitor@json',
-                'as' => 'monitor.json',
-                'secure' => false
+                'as' => 'monitor.json'
             ]);
             $router->get('/phpinfo/', [
                 'uses' => 'Monitor@phpinfo',
-                'as' => 'monitor.phpinfo',
-                'secure' => false
+                'as' => 'monitor.phpinfo'
             ]);
             $router->get('/cache/clean/', [
                 'uses' => 'Index@cache_clean',
-                'as' => 'cache.clean',
-                'secure' => false
+                'as' => 'cache.clean'
             ]);
 
-
             $router->group(['prefix' => '/apps', 'as' => 'apps'], function(RouterInterface $router){
                 $router->get('{app_id}/routes', [
                     'uses' => 'Apps@routes',

src/Services/Debug/Timer.php

@@ -37,7 +37,7 @@ public function end(string $name)
     {
         if (!isset($this->timers[$name]))
         {
-            throw new \LogicException("Сначала запуститте таймер start('$name')");
+            $this->timers[$name] = [];
         }
         if(isset($this->timers[$name]['end'])) {
             return $this;

src/Services/Packages/Builder/SymbioticPackageCreator.php

@@ -2,6 +2,7 @@
 
 namespace Symbiotic\Develop\Services\Packages\Builder;
 
+use Symbiotic\Core\Support\Str;
 use function dirname;
 use function trim;
 use const _DS\DS;
@@ -315,7 +316,7 @@ protected function getStubClassContent(string $path, array $replaces)
     protected function getBaseNamespace(): string
     {
         if (!$this->base_namespace) {
-            $this->base_namespace = 'Symbiotic\\Module\\' . \ucfirst(\strtolower($this->packege_id));
+            $this->base_namespace = 'Symbiotic\\Module\\' . \ucfirst(Str::camel($this->packege_id));
         }
 
         return $this->base_namespace;