fixed typo

* 2.3:
  Fix tests in HHVM
  CS: Pre incrementation/decrementation should be used if possible

Conflicts:
	src/Symfony/Bundle/TwigBundle/Command/LintCommand.php
	src/Symfony/Component/Console/Helper/TableHelper.php
	src/Symfony/Component/EventDispatcher/Tests/EventDispatcherTest.php
	src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php
	src/Symfony/Component/HttpKernel/HttpCache/EsiResponseCacheStrategy.php
	src/Symfony/Component/Security/Acl/Dbal/AclProvider.php
	src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php

CHANGELOG.md

@@ -1,14 +1,6 @@
 CHANGELOG
 =========
 
-2.7.0
------
-
-* added deprecations checking for parent interfaces/classes to DebugClassLoader
-* added ZTS support to symfony_debug extension
-* added symfony_debug_backtrace() to symfony_debug extension
-  to track the backtrace of fatal errors
-
 2.6.0
 -----
 

DebugClassLoader.php

@@ -30,22 +30,20 @@ class DebugClassLoader
     private $isFinder;
     private $wasFinder;
     private static $caseCheck;
-    private static $deprecated = array();
-    private static $php7Reserved = array('int', 'float', 'bool', 'string', 'true', 'false', 'null');
 
     /**
      * Constructor.
      *
-     * @param callable|object $classLoader Passing an object is @deprecated since version 2.5 and support for it will be removed in 3.0
+     * @param callable|object $classLoader
      *
      * @api
+     * @deprecated since 2.5, passing an object is deprecated and support for it will be removed in 3.0
      */
     public function __construct($classLoader)
     {
         $this->wasFinder = is_object($classLoader) && method_exists($classLoader, 'findFile');
 
         if ($this->wasFinder) {
-            trigger_error('The '.__METHOD__.' method will no longer support receiving an object into its $classLoader argument in 3.0.', E_USER_DEPRECATED);
             $this->classLoader = array($classLoader, 'loadClass');
             $this->isFinder = true;
         } else {
@@ -61,7 +59,9 @@ class DebugClassLoader
     /**
      * Gets the wrapped class loader.
      *
-     * @return callable|object A class loader. Since version 2.5, returning an object is @deprecated and support for it will be removed in 3.0
+     * @return callable|object a class loader
+     *
+     * @deprecated since 2.5, returning an object is deprecated and support for it will be removed in 3.0
      */
     public function getClassLoader()
     {
@@ -69,7 +69,7 @@ class DebugClassLoader
     }
 
     /**
-     * Wraps all autoloaders.
+     * Wraps all autoloaders
      */
     public static function enable()
     {
@@ -117,18 +117,16 @@ class DebugClassLoader
     }
 
     /**
-     * Finds a file by class name.
+     * Finds a file by class name
      *
      * @param string $class A class name to resolve to file
      *
      * @return string|null
      *
-     * @deprecated since version 2.5, to be removed in 3.0.
+     * @deprecated Deprecated since 2.5, to be removed in 3.0.
      */
     public function findFile($class)
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
-
         if ($this->wasFinder) {
             return $this->classLoader[0]->findFile($class);
         }
@@ -177,39 +175,6 @@ class DebugClassLoader
             if ($name !== $class && 0 === strcasecmp($name, $class)) {
                 throw new \RuntimeException(sprintf('Case mismatch between loaded and declared class names: %s vs %s', $class, $name));
             }
-
-            if (in_array(strtolower($refl->getShortName()), self::$php7Reserved)) {
-                trigger_error(sprintf('%s uses a reserved class name (%s) that will break on PHP 7 and higher', $name, $refl->getShortName()), E_USER_DEPRECATED);
-            } elseif (preg_match('#\n \* @deprecated (.*?)\r?\n \*(?: @|/$)#s', $refl->getDocComment(), $notice)) {
-                self::$deprecated[$name] = preg_replace('#\s*\r?\n \* +#', ' ', $notice[1]);
-            } else {
-                if (2 > $len = 1 + (strpos($name, '\\', 1 + strpos($name, '\\')) ?: strpos($name, '_'))) {
-                    $len = 0;
-                    $ns = '';
-                } else {
-                    switch ($ns = substr($name, 0, $len)) {
-                        case 'Symfony\Bridge\\':
-                        case 'Symfony\Bundle\\':
-                        case 'Symfony\Component\\':
-                            $ns = 'Symfony\\';
-                            $len = strlen($ns);
-                            break;
-                    }
-                }
-                $parent = $refl->getParentClass();
-
-                if (!$parent || strncmp($ns, $parent->name, $len)) {
-                    if ($parent && isset(self::$deprecated[$parent->name]) && strncmp($ns, $parent->name, $len)) {
-                        trigger_error(sprintf('The %s class extends %s that is deprecated %s', $name, $parent->name, self::$deprecated[$parent->name]), E_USER_DEPRECATED);
-                    }
-
-                    foreach ($refl->getInterfaceNames() as $interface) {
-                        if (isset(self::$deprecated[$interface]) && strncmp($ns, $interface, $len) && !($parent && $parent->implementsInterface($interface))) {
-                            trigger_error(sprintf('The %s %s %s that is deprecated %s', $name, $refl->isInterface() ? 'interface extends' : 'class implements', $interface, self::$deprecated[$interface]), E_USER_DEPRECATED);
-                        }
-                    }
-                }
-            }
         }
 
         if ($file) {

ErrorHandler.php

@@ -47,7 +47,7 @@ use Symfony\Component\Debug\FatalErrorHandler\FatalErrorHandlerInterface;
 class ErrorHandler
 {
     /**
-     * @deprecated since version 2.6, to be removed in 3.0.
+     * @deprecated since 2.6, to be removed in 3.0.
      */
     const TYPE_DEPRECATION = -100;
 
@@ -72,19 +72,19 @@ class ErrorHandler
     private $loggers = array(
         E_DEPRECATED => array(null, LogLevel::INFO),
         E_USER_DEPRECATED => array(null, LogLevel::INFO),
-        E_NOTICE => array(null, LogLevel::WARNING),
-        E_USER_NOTICE => array(null, LogLevel::WARNING),
-        E_STRICT => array(null, LogLevel::WARNING),
+        E_NOTICE => array(null, LogLevel::NOTICE),
+        E_USER_NOTICE => array(null, LogLevel::NOTICE),
+        E_STRICT => array(null, LogLevel::NOTICE),
         E_WARNING => array(null, LogLevel::WARNING),
         E_USER_WARNING => array(null, LogLevel::WARNING),
         E_COMPILE_WARNING => array(null, LogLevel::WARNING),
         E_CORE_WARNING => array(null, LogLevel::WARNING),
-        E_USER_ERROR => array(null, LogLevel::CRITICAL),
-        E_RECOVERABLE_ERROR => array(null, LogLevel::CRITICAL),
-        E_COMPILE_ERROR => array(null, LogLevel::CRITICAL),
-        E_PARSE => array(null, LogLevel::CRITICAL),
-        E_ERROR => array(null, LogLevel::CRITICAL),
-        E_CORE_ERROR => array(null, LogLevel::CRITICAL),
+        E_USER_ERROR => array(null, LogLevel::ERROR),
+        E_RECOVERABLE_ERROR => array(null, LogLevel::ERROR),
+        E_COMPILE_ERROR => array(null, LogLevel::EMERGENCY),
+        E_PARSE => array(null, LogLevel::EMERGENCY),
+        E_ERROR => array(null, LogLevel::EMERGENCY),
+        E_CORE_ERROR => array(null, LogLevel::EMERGENCY),
     );
 
     private $thrownErrors = 0x1FFF; // E_ALL - E_DEPRECATED - E_USER_DEPRECATED
@@ -104,14 +104,14 @@ class ErrorHandler
     /**
      * Same init value as thrownErrors.
      *
-     * @deprecated since version 2.6, to be removed in 3.0.
+     * @deprecated since 2.6, to be removed in 3.0.
      */
     private $displayErrors = 0x1FFF;
 
     /**
      * Registers the error handler.
      *
-     * @param self|null|int $handler The handler to register, or @deprecated (since version 2.6, to be removed in 3.0) bit field of thrown levels
+     * @param self|null|int $handler The handler to register, or @deprecated (since 2.6, to be removed in 3.0) bit field of thrown levels
      * @param bool          $replace Whether to replace or not any existing handler
      *
      * @return self The registered error handler
@@ -257,7 +257,7 @@ class ErrorHandler
         }
         $this->reRegister($prev | $this->loggedErrors);
 
-        // $this->displayErrors is @deprecated since version 2.6
+        // $this->displayErrors is @deprecated since 2.6
         $this->displayErrors = $this->thrownErrors;
 
         return $prev;
@@ -402,10 +402,10 @@ class ErrorHandler
             if ($this->scopedErrors & $type) {
                 $e['scope_vars'] = $context;
                 if ($trace) {
-                    $e['stack'] = debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT);
+                    $e['stack'] = debug_backtrace(true); // Provide object
                 }
             } elseif ($trace) {
-                $e['stack'] = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+                $e['stack'] = debug_backtrace(PHP_VERSION_ID >= 50306 ? DEBUG_BACKTRACE_IGNORE_ARGS : false);
             }
         }
 
@@ -607,12 +607,10 @@ class ErrorHandler
      *
      * @param int|null $level The level (null to use the error_reporting() value and 0 to disable)
      *
-     * @deprecated since version 2.6, to be removed in 3.0. Use throwAt() instead.
+     * @deprecated since 2.6, to be removed in 3.0. Use throwAt() instead.
      */
     public function setLevel($level)
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the throwAt() method instead.', E_USER_DEPRECATED);
-
         $level = null === $level ? error_reporting() : $level;
         $this->throwAt($level, true);
     }
@@ -622,12 +620,10 @@ class ErrorHandler
      *
      * @param int $displayErrors The display_errors flag value
      *
-     * @deprecated since version 2.6, to be removed in 3.0. Use throwAt() instead.
+     * @deprecated since 2.6, to be removed in 3.0. Use throwAt() instead.
      */
     public function setDisplayErrors($displayErrors)
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the throwAt() method instead.', E_USER_DEPRECATED);
-
         if ($displayErrors) {
             $this->throwAt($this->displayErrors, true);
         } else {
@@ -643,12 +639,10 @@ class ErrorHandler
      * @param LoggerInterface $logger  A logger interface
      * @param string          $channel The channel associated with the logger (deprecation, emergency or scream)
      *
-     * @deprecated since version 2.6, to be removed in 3.0. Use setLoggers() or setDefaultLogger() instead.
+     * @deprecated since 2.6, to be removed in 3.0. Use setLoggers() or setDefaultLogger() instead.
      */
     public static function setLogger(LoggerInterface $logger, $channel = 'deprecation')
     {
-        trigger_error('The '.__METHOD__.' static method is deprecated since version 2.6 and will be removed in 3.0. Use the setLoggers() or setDefaultLogger() methods instead.', E_USER_DEPRECATED);
-
         $handler = set_error_handler('var_dump', 0);
         $handler = is_array($handler) ? $handler[0] : null;
         restore_error_handler();
@@ -668,24 +662,20 @@ class ErrorHandler
     }
 
     /**
-     * @deprecated since version 2.6, to be removed in 3.0. Use handleError() instead.
+     * @deprecated since 2.6, to be removed in 3.0. Use handleError() instead.
      */
     public function handle($level, $message, $file = 'unknown', $line = 0, $context = array())
     {
-        $this->handleError(E_USER_DEPRECATED, 'The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the handleError() method instead.', __FILE__, __LINE__, array());
-
         return $this->handleError($level, $message, $file, $line, (array) $context);
     }
 
     /**
      * Handles PHP fatal errors.
      *
-     * @deprecated since version 2.6, to be removed in 3.0. Use handleFatalError() instead.
+     * @deprecated since 2.6, to be removed in 3.0. Use handleFatalError() instead.
      */
     public function handleFatal()
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the handleFatalError() method instead.', E_USER_DEPRECATED);
-
         static::handleFatalError();
     }
 }

Exception/DummyException.php

@@ -11,8 +11,6 @@
 
 namespace Symfony\Component\Debug\Exception;
 
-trigger_error('The '.__NAMESPACE__.'\DummyException class is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
-
 /**
  * @author Fabien Potencier <fabien@symfony.com>
  *

Exception/FatalErrorException.php

@@ -69,11 +69,6 @@ class FatalErrorException extends LegacyFatalErrorException
 
                 unset($frame);
                 $trace = array_reverse($trace);
-            } elseif (function_exists('symfony_debug_backtrace')) {
-                $trace = symfony_debug_backtrace();
-                if (0 < $traceOffset) {
-                    array_splice($trace, 0, $traceOffset);
-                }
             } else {
                 $trace = array();
             }

ExceptionHandler.php

@@ -380,7 +380,7 @@ EOF;
         $file = preg_match('#[^/\\\\]*$#', $path, $file) ? $file[0] : $path;
 
         if ($linkFormat = $this->fileLinkFormat) {
-            $link = str_replace(array('%f', '%l'), array($path, $line), $linkFormat);
+            $link = strtr($this->escapeHtml($linkFormat), array('%f' => $path, '%l' => (int) $line));
 
             return sprintf(' in <a href="%s" title="Go to source">%s line %d</a>', $link, $file, $line);
         }
@@ -422,19 +422,26 @@ EOF;
     }
 
     /**
-     * Returns an UTF-8 and HTML encoded string
-     *
-     * @deprecated since version 2.7, to be removed in 3.0.
+     * Returns an UTF-8 and HTML encoded string.
      */
     protected static function utf8Htmlize($str)
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);
+        if (!preg_match('//u', $str) && function_exists('iconv')) {
+            set_error_handler('var_dump', 0);
+            $charset = ini_get('default_charset');
+            if ('UTF-8' === $charset || $str !== @iconv($charset, $charset, $str)) {
+                $charset = 'CP1252';
+            }
+            restore_error_handler();
+
+            $str = iconv($charset, 'UTF-8', $str);
+        }
 
         return htmlspecialchars($str, ENT_QUOTES | (PHP_VERSION_ID >= 50400 ? ENT_SUBSTITUTE : 0), 'UTF-8');
     }
 
     /**
-     * HTML-encodes a string
+     * HTML-encodes a string.
      */
     private function escapeHtml($str)
     {

FatalErrorHandler/UndefinedMethodFatalErrorHandler.php

@@ -34,7 +34,7 @@ class UndefinedMethodFatalErrorHandler implements FatalErrorHandlerInterface
         $className = $matches[1];
         $methodName = $matches[2];
 
-        $message = sprintf('Attempted to call an undefined method named "%s" of class "%s".', $methodName, $className);
+        $message = sprintf('Attempted to call method "%s" on class "%s".', $methodName, $className);
 
         $candidates = array();
         foreach (get_class_methods($className) as $definedMethodName) {

Resources/ext/README.md

@@ -1,133 +0,0 @@
-Symfony Debug Extension
-=======================
-
-This extension publishes several functions to help building powerful debugging tools.
-
-symfony_zval_info()
--------------------
-
-- exposes zval_hash/refcounts, allowing e.g. efficient exploration of arbitrary structures in PHP,
-- does work with references, preventing memory copying.
-
-Its behavior is about the same as:
-
-```php
-<?php
-
-function symfony_zval_info($key, $array, $options = 0)
-{
-
-    // $options is currently not used, but could be in future version.
-
-    if (!array_key_exists($key, $array)) {
-        return null;
-    }
-
-    $info = array(
-        'type' => gettype($array[$key]),
-        'zval_hash' => /* hashed memory address of $array[$key] */,
-        'zval_refcount' => /* internal zval refcount of $array[$key] */,
-        'zval_isref' => /* is_ref status of $array[$key] */,
-    );
-
-    switch ($info['type']) {
-        case 'object':
-            $info += array(
-                'object_class' => get_class($array[$key]),
-                'object_refcount' => /* internal object refcount of $array[$key] */,
-                'object_hash' => spl_object_hash($array[$key]),
-                'object_handle' => /* internal object handle $array[$key] */,
-            );
-            break;
-
-        case 'resource':
-            $info += array(
-                'resource_handle' => (int) $array[$key],
-                'resource_type' => get_resource_type($array[$key]),
-                'resource_refcount' => /* internal resource refcount of $array[$key] */,
-            );
-            break;
-
-        case 'array':
-            $info += array(
-                'array_count' => count($array[$key]),
-            );
-            break;
-
-        case 'string':
-            $info += array(
-                'strlen' => strlen($array[$key]),
-            );
-            break;
-    }
-
-    return $info;
-}
-```
-
-symfony_debug_backtrace()
--------------------------
-
-This function works like debug_backtrace(), except that it can fetch the full backtrace in case of fatal errors:
-
-```php
-function foo() { fatal(); }
-function bar() { foo(); }
-
-function sd() { var_dump(symfony_debug_backtrace()); }
-
-register_shutdown_function('sd');
-
-bar();
-
-/* Will output
-Fatal error: Call to undefined function fatal() in foo.php on line 42
-array(3) {
-  [0]=>
-  array(2) {
-    ["function"]=>
-    string(2) "sd"
-    ["args"]=>
-    array(0) {
-    }
-  }
-  [1]=>
-  array(4) {
-    ["file"]=>
-    string(7) "foo.php"
-    ["line"]=>
-    int(1)
-    ["function"]=>
-    string(3) "foo"
-    ["args"]=>
-    array(0) {
-    }
-  }
-  [2]=>
-  array(4) {
-    ["file"]=>
-    string(102) "foo.php"
-    ["line"]=>
-    int(2)
-    ["function"]=>
-    string(3) "bar"
-    ["args"]=>
-    array(0) {
-    }
-  }
-}
-*/
-```
-
-Usage
------
-
-The extension is compatible with ZTS mode, and should be supported by PHP5.3, 5.4, 5.5 and 5.6.
-To enable the extension from source, run:
-
-```
-    phpize
-    ./configure
-    make
-    sudo make install
-```

Resources/ext/README.rst

@@ -0,0 +1,72 @@
+Symfony Debug Extension
+=======================
+
+This extension adds a ``symfony_zval_info($key, $array, $options = 0)`` function that:
+
+- exposes zval_hash/refcounts, allowing e.g. efficient exploration of arbitrary structures in PHP,
+- does work with references, preventing memory copying.
+
+Its behavior is about the same as:
+
+.. code-block:: php
+
+    <?php
+
+    function symfony_zval_info($key, $array, $options = 0)
+    {
+        // $options is currently not used, but could be in future version.
+
+        if (!array_key_exists($key, $array)) {
+            return null;
+        }
+
+        $info = array(
+            'type' => gettype($array[$key]),
+            'zval_hash' => /* hashed memory address of $array[$key] */,
+            'zval_refcount' => /* internal zval refcount of $array[$key] */,
+            'zval_isref' => /* is_ref status of $array[$key] */,
+        );
+
+        switch ($info['type']) {
+            case 'object':
+                $info += array(
+                    'object_class' => get_class($array[$key]),
+                    'object_refcount' => /* internal object refcount of $array[$key] */,
+                    'object_hash' => spl_object_hash($array[$key]),
+                    'object_handle' => /* internal object handle $array[$key] */,
+                );
+                break;
+
+            case 'resource':
+                $info += array(
+                    'resource_handle' => (int) $array[$key],
+                    'resource_type' => get_resource_type($array[$key]),
+                    'resource_refcount' => /* internal resource refcount of $array[$key] */,
+                );
+                break;
+
+            case 'array':
+                $info += array(
+                    'array_count' => count($array[$key]),
+                );
+                break;
+
+            case 'string':
+                $info += array(
+                    'strlen' => strlen($array[$key]),
+                );
+                break;
+        }
+
+        return $info;
+    }
+
+To enable the extension from source, run:
+
+.. code-block:: sh
+
+    phpize
+    ./configure
+    make
+    sudo make install
+

Resources/ext/php_symfony_debug.h

@@ -13,7 +13,7 @@
 extern zend_module_entry symfony_debug_module_entry;
 #define phpext_symfony_debug_ptr &symfony_debug_module_entry
 
-#define PHP_SYMFONY_DEBUG_VERSION "2.7"
+#define PHP_SYMFONY_DEBUG_VERSION "1.0"
 
 #ifdef PHP_WIN32
 #	define PHP_SYMFONY_DEBUG_API __declspec(dllexport)
@@ -29,8 +29,6 @@ extern zend_module_entry symfony_debug_module_entry;
 
 ZEND_BEGIN_MODULE_GLOBALS(symfony_debug)
 	intptr_t req_rand_init;
-	void (*old_error_cb)(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args);
-	zval *debug_bt;
 ZEND_END_MODULE_GLOBALS(symfony_debug)
 
 PHP_MINIT_FUNCTION(symfony_debug);
@@ -42,14 +40,11 @@ PHP_GINIT_FUNCTION(symfony_debug);
 PHP_GSHUTDOWN_FUNCTION(symfony_debug);
 
 PHP_FUNCTION(symfony_zval_info);
-PHP_FUNCTION(symfony_debug_backtrace);
 
-static char *_symfony_debug_memory_address_hash(void * TSRMLS_DC);
+static char *_symfony_debug_memory_address_hash(void *);
 static const char *_symfony_debug_zval_type(zval *);
-static const char* _symfony_debug_get_resource_type(long TSRMLS_DC);
-static int _symfony_debug_get_resource_refcount(long TSRMLS_DC);
-
-void symfony_debug_error_cb(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args);
+static const char* _symfony_debug_get_resource_type(long);
+static int _symfony_debug_get_resource_refcount(long);
 
 #ifdef ZTS
 #define SYMFONY_DEBUG_G(v) TSRMG(symfony_debug_globals_id, zend_symfony_debug_globals *, v)

Resources/ext/symfony_debug.c

@@ -12,9 +12,6 @@
 #endif
 
 #include "php.h"
-#ifdef ZTS
-#include "TSRM.h"
-#endif
 #include "php_ini.h"
 #include "ext/standard/info.h"
 #include "php_symfony_debug.h"
@@ -22,13 +19,6 @@
 #include "ext/standard/php_lcg.h"
 #include "ext/spl/php_spl.h"
 #include "Zend/zend_gc.h"
-#include "Zend/zend_builtin_functions.h"
-#include "Zend/zend_extensions.h" /* for ZEND_EXTENSION_API_NO */
-#include "ext/standard/php_array.h"
-#include "Zend/zend_interfaces.h"
-#include "SAPI.h"
-
-#define IS_PHP_53 ZEND_EXTENSION_API_NO == 220090626
 
 ZEND_DECLARE_MODULE_GLOBALS(symfony_debug)
 
@@ -40,28 +30,9 @@ ZEND_END_ARG_INFO()
 
 const zend_function_entry symfony_debug_functions[] = {
 	PHP_FE(symfony_zval_info,	symfony_zval_arginfo)
-	PHP_FE(symfony_debug_backtrace, NULL)
 	PHP_FE_END
 };
 
-PHP_FUNCTION(symfony_debug_backtrace)
-{
-	if (zend_parse_parameters_none() == FAILURE) {
-		return;
-	}
-#if IS_PHP_53
-	zend_fetch_debug_backtrace(return_value, 1, 0 TSRMLS_CC);
-#else
-	zend_fetch_debug_backtrace(return_value, 1, 0, 0 TSRMLS_CC);
-#endif
-
-	if (!SYMFONY_DEBUG_G(debug_bt)) {
-		return;
-	}
-
-	php_array_merge(Z_ARRVAL_P(return_value), Z_ARRVAL_P(SYMFONY_DEBUG_G(debug_bt)), 0 TSRMLS_CC);
-}
-
 PHP_FUNCTION(symfony_zval_info)
 {
 	zval *key = NULL, *arg = NULL;
@@ -69,7 +40,7 @@ PHP_FUNCTION(symfony_zval_info)
 	HashTable *array = NULL;
 	long options = 0;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zh|l", &key, &array, &options) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "zh|l", &key, &array, &options) == FAILURE) {
 		return;
 	}
 
@@ -91,14 +62,13 @@ PHP_FUNCTION(symfony_zval_info)
 	array_init(return_value);
 
 	add_assoc_string(return_value, "type", (char *)_symfony_debug_zval_type(arg), 1);
-	add_assoc_stringl(return_value, "zval_hash", _symfony_debug_memory_address_hash((void *)arg TSRMLS_CC), 16, 0);
+	add_assoc_stringl(return_value, "zval_hash", _symfony_debug_memory_address_hash((void *)arg), 16, 1);
 	add_assoc_long(return_value, "zval_refcount", Z_REFCOUNT_P(arg));
 	add_assoc_bool(return_value, "zval_isref", (zend_bool)Z_ISREF_P(arg));
 
 	if (Z_TYPE_P(arg) == IS_OBJECT) {
-		char hash[33] = {0};
-
-		php_spl_object_hash(arg, (char *)hash TSRMLS_CC);
+		static char hash[33] = {0};
+		php_spl_object_hash(arg, (char *)hash);
 		add_assoc_stringl(return_value, "object_class", (char *)Z_OBJCE_P(arg)->name, Z_OBJCE_P(arg)->name_length, 1);
 		add_assoc_long(return_value, "object_refcount", EG(objects_store).object_buckets[Z_OBJ_HANDLE_P(arg)].bucket.obj.refcount);
 		add_assoc_string(return_value, "object_hash", hash, 1);
@@ -107,41 +77,17 @@ PHP_FUNCTION(symfony_zval_info)
 		add_assoc_long(return_value, "array_count", zend_hash_num_elements(Z_ARRVAL_P(arg)));
 	} else if(Z_TYPE_P(arg) == IS_RESOURCE) {
 		add_assoc_long(return_value, "resource_handle", Z_LVAL_P(arg));
-		add_assoc_string(return_value, "resource_type", (char *)_symfony_debug_get_resource_type(Z_LVAL_P(arg) TSRMLS_CC), 1);
-		add_assoc_long(return_value, "resource_refcount", _symfony_debug_get_resource_refcount(Z_LVAL_P(arg) TSRMLS_CC));
+		add_assoc_string(return_value, "resource_type", (char *)_symfony_debug_get_resource_type(Z_LVAL_P(arg)), 1);
+		add_assoc_long(return_value, "resource_refcount", _symfony_debug_get_resource_refcount(Z_LVAL_P(arg)));
 	} else if (Z_TYPE_P(arg) == IS_STRING) {
 		add_assoc_long(return_value, "strlen", Z_STRLEN_P(arg));
 	}
 }
 
-void symfony_debug_error_cb(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args)
-{
-	TSRMLS_FETCH();
-	zval *retval;
-
-	switch (type) {
-		case E_ERROR:
-		case E_PARSE:
-		case E_CORE_ERROR:
-		case E_CORE_WARNING:
-		case E_COMPILE_ERROR:
-		case E_COMPILE_WARNING:
-			ALLOC_INIT_ZVAL(retval);
-#if IS_PHP_53
-			zend_fetch_debug_backtrace(retval, 1, 0 TSRMLS_CC);
-#else
-			zend_fetch_debug_backtrace(retval, 1, 0, 0 TSRMLS_CC);
-#endif
-			SYMFONY_DEBUG_G(debug_bt) = retval;
-	}
-
-	SYMFONY_DEBUG_G(old_error_cb)(type, error_filename, error_lineno, format, args);
-}
-
-static const char* _symfony_debug_get_resource_type(long rsid TSRMLS_DC)
+static const char* _symfony_debug_get_resource_type(long rsid)
 {
 	const char *res_type;
-	res_type = zend_rsrc_list_get_rsrc_type(rsid TSRMLS_CC);
+	res_type = zend_rsrc_list_get_rsrc_type(rsid);
 
 	if (!res_type) {
 		return "Unknown";
@@ -150,7 +96,7 @@ static const char* _symfony_debug_get_resource_type(long rsid TSRMLS_DC)
 	return res_type;
 }
 
-static int _symfony_debug_get_resource_refcount(long rsid TSRMLS_DC)
+static int _symfony_debug_get_resource_refcount(long rsid)
 {
 	zend_rsrc_list_entry *le;
 
@@ -161,21 +107,21 @@ static int _symfony_debug_get_resource_refcount(long rsid TSRMLS_DC)
 	return 0;
 }
 
-static char *_symfony_debug_memory_address_hash(void *address TSRMLS_DC)
+static char *_symfony_debug_memory_address_hash(void *address)
 {
-	char *result = NULL;
+	static char result[17] = {0};
 	intptr_t address_rand;
 
 	if (!SYMFONY_DEBUG_G(req_rand_init)) {
 		if (!BG(mt_rand_is_seeded)) {
 			php_mt_srand(GENERATE_SEED() TSRMLS_CC);
 		}
-		SYMFONY_DEBUG_G(req_rand_init) = (intptr_t)php_mt_rand(TSRMLS_C);
+		SYMFONY_DEBUG_G(req_rand_init) = (intptr_t)php_mt_rand();
 	}
 
 	address_rand = (intptr_t)address ^ SYMFONY_DEBUG_G(req_rand_init);
 
-	spprintf(&result, 17, "%016zx", address_rand);
+	snprintf(result, 17, "%016zx", address_rand);
 
 	return result;
 }
@@ -241,7 +187,7 @@ ZEND_GET_MODULE(symfony_debug)
 
 PHP_GINIT_FUNCTION(symfony_debug)
 {
-	memset(symfony_debug_globals, 0 , sizeof(*symfony_debug_globals));
+	symfony_debug_globals->req_rand_init = 0;
 }
 
 PHP_GSHUTDOWN_FUNCTION(symfony_debug)
@@ -251,16 +197,11 @@ PHP_GSHUTDOWN_FUNCTION(symfony_debug)
 
 PHP_MINIT_FUNCTION(symfony_debug)
 {
-	SYMFONY_DEBUG_G(old_error_cb) = zend_error_cb;
-	zend_error_cb                 = symfony_debug_error_cb;
-
 	return SUCCESS;
 }
 
 PHP_MSHUTDOWN_FUNCTION(symfony_debug)
 {
-	zend_error_cb = SYMFONY_DEBUG_G(old_error_cb);
-
 	return SUCCESS;
 }
 

Resources/ext/tests/001.phpt

@@ -3,7 +3,7 @@ Test symfony_zval_info API
 --SKIPIF--
 <?php if (!extension_loaded("symfony_debug")) print "skip"; ?>
 --FILE--
-<?php
+<?php 
 
 $int = 42;
 $float = 42.42;
@@ -88,7 +88,7 @@ array(8) {
   ["object_hash"]=>
   string(32) "%s"
   ["object_handle"]=>
-  int(%d)
+  int(1)
 }
 array(5) {
   ["type"]=>
@@ -112,7 +112,7 @@ array(7) {
   ["zval_isref"]=>
   bool(false)
   ["resource_handle"]=>
-  int(%d)
+  int(4)
   ["resource_type"]=>
   string(6) "stream"
   ["resource_refcount"]=>

Resources/ext/tests/002.phpt

@@ -1,64 +0,0 @@
---TEST--
-Test symfony_debug_backtrace in case of fatal error
---SKIPIF--
-<?php if (!extension_loaded("symfony_debug")) print "skip"; ?>
---FILE--
-<?php
-
-function bar()
-{
-    foo();
-}
-
-function foo()
-{
-    notexist();
-}
-
-function bt()
-{
-    print_r(symfony_debug_backtrace());
-
-}
-
-register_shutdown_function('bt');
-
-bar();
-
-?>
---EXPECTF--
-Fatal error: Call to undefined function notexist() in %s on line %d
-Array
-(
-    [0] => Array
-        (
-            [function] => bt
-            [args] => Array
-                (
-                )
-
-        )
-
-    [1] => Array
-        (
-            [file] => %s
-            [line] => %d
-            [function] => foo
-            [args] => Array
-                (
-                )
-
-        )
-
-    [2] => Array
-        (
-            [file] => %s
-            [line] => %d
-            [function] => bar
-            [args] => Array
-                (
-                )
-
-        )
-
-)

Resources/ext/tests/002_1.phpt

@@ -1,47 +0,0 @@
---TEST--
-Test symfony_debug_backtrace in case of non fatal error
---SKIPIF--
-<?php if (!extension_loaded("symfony_debug")) print "skip"; ?>
---FILE--
-<?php
-
-function bar()
-{
-    bt();
-}
-
-function bt()
-{
-    print_r(symfony_debug_backtrace());
-
-}
-
-bar();
-
-?>
---EXPECTF--
-Array
-(
-    [0] => Array
-        (
-            [file] => %s
-            [line] => %d
-            [function] => bt
-            [args] => Array
-                (
-                )
-
-        )
-
-    [1] => Array
-        (
-            [file] => %s
-            [line] => %d
-            [function] => bar
-            [args] => Array
-                (
-                )
-
-        )
-
-)

Resources/ext/tests/003.phpt

@@ -1,85 +0,0 @@
---TEST--
-Test ErrorHandler in case of fatal error
---SKIPIF--
-<?php if (!extension_loaded("symfony_debug")) print "skip"; ?>
---FILE--
-<?php
-
-namespace Psr\Log;
-
-class LogLevel
-{
-    const EMERGENCY = 'emergency';
-    const ALERT = 'alert';
-    const CRITICAL = 'critical';
-    const ERROR = 'error';
-    const WARNING = 'warning';
-    const NOTICE = 'notice';
-    const INFO = 'info';
-    const DEBUG = 'debug';
-}
-
-namespace Symfony\Component\Debug;
-
-$dir = __DIR__.'/../../../';
-require $dir.'ErrorHandler.php';
-require $dir.'Exception/FatalErrorException.php';
-require $dir.'Exception/UndefinedFunctionException.php';
-require $dir.'FatalErrorHandler/FatalErrorHandlerInterface.php';
-require $dir.'FatalErrorHandler/ClassNotFoundFatalErrorHandler.php';
-require $dir.'FatalErrorHandler/UndefinedFunctionFatalErrorHandler.php';
-require $dir.'FatalErrorHandler/UndefinedMethodFatalErrorHandler.php';
-
-function bar()
-{
-    foo();
-}
-
-function foo()
-{
-    notexist();
-}
-
-$handler = ErrorHandler::register();
-$handler->setExceptionHandler('print_r');
-
-if (function_exists('xdebug_disable')) {
-    xdebug_disable();
-}
-
-bar();
-?>
---EXPECTF--
-Fatal error: Call to undefined function Symfony\Component\Debug\notexist() in %s on line %d
-Symfony\Component\Debug\Exception\UndefinedFunctionException Object
-(
-    [message:protected] => Attempted to call function "notexist" from namespace "Symfony\Component\Debug".
-    [string:Exception:private] => 
-    [code:protected] => 0
-    [file:protected] => -
-    [line:protected] => %d
-    [trace:Exception:private] => Array
-        (
-            [0] => Array
-                (
-%A                    [function] => Symfony\Component\Debug\foo
-%A                    [args] => Array
-                        (
-                        )
-
-                )
-
-            [1] => Array
-                (
-%A                    [function] => Symfony\Component\Debug\bar
-%A                    [args] => Array
-                        (
-                        )
-
-                )
-%A
-        )
-
-    [previous:Exception:private] => 
-    [severity:protected] => 1
-)

Tests/DebugClassLoaderTest.php

@@ -162,87 +162,6 @@ class DebugClassLoaderTest extends \PHPUnit_Framework_TestCase
     {
         $this->assertTrue(class_exists(__NAMESPACE__.'\Fixtures\ClassAlias', true));
     }
-
-    /**
-     * @dataProvider provideDeprecatedSuper
-     */
-    public function testDeprecatedSuper($class, $super, $type)
-    {
-        set_error_handler('var_dump', 0);
-        $e = error_reporting(0);
-        trigger_error('', E_USER_DEPRECATED);
-
-        class_exists('Test\\'.__NAMESPACE__.'\\'.$class, true);
-
-        error_reporting($e);
-        restore_error_handler();
-
-        $lastError = error_get_last();
-        unset($lastError['file'], $lastError['line']);
-
-        $xError = array(
-            'type' => E_USER_DEPRECATED,
-            'message' => 'The Test\Symfony\Component\Debug\Tests\\'.$class.' class '.$type.' Symfony\Component\Debug\Tests\Fixtures\\'.$super.' that is deprecated but this is a test deprecation notice.',
-        );
-
-        $this->assertSame($xError, $lastError);
-    }
-
-    public function provideDeprecatedSuper()
-    {
-        return array(
-            array('DeprecatedInterfaceClass', 'DeprecatedInterface', 'implements'),
-            array('DeprecatedParentClass', 'DeprecatedClass', 'extends'),
-        );
-    }
-
-    public function testDeprecatedSuperInSameNamespace()
-    {
-        set_error_handler('var_dump', 0);
-        $e = error_reporting(0);
-        trigger_error('', E_USER_NOTICE);
-
-        class_exists('Symfony\Bridge\Debug\Tests\Fixtures\ExtendsDeprecatedParent', true);
-
-        error_reporting($e);
-        restore_error_handler();
-
-        $lastError = error_get_last();
-        unset($lastError['file'], $lastError['line']);
-
-        $xError = array(
-            'type' => E_USER_NOTICE,
-            'message' => '',
-        );
-
-        $this->assertSame($xError, $lastError);
-    }
-
-    public function testReservedForPhp7()
-    {
-        if (PHP_VERSION_ID >= 70000) {
-            $this->markTestSkipped('PHP7 already prevents using reserved names.');
-        }
-
-        set_error_handler('var_dump', 0);
-        $e = error_reporting(0);
-        trigger_error('', E_USER_NOTICE);
-
-        class_exists('Test\\'.__NAMESPACE__.'\\Float', true);
-
-        error_reporting($e);
-        restore_error_handler();
-
-        $lastError = error_get_last();
-        unset($lastError['file'], $lastError['line']);
-
-        $xError = array(
-            'type' => E_USER_DEPRECATED,
-            'message' => 'Test\Symfony\Component\Debug\Tests\Float uses a reserved class name (Float) that will break on PHP 7 and higher',
-        );
-
-        $this->assertSame($xError, $lastError);
-    }
 }
 
 class ClassLoader
@@ -272,16 +191,6 @@ class ClassLoader
             return __DIR__.'/Fixtures/reallyNotPsr0.php';
         } elseif (__NAMESPACE__.'\Fixtures\NotPSR0bis' === $class) {
             return __DIR__.'/Fixtures/notPsr0Bis.php';
-        } elseif (__NAMESPACE__.'\Fixtures\DeprecatedInterface' === $class) {
-            return __DIR__.'/Fixtures/DeprecatedInterface.php';
-        } elseif ('Symfony\Bridge\Debug\Tests\Fixtures\ExtendsDeprecatedParent' === $class) {
-            eval('namespace Symfony\Bridge\Debug\Tests\Fixtures; class ExtendsDeprecatedParent extends \\'.__NAMESPACE__.'\Fixtures\DeprecatedClass {}');
-        } elseif ('Test\\'.__NAMESPACE__.'\DeprecatedParentClass' === $class) {
-            eval('namespace Test\\'.__NAMESPACE__.'; class DeprecatedParentClass extends \\'.__NAMESPACE__.'\Fixtures\DeprecatedClass {}');
-        } elseif ('Test\\'.__NAMESPACE__.'\DeprecatedInterfaceClass' === $class) {
-            eval('namespace Test\\'.__NAMESPACE__.'; class DeprecatedInterfaceClass implements \\'.__NAMESPACE__.'\Fixtures\DeprecatedInterface {}');
-        } elseif ('Test\\'.__NAMESPACE__.'\Float' === $class) {
-            eval('namespace Test\\'.__NAMESPACE__.'; class Float {}');
         }
     }
 }

