Fix validator call

FriendsOfCake · Apr 22, 2018 · ff684ab · ff684ab
1 parent 6251162
commit ff684ab
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Model/Behavior/UploadBehavior.php b/src/Model/Behavior/UploadBehavior.php
@@ -58,7 +58,7 @@ public function initialize(array $config)
      */
     public function beforeMarshal(Event $event, ArrayObject $data, ArrayObject $options)
     {
-        $validator = $this->_table->validator();
+        $validator = $this->_table->getValidator();
         $dataArray = $data->getArrayCopy();
         foreach (array_keys($this->getConfig(null, [])) as $field) {
             if (!$validator->isEmptyAllowed($field, false)) {

diff --git a/tests/TestCase/Model/Behavior/UploadBehaviorTest.php b/tests/TestCase/Model/Behavior/UploadBehaviorTest.php
@@ -178,7 +178,7 @@ public function testBeforeMarshalOk()
 
         $table = $this->getMockBuilder('Cake\ORM\Table')->getMock();
         $table->expects($this->once())
-                    ->method('validator')
+                    ->method('getValidator')
                     ->will($this->returnValue($validator));
 
         $methods = array_diff($this->behaviorMethods, ['beforeMarshal']);
@@ -204,7 +204,7 @@ public function testBeforeMarshalError()
 
         $table = $this->getMockBuilder('Cake\ORM\Table')->getMock();
         $table->expects($this->once())
-                    ->method('validator')
+                    ->method('getValidator')
                     ->will($this->returnValue($validator));
 
         $methods = array_diff($this->behaviorMethods, ['beforeMarshal']);
@@ -230,7 +230,7 @@ public function testBeforeMarshalEmptyAllowed()
 
         $table = $this->getMockBuilder('Cake\ORM\Table')->getMock();
         $table->expects($this->once())
-                    ->method('validator')
+                    ->method('getValidator')
                     ->will($this->returnValue($validator));
 
         $methods = array_diff($this->behaviorMethods, ['beforeMarshal']);