merged branch fabpot/random-leaks (PR #8948)

fabpot · fabpot · commit c753d68771af · 2013-09-06T20:17:18.000+02:00
This PR was merged into the 2.2 branch.

Discussion
----------

Fixed some random leaks

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

Commits
-------

970405f fixed some circular references
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php
@@ -50,6 +50,8 @@ public function collect(Request $request, Response $response, \Exception $except
                 $this->data['route'] = $this->guessRoute($request, $this->controllers[$request]);
             }
         }
+
+        unset($this->controllers[$request]);
     }
 
     protected function guessRoute(Request $request, $controller)
diff --git a/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php b/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php
@@ -135,6 +135,8 @@ public function onKernelResponse(FilterResponseEvent $event)
 
         if ($master) {
             $this->saveProfiles($profile);
+
+            unset($this->children);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,8 @@ public function collect(Request $request, Response $response, \Exception $except`
`50`	`50`	`$this->data['route'] = $this->guessRoute($request, $this->controllers[$request]);`
`51`	`51`	`}`
`52`	`52`	`}`
	`53`	`+`
	`54`	`+ unset($this->controllers[$request]);`
`53`	`55`	`}`
`54`	`56`
`55`	`57`	`protected function guessRoute(Request $request, $controller)`
Original file line number	Diff line number	Diff line change
`@@ -135,6 +135,8 @@ public function onKernelResponse(FilterResponseEvent $event)`
`135`	`135`
`136`	`136`	`if ($master) {`
`137`	`137`	`$this->saveProfiles($profile);`
	`138`	`+`
	`139`	`+ unset($this->children);`
`138`	`140`	`}`
`139`	`141`	`}`
`140`	`142`