Merge branch '2.1'

ezpublishlegacy · Apr 30, 2018 · 7335114 · 7335114
2 parents 5971539 + db5e3ec
commit 7335114
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/bundle/EzSystemsRepositoryFormsBundle.php b/bundle/EzSystemsRepositoryFormsBundle.php
@@ -8,7 +8,6 @@
  */
 namespace EzSystems\RepositoryFormsBundle;
 
-use EzSystems\RepositoryForms\Security\UserRegisterPolicyProvider;
 use EzSystems\RepositoryFormsBundle\DependencyInjection\Compiler\FieldTypeFormMapperDispatcherPass;
 use EzSystems\RepositoryFormsBundle\DependencyInjection\Compiler\LimitationFormMapperPass;
 use EzSystems\RepositoryFormsBundle\DependencyInjection\Compiler\LimitationValueMapperPass;
@@ -33,7 +32,6 @@ public function build(ContainerBuilder $container)
         $container->addCompilerPass(new ViewBuilderRegistryPass());
 
         $eZExtension = $container->getExtension('ezpublish');
-        $eZExtension->addPolicyProvider(new UserRegisterPolicyProvider());
         $eZExtension->addConfigParser(new UserRegistration());
         $eZExtension->addConfigParser(new ContentEdit());
         $eZExtension->addConfigParser(new UserEdit());

diff --git a/lib/Security/UserRegisterPolicyProvider.php b/lib/Security/UserRegisterPolicyProvider.php
@@ -11,12 +11,14 @@
 use eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Security\PolicyProvider\PolicyProviderInterface;
 
 /**
+ * @deprecated Deprecated since 2.1. No longer used. This policy was moved to the eZ/Publish/Core/settings/policies.yml.
+ *
  * Adds the user/register policy.
  */
 class UserRegisterPolicyProvider implements PolicyProviderInterface
 {
     public function addPolicies(ConfigBuilderInterface $configBuilder)
     {
-        $configBuilder->addConfig(['user' => ['register' => null]]);
+        @trigger_error('Method ' . __METHOD__ . ' is deprecated since 2.1', E_USER_DEPRECATED);
     }
 }