diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-01-03 09:02:46 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-01-03 09:02:46 +0100 |
| commit | 372ec330bc9242dca13bc53326e00820fa868811 (patch) | |
| tree | 186e187a9394b64eb5572ab9c5aba469ba97cab4 /Core | |
| parent | 6e96a175c73cad7542ca394b821e5fd912919dec (diff) | |
| parent | 6c39103b6f13e2bcde7c3543a8e28e0dd3c1f571 (diff) | |
| download | symfony-security-372ec330bc9242dca13bc53326e00820fa868811.zip symfony-security-372ec330bc9242dca13bc53326e00820fa868811.tar.gz symfony-security-372ec330bc9242dca13bc53326e00820fa868811.tar.bz2 | |
Merge branch '2.6' into 2.7
* 2.6:
Use PHPUnit ini_set wrapper in tests
[Process] Added a test skip check for Windows
[Process] Removed unused variable assignment
Fixes various phpdoc and coding standards.
Fixes Issue #13184 - incremental output getters now return empty strings
Updated copyright to 2015
Updated copyright to 2015
Updated copyright to 2015
[VarDumper] increase debug.max_items to 2500
[Debug] Update exception messages.
use value of DIRECTORY_SEPARATOR to detect Windows
force ExpressionLanguage version >= 2.6
[Debug] fixes ClassNotFoundFatalErrorHandler to correctly handle class not found errors with Symfony ClassLoader component autoloaders.
Clarify a comment.
use PHP_WINDOWS_VERSION_BUILD to detect Windows
Check if a field type_class is defined before using it.
Currently if you want to use inline bootstrap form rendering, this is usually enough:
Conflicts:
src/Symfony/Component/Debug/composer.json
Diffstat (limited to 'Core')
| -rw-r--r-- | Core/LICENSE | 2 | ||||
| -rw-r--r-- | Core/Util/ClassUtils.php | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Core/LICENSE b/Core/LICENSE index 0b3292c..43028bc 100644 --- a/Core/LICENSE +++ b/Core/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2004-2014 Fabien Potencier +Copyright (c) 2004-2015 Fabien Potencier Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Core/Util/ClassUtils.php b/Core/Util/ClassUtils.php index 0585204..6107c40 100644 --- a/Core/Util/ClassUtils.php +++ b/Core/Util/ClassUtils.php @@ -11,11 +11,13 @@ namespace Symfony\Component\Security\Core\Util; +use Doctrine\Common\Util\ClassUtils as DoctrineClassUtils; + /** * Class related functionality for objects that * might or might not be proxy objects at the moment. * - * @see Doctrine\Common\Util\ClassUtils + * @see DoctrineClassUtils * * @author Benjamin Eberlei <kontakt@beberlei.de> * @author Johannes Schmitt <schmittjoh@gmail.com> |