Revert "Add deprecation notices"

This reverts commit a3becc8.
sonata-project · Nov 27, 2020 · 93ff8f2 · 93ff8f2
1 parent a3becc8
commit 93ff8f2
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 35 deletions.
diff --git a/src/Admin/AbstractAdmin.php b/src/Admin/AbstractAdmin.php
@@ -391,8 +391,6 @@ abstract class AbstractAdmin implements AdminInterface, DomainObjectInterface, A
     protected $securityHandler;
 
     /**
-     * NEXT_MAJOR: Remove this property.
-     *
      * @var ValidatorInterface
      */
     protected $validator;
@@ -2850,19 +2848,8 @@ public function id($model)
         return $this->getNormalizedIdentifier($model);
     }
 
-    /**
-     * NEXT_MAJOR: Remove this method.
-     */    
     public function setValidator($validator)
     {
-
-
-        @trigger_error(sprintf(
-            'The %s method is deprecated since version 3.x and will be removed in 4.0.',
-            __METHOD__
-        ), E_USER_DEPRECATED);
-
-
         // NEXT_MAJOR: Move ValidatorInterface check to method signature
         if (!$validator instanceof ValidatorInterface) {
             throw new \InvalidArgumentException(sprintf(
@@ -2874,17 +2861,8 @@ public function setValidator($validator)
         $this->validator = $validator;
     }
 
-    /**
-     * NEXT_MAJOR: Remove this method.
-     */    
     public function getValidator()
     {
-
-        @trigger_error(sprintf(
-            'The %s method is deprecated since version 3.x and will be removed in 4.0.',
-            __METHOD__
-        ), E_USER_DEPRECATED);
-
         return $this->validator;
     }
 

diff --git a/src/Admin/AdminInterface.php b/src/Admin/AdminInterface.php
@@ -328,22 +328,14 @@ public function getNormalizedIdentifier($model);
     public function id($model);
 
     /**
-     * NEXT_MAJOR: remove this method.
-     *
      * @param ValidatorInterface $validator
      *
      * @return void
-     *
-     * @deprecated since sonata-project/admin-bundle 3.x.
      */
     public function setValidator($validator);
 
     /**
-     * NEXT_MAJOR: remove this method.
-     *
      * @return ValidatorInterface
-     *
-     * @deprecated since sonata-project/admin-bundle 3.x.
      */
     public function getValidator();
 

diff --git a/src/DependencyInjection/Compiler/AddDependencyCallsCompilerPass.php b/src/DependencyInjection/Compiler/AddDependencyCallsCompilerPass.php
@@ -219,8 +219,6 @@ static function (array $a, array $b): int {
     /**
      * NEXT_MAJOR: Change visibility to private.
      *
-     * NEXT_MAJOR: Remove validator attribute key.
-     *
      * This method read the attribute keys and configure admin class to use the related dependency.
      */
     public function applyConfigurationFromAttribute(Definition $definition, array $attributes)
@@ -255,8 +253,6 @@ public function applyConfigurationFromAttribute(Definition $definition, array $a
     /**
      * NEXT_MAJOR: Change visibility to private.
      *
-     * NEXT_MAJOR: Remove validator from $defaultAddServices.
-     *
      * Apply the default values required by the AdminInterface to the Admin service definition.
      *
      * @param string $serviceId

diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -353,7 +353,6 @@ public function getConfigTreeBuilder()
                             ->scalarNode('translator')->defaultNull()->end()
                             ->scalarNode('configuration_pool')->defaultNull()->end()
                             ->scalarNode('route_generator')->defaultNull()->end()
-                            // NEXT_MAJOR: remove validator option
                             ->scalarNode('validator')->defaultNull()->end()
                             ->scalarNode('security_handler')->defaultNull()->end()
                             ->scalarNode('label')->defaultNull()->end()