Merge branch 'dev'

# Conflicts:
#	configs/versions.php

classes/Dvelum/App/Backend/Designer/Module/Objects.php

@@ -20,6 +20,7 @@
 namespace Dvelum\App\Backend\Designer\Module;
 
 use Dvelum\App\Backend\Designer\Module;
+use Dvelum\Designer\Factory;
 use Dvelum\Designer\Manager;
 use Dvelum\Designer\Project;
 use Dvelum\Designer\Project\Container;
@@ -526,7 +527,7 @@ protected function getRelatedProjects($project, & $list)
                 }
 
                 $projectFile = $manager->findWorkingCopy($file);
-                $subProject = \Designer_Factory::loadProject($this->designerConfig, $projectFile);
+                $subProject = Factory::loadProject($this->designerConfig, $projectFile);
                 $list[] = [
                     'project' => $subProject,
                     'file' => $file
@@ -551,6 +552,7 @@ public function relatedProjectListAction()
 
         if (empty($relatedProjects)) {
             $this->response->success([]);
+            return;
         }
 
         $result = [];

classes/Dvelum/App/Backend/Designer/Module/Project.php

@@ -19,6 +19,7 @@
 
 namespace Dvelum\App\Backend\Designer\Module;
 
+use Dvelum\App\Backend\Designer\Generator\Component;
 use Dvelum\App\Backend\Designer\Module;
 use Dvelum\App\Backend\Localization\Manager;
 use Dvelum\Config;
@@ -448,7 +449,7 @@ public function addTemplateAction()
 
         $adapterObject = new $adapter();
 
-        if (!$adapterObject instanceof \Backend_Designer_Generator_Component) {
+        if (!$adapterObject instanceof Component) {
             $this->response->error($this->lang->get('WRONG_REQUEST') . ' invalid adapter interface');
             return;
         }

composer.json

@@ -1,6 +1,6 @@
 {
   "name": "dvelum/module-designer",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "type": "dvelum3-module",
   "description": "Designer module for DVelum",
   "keywords": ["dvelum","designer"],

configs/designer_templates.php

@@ -1,10 +1,11 @@
 <?php
-return array(
-	array(
-	   'icon'=>'',
-	   'text' => 'Window Form',
-	   'iconCls'=>'objectWindowIcon',
-	   'adapter'=>'Backend_Designer_Generator_Component_Window',
-	   'showType'=>'loaded'
-    )
-);
+
+return [
+    [
+        'icon' => '',
+        'text' => 'Window Form',
+        'iconCls' => 'objectWindowIcon',
+        'adapter' => \Dvelum\App\Backend\Designer\Generator\Component\Window::class,
+        'showType' => 'loaded'
+    ]
+];

configs/versions.php

@@ -1,4 +1,4 @@
 <?php
 return [
-    'designer' => '1.5.7'
+    'designer' => '1.6.1'
 ];