From 0fb83af015705a52c847c34725216ae24a9a5cd0 Mon Sep 17 00:00:00 2001 From: Marin Nicolae Date: Fri, 2 Mar 2018 12:25:15 +0000 Subject: [PATCH 1/3] [WebProfilerBundle] fix wrong variable for profiler counting ajax requests --- .../Resources/views/Profiler/base_js.html.twig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig index ac4d6cd522..780dad0cb4 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig @@ -108,9 +108,9 @@ var rows = document.createDocumentFragment(); if (requestStack.length) { - var nbOfAjaxRequest = tbodies.rows.length; + var nbOfAjaxRequest = tbody.rows.length; if (nbOfAjaxRequest >= 100) { - tbodies.deleteRow(nbOfAjaxRequest - 1); + tbody.deleteRow(nbOfAjaxRequest - 1); } for (var i = 0; i < requestStack.length; i++) { From 0b748fac95b2540c52ab8afa6c12fedbd05a34d2 Mon Sep 17 00:00:00 2001 From: Robin Chalas Date: Sun, 4 Mar 2018 04:14:33 +0100 Subject: [PATCH 2/3] [DI] Skip resource tracking if disabled --- .../Component/DependencyInjection/ContainerBuilder.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php index 678aa37e08..512abd1d27 100644 --- a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php +++ b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php @@ -346,9 +346,11 @@ class ContainerBuilder extends Container implements TaggedContainerInterface try { if (isset($this->classReflectors[$class])) { $classReflector = $this->classReflectors[$class]; - } else { + } elseif ($this->trackResources) { $resource = new ClassExistenceResource($class, false); $classReflector = $resource->isFresh(0) ? false : new \ReflectionClass($class); + } else { + $classReflector = new \ReflectionClass($class); } } catch (\ReflectionException $e) { if ($throw) { From cc3084ed65d77a16bee47d254a994b20e3c28f8a Mon Sep 17 00:00:00 2001 From: Matthieu Napoli Date: Sun, 4 Mar 2018 16:13:29 +0100 Subject: [PATCH 3/3] Improve the documentation of `Finder::exclude()` --- src/Symfony/Component/Finder/Finder.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Symfony/Component/Finder/Finder.php b/src/Symfony/Component/Finder/Finder.php index 7b4d71d74e..8eb75fca62 100644 --- a/src/Symfony/Component/Finder/Finder.php +++ b/src/Symfony/Component/Finder/Finder.php @@ -386,6 +386,10 @@ class Finder implements \IteratorAggregate, \Countable /** * Excludes directories. * + * Directories passed as argument must be relative to the ones defined with the `in()` method. For example: + * + * $finder->in(__DIR__)->exclude('ruby'); + * * @param string|array $dirs A directory path or an array of directories * * @return $this