Merge pull request #4 from ascheider/master

Fixed all the created issues

Author: thornwishstalon

src/QuickTranslateBundle/Controller/DefaultController.php

@@ -22,10 +22,9 @@ public function getAuthKeyAction()
     {
         $authKey = WebsiteSetting::getByName("deepl_auth_key") ? WebsiteSetting::getByName("deepl_auth_key")->getData() : null;
 
-        JsonResponse::create([
+        return JsonResponse::create([
                 "authKey" => $authKey,
                 "exists" => (($authKey == null || "") ? false : true),
-        ])->send();
-
+        ]);
     }
 }

src/QuickTranslateBundle/Controller/DocumentController.php

@@ -36,9 +36,9 @@ public function checkIfExistsAction(Request $request)
             $exists = false;
         }
 
-        JsonResponse::create([
+        return JsonResponse::create([
             "exists" => $exists
-        ])->send();
+        ]);
 
     }
 
@@ -56,13 +56,13 @@ public function getDocumentElementsAction(Request $request)
             $id = $document->getContentMasterDocumentId() != null ? $document->getContentMasterDocumentId() : $document->getId();
 
             $brickName = $request->get("brickName");
-            $elems = $db->fetchAll("SELECT name, type, data 
-                                        FROM documents_elements 
+            $elems = $db->fetchAll("SELECT name, type, data
+                                        FROM documents_elements
                                         WHERE documentId=" . $document->getId() . " AND (type='input' OR type='textarea' OR type='wysiwyg') AND name LIKE '" . $brickName . "%'");
 
             if ($elems == null && $document->getContentMasterDocumentId() != null) {
-                $elems = $db->fetchAll("SELECT name, type, data 
-                                        FROM documents_elements 
+                $elems = $db->fetchAll("SELECT name, type, data
+                                        FROM documents_elements
                                         WHERE documentId=" . $document->getContentMasterDocumentId() . " AND (type='input' OR type='textarea' OR type='wysiwyg') AND name LIKE '" . $brickName . "%'");
             }
 
@@ -71,13 +71,13 @@ public function getDocumentElementsAction(Request $request)
 
         } else {
 
-            $elems = $db->fetchAll("SELECT name, type, data 
-                                        FROM documents_elements 
+            $elems = $db->fetchAll("SELECT name, type, data
+                                        FROM documents_elements
                                         WHERE documentId=" . $request->get("id") . " AND (type='input' OR type='textarea' OR type='wysiwyg')");
 
             if ($elems == null && $document->getContentMasterDocumentId() != null) {
-                $elems = $db->fetchAll("SELECT name, type, data 
-                                        FROM documents_elements 
+                $elems = $db->fetchAll("SELECT name, type, data
+                                        FROM documents_elements
                                         WHERE documentId=" . $document->getContentMasterDocumentId() . " AND (type='input' OR type='textarea' OR type='wysiwyg')");
             }
         }
@@ -90,14 +90,11 @@ public function getDocumentElementsAction(Request $request)
             ];
         }
 
-        $response = JsonResponse::create([
+        return JsonResponse::create([
             "elements" => $elements,
             "langTo" => ($isBrick ? $langTo : null),
             "type" => ($isBrick ? $type : null)
         ]);
-
-        $response->send();
-
     }
 
 
@@ -117,12 +114,10 @@ public function saveBrickAction(Request $request)
 
         $document->save();
 
-        $response = JsonResponse::create([
+        return JsonResponse::create([
             "success" => true
         ]);
 
-        $response->send();
-
     }
 
 
@@ -245,20 +240,18 @@ public function saveDocumentAction(Request $request)
                 }
             }
 
-            $response = JsonResponse::create([
+            return JsonResponse::create([
                 'success' => $success,
                 'id' => $document->getId(),
                 'type' => $document->getType(),
                 'parentId' => $document->getParentId()
             ]);
-            $response->send();
 
         } else {
-            $response = JsonResponse::create([
+            return JsonResponse::create([
                 'success' => $success,
                 'message' => $errorMessage
             ]);
-            $response->send();
         }
     }
 }

src/QuickTranslateBundle/Controller/ObjectController.php

@@ -34,10 +34,10 @@ public function translateObjectAction(Request $request)
 
             $item->save();
 
-            JsonResponse::create("true")->send();
+            return JsonResponse::create("true");
 
         } catch (\Exception $e) {
-            JsonResponse::create("false")->send();
+            return JsonResponse::create("false");
         }
 
     }

src/QuickTranslateBundle/Resources/config/pimcore/routing.yml

@@ -1,24 +1,24 @@
 asioso_quick_translate_object:
     path:     /asioso_quick_translate_object
-    defaults: { _controller: AsiosoQuickTranslateBundle:Object:translateObject }
+    defaults: { _controller: QuickTranslateBundle:Object:translateObject }
 
 asioso_quick_translate_document:
     path:     /asioso_quick_translate_document
-    defaults: { _controller: AsiosoQuickTranslateBundle:Document:saveDocument }
+    defaults: { _controller: QuickTranslateBundle:Document:saveDocument }
 
 asioso_quick_translate_brick:
     path:     /asioso_quick_translate_brick
-    defaults: { _controller: AsiosoQuickTranslateBundle:Document:saveBrick }
+    defaults: { _controller: QuickTranslateBundle:Document:saveBrick }
 
 asioso_quick_translate_get_document_elements:
     path:     /asioso_quick_translate_get_document_elements
-    defaults: { _controller: AsiosoQuickTranslateBundle:Document:getDocumentElements }
+    defaults: { _controller: QuickTranslateBundle:Document:getDocumentElements }
 
 asioso_quick_translate_check_if_exists:
     path:     /asioso_quick_translate_check_if_exists
-    defaults: { _controller: AsiosoQuickTranslateBundle:Document:checkIfExists }
+    defaults: { _controller: QuickTranslateBundle:Document:checkIfExists }
 
 asioso_quick_translate_get_auth_key:
     path:     /asioso_quick_translate_get_auth_key
-    defaults: { _controller: AsiosoQuickTranslateBundle:Default:getAuthKey }
+    defaults: { _controller: QuickTranslateBundle:Default:getAuthKey }