minor #1634 Revert ServiceIteraror in Security provider voters (hkdobrev)

This PR was merged into the 2.3.x-dev branch.

Discussion
----------

Revert ServiceIteraror in Security provider voters

Reverts https://github.com/silexphp/Silex/pull/1614.
Reopens https://github.com/silexphp/Silex/issues/1530.
See problems and discussed solutions in https://github.com/silexphp/Silex/pull/1619.

Commits
-------

83ff03e9 Revert ServiceIteraror in Security provider voters

doc/changelog.rst

@@ -5,7 +5,6 @@ Changelog
 ------------------
 
  * added support for defining users provider as a service ID
- * added support for ServiceIterator in Security provider for voters
  * fixed error when HttpKernelRuntime is not available
  * allow setting custom status code on exception response with Symfony 3.3+
  * made CSRF extension work with Validator translations domain

doc/providers/security.rst

@@ -695,32 +695,6 @@ Symfony `cookbook`_.
     providers. :doc:`How to Create a Custom Authentication System with Guard
     </cookbook/guard_authentication>`
 
-Using Voters to check User Permissions
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-See the `Security component documentation on voters <http://symfony.com/doc/current/security/voters.html>`_.
-
-By default Silex includes the role hierarchy and authenticated voters. If you
-want to add a custom voter, you need to register it as a service and extend
-``security.voter_services``::
-
-    $app['custom_voter'] = function () {
-        return MyCustomVoter();
-    };
-
-    $app->extend('security.voter_services', function (array $voters) {
-        $voters[] = 'custom_voter';
-
-        return $voters;
-    });
-
-.. note::
-
-    Using the above approach with the service names, circular references are
-    avoided and you can use the ``AccessDecisionManager`` in your custom voter
-    to `check for roles inside a voter
-    <http://symfony.com/doc/current/security/voters.html#checking-for-roles-inside-a-voter>`_.
-
 Stateless Authentication
 ~~~~~~~~~~~~~~~~~~~~~~~~
 

src/Silex/Provider/SecurityServiceProvider.php

@@ -12,7 +12,6 @@
 namespace Silex\Provider;
 
 use Pimple\Container;
-use Pimple\ServiceIterator;
 use Pimple\ServiceProviderInterface;
 use Silex\Application;
 use Silex\Api\BootableProviderInterface;
@@ -142,29 +141,14 @@ class SecurityServiceProvider implements ServiceProviderInterface, EventListener
         };
 
         $app['security.access_manager'] = function ($app) {
-            $votersIterator = new ServiceIterator($app, $app['security.voter_services']);
-
-            return new AccessDecisionManager($votersIterator);
-        };
-
-        $app['security.voter_services'] = function () {
-            return [RoleHierarchyVoter::class, AuthenticatedVoter::class];
-        };
-
-        $app[RoleHierarchyVoter::class] = function ($app) {
-            return new RoleHierarchyVoter(new RoleHierarchy($app['security.role_hierarchy']));
-        };
-
-        $app[AuthenticatedVoter::class] = function ($app) {
-            return new AuthenticatedVoter($app['security.trust_resolver']);
+            return new AccessDecisionManager($app['security.voters']);
         };
 
-        // Unused, kept for backwards-compatibility
-        // Extend security.voter_services instead to prevent circular references
         $app['security.voters'] = function ($app) {
-            return array_map(function ($voterServiceId) use ($app) {
-                return $app[$voterServiceId];
-            });
+            return [
+                new RoleHierarchyVoter(new RoleHierarchy($app['security.role_hierarchy'])),
+                new AuthenticatedVoter($app['security.trust_resolver']),
+            ];
         };
 
         $app['security.firewall'] = function ($app) {