瀏覽代碼

Fix validator

Guillermo Espinoza 8 年之前
父節點
當前提交
14542d9115
共有 3 個文件被更改,包括 27 次插入8 次删除
  1. 1 1
      Resources/config/services.yml
  2. 24 0
      Validator/Constraints/Device.php
  3. 2 7
      Validator/DeviceValidator.php

+ 1 - 1
Resources/config/services.yml

@@ -1,6 +1,6 @@
 services:
     validators.device_validator:
-        class: ValidatorsBundle\Validator\DeviceValidator
+        class: ValidatorsBundle\Validator\Constraints\DeviceValidator
         arguments: ["@webservice","%device_check_url%"]
         tags:
             - { name: validator.constraint_validator }

+ 24 - 0
Validator/Constraints/Device.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace ValidatorsBundle\Validator\Constraints;
+
+use Symfony\Component\Validator\Constraint;
+
+/**
+ * @Annotation
+ */
+class Device extends Constraint
+{
+
+    public $message = 'error.device_create';
+
+
+    /**
+     * @return string
+     */
+    public function getTargets()
+    {
+        return self::CLASS_CONSTRAINT;
+    }
+
+}

+ 2 - 7
Validator/DeviceValidator.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ValidatorsBundle\Validator;
+namespace ValidatorsBundle\Validator\Constraints;
 
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
@@ -9,11 +9,6 @@ use WebserviceBundle\Services\Webservice;
 class DeviceValidator extends ConstraintValidator
 {
 
-    /**
-     * @var string
-     */
-    private $message = 'error.device_create';
-
     /**
      * @var string
      */
@@ -44,7 +39,7 @@ class DeviceValidator extends ConstraintValidator
         $result = $this->webservice->makeGetRequest($this->deviceCheckUrl);
         $data = json_decode($result, true);
         if ($data['result'] == false) {
-            $this->context->buildViolation($constraint->message ? $constraint->message : $this->message)
+            $this->context->buildViolation($constraint->message)
                     ->addViolation();
         }
     }