Merge branch '4.2'

* 4.2:
  update years in license files
  Fix: Adjust DocBlock
  \"ParserTest->getParserTestData()\" -> only some more tests
  access the container getting it from the kernel
  Replace slave and master by replica and primary
  Fix erasing cookies issue
  [Lock] Pedantic improvements for lock
  [EventDispatcher] Fixed phpdoc on interface
  update year in license files
  [VarExporter] fix exporting array indexes
  [SecurityBundle] Fix traceable voters
  [Console] Fix help text for single command applications
  Fix random test failure on lock
  improve error message when using test client without the BrowserKit component
  Fixed minor typos in an error message
  [Event Dispatcher] fixed 29703: TraceableEventDispatcher reset now sets callStack to null with test to dispatch after reset.
  Fixed minor typos
  Fix: Method can also return null
  [Stopwatch] Fixed phpdoc for category name

Author: xabbuh

DependencyInjection/Compiler/AddSecurityVotersPass.php

@@ -44,7 +44,7 @@ public function process(ContainerBuilder $container)
         }
 
         $debug = $container->getParameter('kernel.debug');
-
+        $voterServices = array();
         foreach ($voters as $voter) {
             $voterServiceId = (string) $voter;
             $definition = $container->getDefinition($voterServiceId);
@@ -56,17 +56,18 @@ public function process(ContainerBuilder $container)
             }
 
             if ($debug) {
-                // Decorate original voters with TraceableVoter
-                $debugVoterServiceId = 'debug.security.voter.'.$voterServiceId;
+                $voterServices[] = new Reference($debugVoterServiceId = 'debug.security.voter.'.$voterServiceId);
+
                 $container
                     ->register($debugVoterServiceId, TraceableVoter::class)
-                    ->setDecoratedService($voterServiceId)
-                    ->addArgument(new Reference($debugVoterServiceId.'.inner'))
+                    ->addArgument($voter)
                     ->addArgument(new Reference('event_dispatcher'));
+            } else {
+                $voterServices[] = $voter;
             }
         }
 
-        $adm = $container->getDefinition('security.access.decision_manager');
-        $adm->replaceArgument(0, new IteratorArgument($voters));
+        $container->getDefinition('security.access.decision_manager')
+            ->replaceArgument(0, new IteratorArgument($voterServices));
     }
 }

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2004-2018 Fabien Potencier
+Copyright (c) 2004-2019 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Tests/DependencyInjection/Compiler/AddSecurityVotersPassTest.php

@@ -72,10 +72,7 @@ public function testThatSecurityVotersAreProcessedInPriorityOrder()
         $this->assertCount(4, $refs);
     }
 
-    /**
-     * Test that in debug mode, voters are correctly decorated.
-     */
-    public function testThatVotersAreDecoratedInDebugMode(): void
+    public function testThatVotersAreTraceableInDebugMode(): void
     {
         $container = new ContainerBuilder();
 
@@ -96,21 +93,18 @@ public function testThatVotersAreDecoratedInDebugMode(): void
         $compilerPass->process($container);
 
         $def1 = $container->getDefinition('debug.security.voter.voter1');
-        $this->assertEquals(array('voter1', null, 0), $def1->getDecoratedService(), 'voter1: wrong return from getDecoratedService');
-        $this->assertEquals(new Reference('debug.security.voter.voter1.inner'), $def1->getArgument(0), 'voter1: wrong decorator argument');
+        $this->assertNull($def1->getDecoratedService(), 'voter1: should not be decorated');
+        $this->assertEquals(new Reference('voter1'), $def1->getArgument(0), 'voter1: wrong argument');
 
         $def2 = $container->getDefinition('debug.security.voter.voter2');
-        $this->assertEquals(array('voter2', null, 0), $def2->getDecoratedService(), 'voter2: wrong return from getDecoratedService');
-        $this->assertEquals(new Reference('debug.security.voter.voter2.inner'), $def2->getArgument(0), 'voter2: wrong decorator argument');
+        $this->assertNull($def2->getDecoratedService(), 'voter2: should not be decorated');
+        $this->assertEquals(new Reference('voter2'), $def2->getArgument(0), 'voter2: wrong argument');
 
         $voters = $container->findTaggedServiceIds('security.voter');
         $this->assertCount(2, $voters, 'Incorrect count of voters');
     }
 
-    /**
-     * Test that voters are not decorated if the application is not in debug mode.
-     */
-    public function testThatVotersAreNotDecoratedWithoutDebugMode(): void
+    public function testThatVotersAreNotTraceableWithoutDebugMode(): void
     {
         $container = new ContainerBuilder();
         $container->setParameter('kernel.debug', false);
@@ -130,8 +124,8 @@ public function testThatVotersAreNotDecoratedWithoutDebugMode(): void
         $compilerPass = new AddSecurityVotersPass();
         $compilerPass->process($container);
 
-        $this->assertFalse($container->has('debug.security.voter.voter1'), 'voter1 should not be decorated');
-        $this->assertFalse($container->has('debug.security.voter.voter2'), 'voter2 should not be decorated');
+        $this->assertFalse($container->has('debug.security.voter.voter1'), 'voter1 should not be traced');
+        $this->assertFalse($container->has('debug.security.voter.voter2'), 'voter2 should not be traced');
     }
 
     /**