Remove HHVM compatibility

Nek- · Nek- · commit 09ad255a019e · 2017-06-17T18:07:38.000+02:00
This PR removes HHVM compatiblity following #22758 It also removes some unneeded comments
diff --git a/src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php b/src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php
@@ -62,7 +62,7 @@ function ($key, $value, $isHit) {
      */
     public static function create($file, CacheItemPoolInterface $fallbackPool)
     {
-        // Shared memory is available in PHP 7.0+ with OPCache enabled and in HHVM
+        // Shared memory is available in PHP 7.0+ with OPCache enabled
         if (ini_get('opcache.enable')) {
             if (!$fallbackPool instanceof AdapterInterface) {
                 $fallbackPool = new ProxyAdapter($fallbackPool);
diff --git a/src/Symfony/Component/Cache/Simple/PhpArrayCache.php b/src/Symfony/Component/Cache/Simple/PhpArrayCache.php
@@ -45,7 +45,7 @@ public function __construct($file, CacheInterface $fallbackPool)
      */
     public static function create($file, CacheInterface $fallbackPool)
     {
-        // Shared memory is available in PHP 7.0+ with OPCache enabled and in HHVM
+        // Shared memory is available in PHP 7.0+ with OPCache enabled
         if (ini_get('opcache.enable')) {
             return new static($file, $fallbackPool);
         }
diff --git a/src/Symfony/Component/Debug/ErrorHandler.php b/src/Symfony/Component/Debug/ErrorHandler.php
@@ -382,10 +382,8 @@ public function handleError($type, $message, $file, $line)
 
         if (4 < $numArgs = func_num_args()) {
             $context = $scope ? (func_get_arg(4) ?: array()) : array();
-            $backtrace = 5 < $numArgs ? func_get_arg(5) : null; // defined on HHVM
         } else {
             $context = array();
-            $backtrace = null;
         }
 
         if (isset($context['GLOBALS']) && $scope) {
@@ -394,15 +392,6 @@ public function handleError($type, $message, $file, $line)
             $context = $e;
         }
 
-        if (null !== $backtrace && $type & E_ERROR) {
-            // E_ERROR fatal errors are triggered on HHVM when
-            // hhvm.error_handling.call_user_handler_on_fatals=1
-            // which is the way to get their backtrace.
-            $this->handleFatalError(compact('type', 'message', 'file', 'line', 'backtrace'));
-
-            return true;
-        }
-
         $logMessage = $this->levels[$type].': '.$message;
 
         if (null !== self::$toStringException) {
@@ -436,11 +425,12 @@ public function handleError($type, $message, $file, $line)
 
             // Clean the trace by removing function arguments and the first frames added by the error handler itself.
             if ($throw || $this->tracedErrors & $type) {
-                $backtrace = $backtrace ?: $errorAsException->getTrace();
+                $backtrace = $errorAsException->getTrace();
                 $lightTrace = $this->cleanTrace($backtrace, $type, $file, $line, $throw);
                 $this->traceReflector->setValue($errorAsException, $lightTrace);
             } else {
                 $this->traceReflector->setValue($errorAsException, array());
+                $backtrace = array();
             }
         }
 
diff --git a/src/Symfony/Component/HttpKernel/ControllerMetadata/ArgumentMetadataFactory.php b/src/Symfony/Component/HttpKernel/ControllerMetadata/ArgumentMetadataFactory.php
@@ -52,12 +52,7 @@ private function getType(\ReflectionParameter $parameter)
         if (!$type = $parameter->getType()) {
             return;
         }
-        $typeName = $type->getName();
-        if ('array' === $typeName && !$type->isBuiltin()) {
-            // Special case for HHVM with variadics
-            return;
-        }
 
-        return $typeName;
+        return $type->getName();
     }
 }
diff --git a/src/Symfony/Component/Intl/Data/Bundle/Reader/IntlBundleReader.php b/src/Symfony/Component/Intl/Data/Bundle/Reader/IntlBundleReader.php
@@ -34,7 +34,6 @@ public function read($path, $locale)
             // Never enable fallback. We want to know if a bundle cannot be found
             $bundle = new \ResourceBundle($locale, $path, false);
         } catch (\Exception $e) {
-            // HHVM compatibility: constructor throws on invalid resource
             $bundle = null;
         }
 
diff --git a/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
@@ -177,11 +177,6 @@ private function extractFromMutator($class, $property)
         }
         $type = $this->extractFromReflectionType($reflectionType);
 
-        // HHVM reports variadics with "array" but not builtin type hints
-        if (!$reflectionType->isBuiltin() && Type::BUILTIN_TYPE_ARRAY === $type->getBuiltinType()) {
-            return;
-        }
-
         if (in_array($prefix, $this->arrayMutatorPrefixes)) {
             $type = new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), $type);
         }
