Merge branch '4.1'

* 4.1:
  [VarDumper] fix dump of closures created from callables
  [DI] fix dumping inlined services
  Add framework asset changes to upgrade 3.0 guide
  [Travis] Bump ext-mongodb to 1.5.2 on Travis
  [DI] dont track classes/interfaces used to compute autowiring error messages
  [DI] fix GraphvizDumper ignoring inline definitions
  bumped Symfony version to 4.1.8
  updated VERSION for 4.1.7
  updated CHANGELOG for 4.1.7
  bumped Symfony version to 3.4.19
  updated VERSION for 3.4.18
  updated CHANGELOG for 3.4.18
  bumped Symfony version to 2.8.48
  updated VERSION for 2.8.47
  update CONTRIBUTORS for 2.8.47
  updated CHANGELOG for 2.8.47
  Fix ini_get() for boolean values

Author: nicolas-grekas

Command/AboutCommand.php

@@ -83,8 +83,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
             array('Architecture', (PHP_INT_SIZE * 8).' bits'),
             array('Intl locale', class_exists('Locale', false) && \Locale::getDefault() ? \Locale::getDefault() : 'n/a'),
             array('Timezone', date_default_timezone_get().' (<comment>'.(new \DateTime())->format(\DateTime::W3C).'</>)'),
-            array('OPcache', \extension_loaded('Zend OPcache') && ini_get('opcache.enable') ? 'true' : 'false'),
-            array('APCu', \extension_loaded('apcu') && ini_get('apc.enabled') ? 'true' : 'false'),
+            array('OPcache', \extension_loaded('Zend OPcache') && filter_var(ini_get('opcache.enable'), FILTER_VALIDATE_BOOLEAN) ? 'true' : 'false'),
+            array('APCu', \extension_loaded('apcu') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? 'true' : 'false'),
             array('Xdebug', \extension_loaded('xdebug') ? 'true' : 'false'),
         );
 

Console/Descriptor/JsonDescriptor.php

@@ -344,6 +344,20 @@ private function getCallableData($callable, array $options = array()): array
         if ($callable instanceof \Closure) {
             $data['type'] = 'closure';
 
+            $r = new \ReflectionFunction($callable);
+            if (false !== strpos($r->name, '{closure}')) {
+                return $data;
+            }
+            $data['name'] = $r->name;
+
+            $class = ($class = $r->getClosureThis()) ? \get_class($class) : null;
+            if ($scopeClass = $r->getClosureScopeClass() ?: $class) {
+                $data['class'] = $scopeClass;
+                if (!$class) {
+                    $data['static'] = true;
+                }
+            }
+
             return $data;
         }
 

Console/Descriptor/MarkdownDescriptor.php

@@ -353,6 +353,20 @@ protected function describeCallable($callable, array $options = array())
         if ($callable instanceof \Closure) {
             $string .= "\n- Type: `closure`";
 
+            $r = new \ReflectionFunction($callable);
+            if (false !== strpos($r->name, '{closure}')) {
+                return $this->write($string."\n");
+            }
+            $string .= "\n".sprintf('- Name: `%s`', $r->name);
+
+            $class = ($class = $r->getClosureThis()) ? \get_class($class) : null;
+            if ($scopeClass = $r->getClosureScopeClass() ?: $class) {
+                $string .= "\n".sprintf('- Class: `%s`', $class);
+                if (!$class) {
+                    $string .= "\n- Static: yes";
+                }
+            }
+
             return $this->write($string."\n");
         }
 

Console/Descriptor/TextDescriptor.php

@@ -57,12 +57,7 @@ protected function describeRouteCollection(RouteCollection $routes, array $optio
 
             if ($showControllers) {
                 $controller = $route->getDefault('_controller');
-                if ($controller instanceof \Closure) {
-                    $controller = 'Closure';
-                } elseif (\is_object($controller)) {
-                    $controller = \get_class($controller);
-                }
-                $row[] = $controller;
+                $row[] = $this->formatCallable($controller);
             }
 
             $tableRows[] = $row;
@@ -464,7 +459,18 @@ private function formatCallable($callable): string
         }
 
         if ($callable instanceof \Closure) {
-            return '\Closure()';
+            $r = new \ReflectionFunction($callable);
+            if (false !== strpos($r->name, '{closure}')) {
+                return 'Closure()';
+            }
+            if ($class = $r->getClosureScopeClass()) {
+                return sprintf('%s::%s()', $class, $r->name);
+            }
+            if ($class = $r->getClosureThis()) {
+                return sprintf('%s::%s()', \get_class($class), $r->name);
+            }
+
+            return $r->name.'()';
         }
 
         if (method_exists($callable, '__invoke')) {

Console/Descriptor/XmlDescriptor.php

@@ -524,6 +524,20 @@ private function getCallableDocument($callable): \DOMDocument
         if ($callable instanceof \Closure) {
             $callableXML->setAttribute('type', 'closure');
 
+            $r = new \ReflectionFunction($callable);
+            if (false !== strpos($r->name, '{closure}')) {
+                return $dom;
+            }
+            $callableXML->setAttribute('name', $r->name);
+
+            $class = ($class = $r->getClosureThis()) ? \get_class($class) : null;
+            if ($scopeClass = $r->getClosureScopeClass() ?: $class) {
+                $callableXML->setAttribute('class', $class);
+                if (!$class) {
+                    $callableXML->setAttribute('static', 'true');
+                }
+            }
+
             return $dom;
         }
 

Tests/Fixtures/Descriptor/callable_6.txt

@@ -1 +1 @@
-\Closure()
+Closure()

Tests/Fixtures/Descriptor/event_dispatcher_1_event1.txt

@@ -6,6 +6,6 @@
   Order   Callable            Priority  
  ------- ------------------- ---------- 
   #1      global_function()   255       
-  #2      \Closure()          -1        
+  #2      Closure()           -1        
  ------- ------------------- ---------- 
 

Tests/Fixtures/Descriptor/event_dispatcher_1_events.txt

@@ -9,7 +9,7 @@
   Order   Callable            Priority  
  ------- ------------------- ---------- 
   #1      global_function()   255       
-  #2      \Closure()          -1        
+  #2      Closure()           -1        
  ------- ------------------- ---------- 
 
 "event2" event