Sfoglia il codice sorgente

Fixed deprecated usages

Stepan Anchugov 11 anni fa
parent
commit
c0c6c216ab

+ 3 - 0
Admin/AdminExtensionInterface.php

@@ -70,8 +70,11 @@ interface AdminExtensionInterface
     public function validate(AdminInterface $admin, ErrorElement $errorElement, $object);
 
     /**
+     * @param AdminInterface      $admin
      * @param ProxyQueryInterface $query
      * @param string              $context
+     *
+     * @return mixed
      */
     public function configureQuery(AdminInterface $admin, ProxyQueryInterface $query, $context = 'list');
 

+ 1 - 1
Admin/AdminHelper.php

@@ -99,7 +99,7 @@ class AdminHelper
 
         $form = $formBuilder->getForm();
         $form->setData($subject);
-        $form->bind($admin->getRequest());
+        $form->submit($admin->getRequest());
 
         // get the field element
         $childFormBuilder = $this->getChildFormBuilder($formBuilder, $elementId);

+ 3 - 3
Controller/CRUDController.php

@@ -305,7 +305,7 @@ class CRUDController extends Controller
         $form->setData($object);
 
         if ($this->getRestMethod() == 'POST') {
-            $form->bind($this->get('request'));
+            $form->submit($this->get('request'));
 
             $isFormValid = $form->isValid();
 
@@ -507,7 +507,7 @@ class CRUDController extends Controller
         $form->setData($object);
 
         if ($this->getRestMethod()== 'POST') {
-            $form->bind($this->get('request'));
+            $form->submit($this->get('request'));
 
             $isFormValid = $form->isValid();
 
@@ -811,7 +811,7 @@ class CRUDController extends Controller
 
         $request = $this->getRequest();
         if ($request->getMethod() === 'POST') {
-            $form->bind($request);
+            $form->submit($request);
 
             if ($form->isValid()) {
                 $adminObjectAclManipulator->updateAcl($adminObjectAclData);

+ 1 - 1
Controller/HelperController.php

@@ -140,7 +140,7 @@ class HelperController
         $formBuilder = $admin->getFormBuilder($subject);
 
         $form = $formBuilder->getForm();
-        $form->bind($request);
+        $form->submit($request);
 
         $view = $this->helper->getChildFormView($form->createView(), $elementId);
 

+ 1 - 1
Datagrid/Datagrid.php

@@ -110,7 +110,7 @@ class Datagrid implements DatagridInterface
         $this->formBuilder->add('_per_page', 'hidden');
 
         $this->form = $this->formBuilder->getForm();
-        $this->form->bind($this->values);
+        $this->form->submit($this->values);
 
         $data = $this->form->getData();
 

+ 1 - 1
Form/ChoiceList/ModelChoiceList.php

@@ -134,7 +134,7 @@ class ModelChoiceList extends SimpleChoiceList
         foreach ($entities as $key => $entity) {
             if ($this->propertyPath) {
                 // If the property option was given, use it
-                $propertyAccessor = PropertyAccess::getPropertyAccessor();
+                $propertyAccessor = PropertyAccess::createPropertyAccessor();
                 $value = $propertyAccessor->getValue($entity, $this->propertyPath);
             } else {
                  // Otherwise expect a __toString() method in the entity

+ 1 - 1
Form/EventListener/MergeCollectionListener.php

@@ -36,7 +36,7 @@ class MergeCollectionListener implements EventSubscriberInterface
     public static function getSubscribedEvents()
     {
         return array(
-            FormEvents::BIND => array('onBind', 10),
+            FormEvents::SUBMIT => array('onBind', 10),
         );
     }
 

+ 1 - 1
Tests/Form/Type/ModelTypeListTest.php

@@ -12,7 +12,7 @@
 namespace Sonata\AdminBundle\Tests\Form\Type;
 
 use Sonata\AdminBundle\Form\Type\ModelTypeList;
-use Symfony\Component\Form\Tests\Extension\Core\Type\TypeTestCase;
+use Symfony\Component\Form\Test\TypeTestCase;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class ModelTypeListTest extends TypeTestCase

+ 1 - 1
Tests/Form/Type/ModelTypeTest.php

@@ -13,7 +13,7 @@ namespace Sonata\AdminBundle\Tests\Form\Type;
 
 use Sonata\AdminBundle\Form\Type\ModelType;
 
-use Symfony\Component\Form\Tests\Extension\Core\Type\TypeTestCase;
+use Symfony\Component\Form\Test\TypeTestCase;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class ModelTypeTest extends TypeTestCase

+ 1 - 1
Validator/ErrorElement.php

@@ -151,7 +151,7 @@ class ErrorElement
             return $this->subject;
         }
 
-        $propertyAccessor = PropertyAccess::getPropertyAccessor();
+        $propertyAccessor = PropertyAccess::createPropertyAccessor();
         return $propertyAccessor->getValue($this->subject, $this->getCurrentPropertyPath());
     }