Merge pull request #130 from ingatlancom/sfAutoload-hhvm

j0k3r · web-flow · commit 43ac110a4258 · 2016-07-18T14:33:17.000+02:00
sfAutoload include: eval only if forced on HHVM
diff --git a/lib/autoload/sfAutoload.class.php b/lib/autoload/sfAutoload.class.php
@@ -138,7 +138,7 @@ public function reloadClasses($force = false)
 
     $file = $configuration->getConfigCache()->checkConfig('config/autoload.yml');
 
-    if (defined('HHVM_VERSION'))
+    if ($force && defined('HHVM_VERSION'))
     {
       // workaround for https://github.com/facebook/hhvm/issues/1447
       $this->classes = eval(str_replace('<?php', '', file_get_contents($file)));

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ public function reloadClasses($force = false)`
`138`	`138`
`139`	`139`	`$file = $configuration->getConfigCache()->checkConfig('config/autoload.yml');`
`140`	`140`
`141`		`- if (defined('HHVM_VERSION'))`
	`141`	`+ if ($force && defined('HHVM_VERSION'))`
`142`	`142`	`{`
`143`	`143`	`// workaround for https://github.com/facebook/hhvm/issues/1447`
`144`	`144`	`$this->classes = eval(str_replace('<?php', '', file_get_contents($file)));`