bug #35243 [HttpKernel] release lock explicitly (nicolas-grekas)

fabpot · fabpot · commit 290ce00f96df · 2020-01-07T20:30:23.000+01:00
This PR was merged into the 4.4 branch. Discussion ---------- [HttpKernel] release lock explicitly | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #35242 | License | MIT | Doc PR | - Commits ------- 6fb5581 [HttpKernel] release lock explicitly
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -556,7 +556,7 @@ public function write($content, array $metadata = null)
                             }
                         }
 
-                        public function __destruct()
+                        public function release()
                         {
                             flock($this->lock, LOCK_UN);
                             fclose($this->lock);
@@ -634,7 +634,7 @@ public function __destruct()
         }
 
         $this->dumpContainer($cache, $container, $class, $this->getContainerBaseClass());
-        unset($cache);
+        $cache->release();
         $this->container = require $cachePath;
         $this->container->set('kernel', $this);
 

Original file line number	Diff line number	Diff line change
`@@ -556,7 +556,7 @@ public function write($content, array $metadata = null)`
`556`	`556`	`}`
`557`	`557`	`}`
`558`	`558`
`559`		`- public function __destruct()`
	`559`	`+ public function release()`
`560`	`560`	`{`
`561`	`561`	`flock($this->lock, LOCK_UN);`
`562`	`562`	`fclose($this->lock);`
`@@ -634,7 +634,7 @@ public function __destruct()`
`634`	`634`	`}`
`635`	`635`
`636`	`636`	`$this->dumpContainer($cache, $container, $class, $this->getContainerBaseClass());`
`637`		`- unset($cache);`
	`637`	`+ $cache->release();`
`638`	`638`	`$this->container = require $cachePath;`
`639`	`639`	`$this->container->set('kernel', $this);`
`640`	`640`