Tests/ErrorHandlerTest.php

@@ -141,19 +141,19 @@ class ErrorHandlerTest extends \PHPUnit_Framework_TestCase
             $loggers = array(
                 E_DEPRECATED => array(null, LogLevel::INFO),
                 E_USER_DEPRECATED => array(null, LogLevel::INFO),
-                E_NOTICE => array($logger, LogLevel::WARNING),
+                E_NOTICE => array($logger, LogLevel::NOTICE),
                 E_USER_NOTICE => array($logger, LogLevel::CRITICAL),
-                E_STRICT => array(null, LogLevel::WARNING),
+                E_STRICT => array(null, LogLevel::NOTICE),
                 E_WARNING => array(null, LogLevel::WARNING),
                 E_USER_WARNING => array(null, LogLevel::WARNING),
                 E_COMPILE_WARNING => array(null, LogLevel::WARNING),
                 E_CORE_WARNING => array(null, LogLevel::WARNING),
-                E_USER_ERROR => array(null, LogLevel::CRITICAL),
-                E_RECOVERABLE_ERROR => array(null, LogLevel::CRITICAL),
-                E_COMPILE_ERROR => array(null, LogLevel::CRITICAL),
-                E_PARSE => array(null, LogLevel::CRITICAL),
-                E_ERROR => array(null, LogLevel::CRITICAL),
-                E_CORE_ERROR => array(null, LogLevel::CRITICAL),
+                E_USER_ERROR => array(null, LogLevel::ERROR),
+                E_RECOVERABLE_ERROR => array(null, LogLevel::ERROR),
+                E_COMPILE_ERROR => array(null, LogLevel::EMERGENCY),
+                E_PARSE => array(null, LogLevel::EMERGENCY),
+                E_ERROR => array(null, LogLevel::EMERGENCY),
+                E_CORE_ERROR => array(null, LogLevel::EMERGENCY),
             );
             $this->assertSame($loggers, $handler->setLoggers(array()));
 
