fixed types in phpdocs

made types consistent with those defined in Hack
Merge branch '2.3' into 2.4
2026-03-25 09:42:20 +01:00 · 2014-04-16 12:34:42 +02:00 · 2014-04-16 10:04:32 +02:00 · 2014-04-16 10:02:57 +02:00 · 2014-04-15 18:41:05 +02:00 · 2014-04-15 07:41:45 +02:00
5 changed files with 10 additions and 10 deletions
--- a/Debug.php
+++ b/Debug.php
@@ -28,8 +28,8 @@ class Debug
     * If the Symfony ClassLoader component is available, a special
     * class loader is also registered.
     *
-     * @param integer $errorReportingLevel The level of error reporting you want
-     * @param Boolean $displayErrors       Whether to display errors (for development) or just log them (for production)
+     * @param int     $errorReportingLevel The level of error reporting you want
+     * @param bool    $displayErrors       Whether to display errors (for development) or just log them (for production)
     */
    public static function enable($errorReportingLevel = null, $displayErrors = true)
    {
--- a/DebugClassLoader.php
+++ b/DebugClassLoader.php
@@ -110,7 +110,7 @@ class DebugClassLoader
     *
     * @param string $class The name of the class
     *
-     * @return Boolean|null True, if loaded
+     * @return bool|null    True, if loaded
     *
     * @throws \RuntimeException
     */
--- a/ErrorHandler.php
+++ b/ErrorHandler.php
@@ -59,8 +59,8 @@ class ErrorHandler
    /**
     * Registers the error handler.
     *
-     * @param integer $level         The level at which the conversion to Exception is done (null to use the error_reporting() value and 0 to disable)
-     * @param Boolean $displayErrors Display errors (for dev environment) or just log them (production usage)
+     * @param int  $level         The level at which the conversion to Exception is done (null to use the error_reporting() value and 0 to disable)
+     * @param bool $displayErrors Display errors (for dev environment) or just log them (production usage)
     *
     * @return ErrorHandler The registered error handler
     */
@@ -81,7 +81,7 @@ class ErrorHandler
    /**
     * Sets the level at which the conversion to Exception is done.
     *
-     * @param integer|null $level The level (null to use the error_reporting() value and 0 to disable)
+     * @param int|null     $level The level (null to use the error_reporting() value and 0 to disable)
     */
    public function setLevel($level)
    {
@@ -91,7 +91,7 @@ class ErrorHandler
    /**
     * Sets the display_errors flag value.
     *
-     * @param integer $displayErrors The display_errors flag value
+     * @param int     $displayErrors The display_errors flag value
     */
    public function setDisplayErrors($displayErrors)
    {
--- a/ExceptionHandler.php
+++ b/ExceptionHandler.php
@@ -43,7 +43,7 @@ class ExceptionHandler
    /**
     * Registers the exception handler.
     *
-     * @param Boolean $debug
+     * @param bool    $debug
     *
     * @return ExceptionHandler The registered exception handler
     */
--- a/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php
+++ b/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php
@@ -150,7 +150,7 @@ class ClassNotFoundFatalErrorHandler implements FatalErrorHandlerInterface
     */
    private function convertFileToClass($path, $file)
    {
-        $namespacedClass = str_replace(array($path.'/', '.php', '/'), array('', '', '\\'), $file);
+        $namespacedClass = str_replace(array($path.DIRECTORY_SEPARATOR, '.php', '/'), array('', '', '\\'), $file);
        $pearClass = str_replace('\\', '_', $namespacedClass);

        // We cannot use the autoloader here as most of them use require; but if the class
@@ -172,7 +172,7 @@ class ClassNotFoundFatalErrorHandler implements FatalErrorHandlerInterface
    /**
     * @param string $class
     *
-     * @return Boolean
+     * @return bool
     */
    private function classExists($class)
    {
Author	SHA1	Message	Date
Fabien Potencier	6a8eb9aba5	fixed types in phpdocs	2014-04-16 12:34:42 +02:00
Fabien Potencier	e630309d00	made types consistent with those defined in Hack	2014-04-16 10:04:32 +02:00
Fabien Potencier	56c0a30907	Merge branch '2.3' into 2.4 * 2.3: made {@inheritdoc} annotations consistent across the board fixed types in phpdocs made phpdoc types consistent with those defined in Hack Add support Thai translations made types consistent with those defined in Hack removed extra/unsupported arguments [HttpKernel] fixed an error message [TwigBundle] removed undefined argument [Translation] Make IcuDatFileLoader/IcuResFileLoader::load invalid resource compatible with HHVM. Conflicts: src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service.php src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php src/Symfony/Bundle/FrameworkBundle/Templating/Loader/FilesystemLoader.php src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php src/Symfony/Component/Config/Definition/ReferenceDumper.php src/Symfony/Component/Console/Helper/DescriptorHelper.php src/Symfony/Component/Debug/ErrorHandler.php src/Symfony/Component/Finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php src/Symfony/Component/Form/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php src/Symfony/Component/Form/Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php src/Symfony/Component/HttpFoundation/Response.php src/Symfony/Component/HttpFoundation/StreamedResponse.php src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php src/Symfony/Component/HttpKernel/Fragment/RoutableFragmentRenderer.php src/Symfony/Component/HttpKernel/Kernel.php src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTest.php src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php src/Symfony/Component/Stopwatch/StopwatchPeriod.php src/Symfony/Component/Translation/TranslatorInterface.php src/Symfony/Component/Validator/ConstraintValidatorFactory.php	2014-04-16 10:02:57 +02:00
Grégoire Pineau	bfa7900678	[Debug] Fixed ClassNotFoundFatalErrorHandler on windows. Because $path is realpath'ed. So we have to use DIRECTORY_SEPARATOR instead of / because the default directory separator on windows is \. And so the str_replace can not work and can lead to a fatal error because class could already be loaded. For example, the Response class in symfony full stack is in the bootstrap.php.cache.	2014-04-15 18:41:05 +02:00
Fabien Potencier	bdfb718a6c	made phpdoc types consistent with those defined in Hack	2014-04-15 07:41:45 +02:00