Fix translation memory constant name (#94)

worldia · Dec 15, 2016 · dec7c31 · dec7c31
1 parent ba3e073
commit dec7c31
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/lib/Textmaster/CallbackHandler.php b/lib/Textmaster/CallbackHandler.php
@@ -86,19 +86,20 @@ public function handleWebHook(Request $request = null)
         }
 
         $data = json_decode($request->getContent(), true);
-        $event = $this->getEvent($data);
+        $event = $this->getEvent($data, $request->get('event'));
 
         $this->dispatcher->dispatch($event->getName(), $event);
     }
 
     /**
-     * Get event name and object from request data.
+     * Get event from request data.
      *
-     * @param array $data
+     * @param array       $data
+     * @param string|null $event
      *
      * @return CallbackEvent
      */
-    private function getEvent(array $data)
+    private function getEvent(array $data, $event = null)
     {
         if (array_key_exists('name', $data)) {
             $type = 'project';
@@ -110,7 +111,11 @@ private function getEvent(array $data)
             throw new InvalidArgumentException(sprintf('Could not determine callback type from "%s".', serialize($data)));
         }
 
-        $name = sprintf('textmaster.%s.%s', $type, $data['status']);
+        if (null === $event) {
+            $event = $data['status'];
+        }
+
+        $name = sprintf('textmaster.%s.%s', $type, $event);
         $resource = new $this->classes[$type]($this->client, $data);
 
         return new CallbackEvent($name, $resource, $data);

diff --git a/lib/Textmaster/Events.php b/lib/Textmaster/Events.php
@@ -130,7 +130,7 @@ final class Events
      * Triggered when project option "translation_memory" is completed.
      * Useful for asynchronous launching.
      */
-    const PROJECT_TM_COMPLETED = 'textmaster.project.tm_completed';
+    const PROJECT_MEMORY_COMPLETED = 'textmaster.project.tm_completed';
 
     /**
      * Get all existing events for documents.
@@ -164,7 +164,7 @@ public static function getProjectEvents()
     {
         return [
             self::PROJECT_IN_PROGRESS,
-            self::PROJECT_TM_COMPLETED,
+            self::PROJECT_MEMORY_COMPLETED,
         ];
     }
 }
diff --git a/lib/Textmaster/Model/Project.php b/lib/Textmaster/Model/Project.php
@@ -179,7 +179,7 @@ public static function getAllowedCallbacks()
     {
         return [
             self::CALLBACK_PROJECT_IN_PROGRESS,
-            self::CALLBACK_PROJECT_TM_COMPLETED,
+            self::CALLBACK_PROJECT_MEMORY_COMPLETED,
         ];
     }
 

diff --git a/lib/Textmaster/Model/ProjectInterface.php b/lib/Textmaster/Model/ProjectInterface.php
@@ -24,14 +24,15 @@ interface ProjectInterface extends AbstractObjectInterface
     const ACTIVITY_PROOFREADING = 'proofreading';
 
     const STATUS_IN_CREATION = 'in_creation';
+    const STATUS_MEMORY_COMPLETED = 'tm_completed';
     const STATUS_IN_PROGRESS = 'in_progress';
     const STATUS_IN_REVIEW = 'in_review';
     const STATUS_COMPLETED = 'completed';
     const STATUS_PAUSED = 'paused';
     const STATUS_CANCELED = 'canceled';
 
     const CALLBACK_PROJECT_IN_PROGRESS = 'project_in_progress';
-    const CALLBACK_PROJECT_TM_COMPLETED = 'project_tm_completed';
+    const CALLBACK_PROJECT_MEMORY_COMPLETED = 'project_tm_completed';
 
     /**
      * Save the project.