diff --git a/src/Symfony/Component/Translation/Loader/IcuDatFileLoader.php b/src/Symfony/Component/Translation/Loader/IcuDatFileLoader.php
@@ -39,7 +39,6 @@ public function load($resource, $locale, $domain = 'messages')
         try {
             $rb = new \ResourceBundle($locale, $resource);
         } catch (\Exception $e) {
-            // HHVM compatibility: constructor throws on invalid resource
             $rb = null;
         }
 
diff --git a/src/Symfony/Component/Translation/Loader/IcuResFileLoader.php b/src/Symfony/Component/Translation/Loader/IcuResFileLoader.php
@@ -39,7 +39,6 @@ public function load($resource, $locale, $domain = 'messages')
         try {
             $rb = new \ResourceBundle($locale, $resource);
         } catch (\Exception $e) {
-            // HHVM compatibility: constructor throws on invalid resource
             $rb = null;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ function ($key, $value, $isHit) {`
`62`	`62`	`*/`
`63`	`63`	`public static function create($file, CacheItemPoolInterface $fallbackPool)`
`64`	`64`	`{`
`65`		`- // Shared memory is available in PHP 7.0+ with OPCache enabled and in HHVM`
	`65`	`+ // Shared memory is available in PHP 7.0+ with OPCache enabled`
`66`	`66`	`if (ini_get('opcache.enable')) {`
`67`	`67`	`if (!$fallbackPool instanceof AdapterInterface) {`
`68`	`68`	`$fallbackPool = new ProxyAdapter($fallbackPool);`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public function __construct($file, CacheInterface $fallbackPool)`
`45`	`45`	`*/`
`46`	`46`	`public static function create($file, CacheInterface $fallbackPool)`
`47`	`47`	`{`
`48`		`- // Shared memory is available in PHP 7.0+ with OPCache enabled and in HHVM`
	`48`	`+ // Shared memory is available in PHP 7.0+ with OPCache enabled`
`49`	`49`	`if (ini_get('opcache.enable')) {`
`50`	`50`	`return new static($file, $fallbackPool);`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,12 +52,7 @@ private function getType(\ReflectionParameter $parameter)`
`52`	`52`	`if (!$type = $parameter->getType()) {`
`53`	`53`	`return;`
`54`	`54`	`}`
`55`		`- $typeName = $type->getName();`
`56`		`- if ('array' === $typeName && !$type->isBuiltin()) {`
`57`		`- // Special case for HHVM with variadics`
`58`		`- return;`
`59`		`- }`
`60`	`55`
`61`		`- return $typeName;`
	`56`	`+ return $type->getName();`
`62`	`57`	`}`
`63`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,6 @@ public function read($path, $locale)`
`34`	`34`	`// Never enable fallback. We want to know if a bundle cannot be found`
`35`	`35`	`$bundle = new \ResourceBundle($locale, $path, false);`
`36`	`36`	`} catch (\Exception $e) {`
`37`		`- // HHVM compatibility: constructor throws on invalid resource`
`38`	`37`	`$bundle = null;`
`39`	`38`	`}`
`40`	`39`
Original file line number	Diff line number	Diff line change
`@@ -177,11 +177,6 @@ private function extractFromMutator($class, $property)`
`177`	`177`	`}`
`178`	`178`	`$type = $this->extractFromReflectionType($reflectionType);`
`179`	`179`
`180`		`- // HHVM reports variadics with "array" but not builtin type hints`
`181`		`- if (!$reflectionType->isBuiltin() && Type::BUILTIN_TYPE_ARRAY === $type->getBuiltinType()) {`
`182`		`- return;`
`183`		`- }`
`184`		`-`
`185`	`180`	`if (in_array($prefix, $this->arrayMutatorPrefixes)) {`
`186`	`181`	`$type = new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), $type);`
`187`	`182`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,6 @@ public function load($resource, $locale, $domain = 'messages')`
`39`	`39`	`try {`
`40`	`40`	`$rb = new \ResourceBundle($locale, $resource);`
`41`	`41`	`} catch (\Exception $e) {`
`42`		`- // HHVM compatibility: constructor throws on invalid resource`
`43`	`42`	`$rb = null;`
`44`	`43`	`}`
`45`	`44`