@@ -389,7 +389,7 @@ class ErrorHandlerTest extends \PHPUnit_Framework_TestCase
             ;
 
             $handler = ErrorHandler::register(E_NOTICE);
-            @$handler->setLogger($logger, 'scream');
+            $handler->setLogger($logger, 'scream');
             unset($undefVar);
             @$undefVar++;
 

Tests/Exception/FlattenExceptionTest.php

@@ -189,9 +189,9 @@ class FlattenExceptionTest extends \PHPUnit_Framework_TestCase
     public function testTooBigArray()
     {
         $a = array();
-        for ($i = 0; $i < 20; $i++) {
-            for ($j = 0; $j < 50; $j++) {
-                for ($k = 0; $k < 10; $k++) {
+        for ($i = 0; $i < 20; ++$i) {
+            for ($j = 0; $j < 50; ++$j) {
+                for ($k = 0; $k < 10; ++$k) {
                     $a[$i][$j][$k] = 'value';
                 }
             }

Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php

@@ -41,7 +41,7 @@ class UndefinedMethodFatalErrorHandlerTest extends \PHPUnit_Framework_TestCase
                     'file' => 'foo.php',
                     'message' => 'Call to undefined method SplObjectStorage::what()',
                 ),
-                'Attempted to call an undefined method named "what" of class "SplObjectStorage".',
+                'Attempted to call method "what" on class "SplObjectStorage".',
             ),
             array(
                 array(
@@ -50,7 +50,7 @@ class UndefinedMethodFatalErrorHandlerTest extends \PHPUnit_Framework_TestCase
                     'file' => 'foo.php',
                     'message' => 'Call to undefined method SplObjectStorage::walid()',
                 ),
-                "Attempted to call an undefined method named \"walid\" of class \"SplObjectStorage\".\nDid you mean to call \"valid\"?",
+                "Attempted to call method \"walid\" on class \"SplObjectStorage\".\nDid you mean to call \"valid\"?",
             ),
             array(
                 array(
@@ -59,7 +59,7 @@ class UndefinedMethodFatalErrorHandlerTest extends \PHPUnit_Framework_TestCase
                     'file' => 'foo.php',
                     'message' => 'Call to undefined method SplObjectStorage::offsetFet()',
                 ),
-                "Attempted to call an undefined method named \"offsetFet\" of class \"SplObjectStorage\".\nDid you mean to call e.g. \"offsetGet\", \"offsetSet\" or \"offsetUnset\"?",
+                "Attempted to call method \"offsetFet\" on class \"SplObjectStorage\".\nDid you mean to call e.g. \"offsetGet\", \"offsetSet\" or \"offsetUnset\"?",
             ),
         );
     }

Tests/Fixtures/DeprecatedClass.php

@@ -1,12 +0,0 @@
-<?php
-
-namespace Symfony\Component\Debug\Tests\Fixtures;
-
-/**
- * @deprecated but this is a test
- *             deprecation notice.
- * @foobar
- */
-class DeprecatedClass
-{
-}

Tests/Fixtures/DeprecatedInterface.php

@@ -1,12 +0,0 @@
-<?php
-
-namespace Symfony\Component\Debug\Tests\Fixtures;
-
-/**
- * @deprecated but this is a test
- *             deprecation notice.
- * @foobar
- */
-interface DeprecatedInterface
-{
-}

composer.json

@@ -16,7 +16,7 @@
         }
     ],
     "require": {
-        "php": ">=5.3.9",
+        "php": ">=5.3.3",
         "psr/log": "~1.0"
     },
     "conflict": {
@@ -33,12 +33,13 @@
         "symfony/http-kernel": ""
     },
     "autoload": {
-        "psr-4": { "Symfony\\Component\\Debug\\": "" }
+        "psr-0": { "Symfony\\Component\\Debug\\": "" }
     },
+    "target-dir": "Symfony/Component/Debug",
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "2.7-dev"
+            "dev-master": "2.6-dev"
         }
     }
 }

phpunit.xml.dist

@@ -9,14 +9,10 @@
     <php>
         <ini name="error_reporting" value="-1" />
     </php>
-
     <testsuites>
         <testsuite name="Symfony Debug Component Test Suite">
             <directory>./Tests/</directory>
         </testsuite>
-        <testsuite name="Symfony Debug Extension Test Suite">
-            <directory suffix=".phpt">./Resources/ext/tests/</directory>
-        </testsuite>
     </testsuites>
 
     <filter>