Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Feb 21, 2015
  1. @nicolas-grekas

    Merge branch '2.7'

    nicolas-grekas authored
    * 2.7:
      [PhpUnitBridge] new bridge for testing with PHPUnit
      [FrameworkBundle] Check if templating is enabled.
      [Filesystem] Improve exception message for copy method
      [FrameworkBundle] Made ServerParams a service
      [2.7] [FrameworkBundle] bugfix in configuration for assets
      [FrameworkBundle] Enable assets by default.
      [Form] OptionsResolver 3.0 is not BC anymore
      [TwigBundle] add missing asset dependency
      Add an auto_alias compiler pass
    
    Conflicts:
    	.travis.yml
    	composer.json
    	src/Symfony/Bridge/Doctrine/composer.json
    	src/Symfony/Bridge/Monolog/composer.json
    	src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
    	src/Symfony/Bridge/ProxyManager/composer.json
    	src/Symfony/Bridge/Swiftmailer/composer.json
    	src/Symfony/Bridge/Twig/composer.json
    	src/Symfony/Bundle/DebugBundle/composer.json
    	src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
    	src/Symfony/Bundle/FrameworkBundle/composer.json
    	src/Symfony/Bundle/SecurityBundle/composer.json
    	src/Symfony/Bundle/TwigBundle/composer.json
    	src/Symfony/Bundle/WebProfilerBundle/composer.json
    	src/Symfony/Component/BrowserKit/composer.json
    	src/Symfony/Component/ClassLoader/composer.json
    	src/Symfony/Component/Console/composer.json
    	src/Symfony/Component/Debug/composer.json
    	src/Symfony/Component/DependencyInjection/composer.json
    	src/Symfony/Component/DomCrawler/composer.json
    	src/Symfony/Component/EventDispatcher/composer.json
    	src/Symfony/Component/Form/composer.json
    	src/Symfony/Component/HttpFoundation/composer.json
    	src/Symfony/Component/HttpKernel/composer.json
    	src/Symfony/Component/Intl/composer.json
    	src/Symfony/Component/Routing/composer.json
    	src/Symfony/Component/Security/Core/composer.json
    	src/Symfony/Component/Security/Csrf/composer.json
    	src/Symfony/Component/Security/Http/composer.json
    	src/Symfony/Component/Security/composer.json
    	src/Symfony/Component/Serializer/composer.json
    	src/Symfony/Component/Translation/composer.json
    	src/Symfony/Component/Validator/composer.json
Commits on Feb 18, 2015
  1. @nicolas-grekas
Commits on Jan 9, 2015
  1. @fabpot
Commits on Jan 6, 2015
  1. @fabpot

    Merge branch '2.7'

    fabpot authored
    * 2.7: (23 commits)
      [FrameworkBundle] Removed the use of TableHelper
      Spanish translation for the ```checkDNS``` option introduced in #12956.
      use Table instead of the deprecated TableHelper
      [2.3] fix failing test
      Fixes more deprecation notices as per @stof review.
      Fixed some deprecations according to @stof feedbacks.
      Normalizes deprecation notice messages.
      [Validator] fixes UuidValidator deprecated class namespace.
      [Form] adds more deprecation notices.
      [Validator] adds more deprecation notices.
      [Form] Adds a way to trigger deprecation notice on demand for VirtualFormAwareIterator class.
      Fixes more deprecation notices.
      Normalized @deprecated annotations.
      Removed deprecation notices from test files.
      Fixes deprecation notices.
      Reverted trigger_error() function calls on deprecated interfaces to prevent breaking third party projects implementing them.
      Adds deprecation notices for structures to be removed in 3.0.
      fixed typo
      Escape annotations in comments, refs #13089.
      [2.3] missing cleanup for legacy test
      ...
    
    Conflicts:
    	.travis.yml
    	src/Symfony/Bridge/Monolog/Logger.php
    	src/Symfony/Bridge/Swiftmailer/DataCollector/MessageDataCollector.php
    	src/Symfony/Bridge/Twig/Node/FormEnctypeNode.php
    	src/Symfony/Bundle/FrameworkBundle/Command/RouterApacheDumperCommand.php
    	src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php
    	src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
    	src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
    	src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php
    	src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.txt
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.txt
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.txt
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/parameters_1.txt
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.txt
    	src/Symfony/Bundle/FrameworkBundle/composer.json
    	src/Symfony/Component/Config/Definition/ReferenceDumper.php
    	src/Symfony/Component/Console/Helper/DialogHelper.php
    	src/Symfony/Component/Console/Helper/ProgressHelper.php
    	src/Symfony/Component/Console/Helper/TableHelper.php
    	src/Symfony/Component/Form/Deprecated/FormEvents.php
    	src/Symfony/Component/Form/Extension/HttpFoundation/EventListener/BindRequestListener.php
    	src/Symfony/Component/Form/FormEvents.php
    	src/Symfony/Component/HttpKernel/Debug/ErrorHandler.php
    	src/Symfony/Component/HttpKernel/Debug/ExceptionHandler.php
    	src/Symfony/Component/HttpKernel/Kernel.php
    	src/Symfony/Component/HttpKernel/KernelInterface.php
    	src/Symfony/Component/OptionsResolver/Tests/LegacyOptionsTest.php
    	src/Symfony/Component/Process/Process.php
    	src/Symfony/Component/Routing/Matcher/ApacheUrlMatcher.php
    	src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php
    	src/Symfony/Component/Yaml/Yaml.php
Commits on Jan 5, 2015
  1. @hhamon

    Normalized @deprecated annotations.

    hhamon authored
  2. @hhamon
Commits on Jan 3, 2015
  1. @nicolas-grekas

    Merge branch '2.7'

    nicolas-grekas authored
    * 2.7:
      [Hackday] - add trigger error for deprecated clases.
      [2.3] Remove useless tests skips
      [ClassLoader] removes deprecated classes from documentation.
      Add type aliases for allowed types in OptionsResolver
      [ClassLoader] added missing deprecation notice.
      [HttpFoundation] Fix an issue caused by php's Bug #66606.
      [Yaml] Update README.md
      Don't add Accept-Range header on unsafe HTTP requests
      simplify hasScheme method
      adapted merge to 2.5
      adapted previous commit for 2.3
      [Security] Don't send remember cookie for sub request
      [Security] fixed wrong phpdoc
      [HttpKernel] Fix UriSigner::check when _hash is not at the end of the uri
      [2.3] Cleanup deprecations
      [Form] Add deprecation message for Form::bind() and Form::isBound()
      [Validator] add deprecation log (#12674)
      [Filesystem] Keep executable permission when a file is copied
      [HttpKernel] RouterListener uses "context" argument when logging route
    
    Conflicts:
    	src/Symfony/Bridge/Twig/composer.json
    	src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php
    	src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperTableLayoutTest.php
    	src/Symfony/Bundle/FrameworkBundle/composer.json
    	src/Symfony/Bundle/TwigBundle/composer.json
    	src/Symfony/Component/Debug/composer.json
    	src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
    	src/Symfony/Component/Form/Tests/ResolvedFormTypeTest.php
    	src/Symfony/Component/HttpKernel/CHANGELOG.md
    	src/Symfony/Component/HttpKernel/composer.json
    	src/Symfony/Component/Security/composer.json
  2. @nicolas-grekas

    Merge branch '2.6' into 2.7

    nicolas-grekas authored
    * 2.6:
      [2.3] Remove useless tests skips
      [ClassLoader] removes deprecated classes from documentation.
      [ClassLoader] added missing deprecation notice.
      [HttpFoundation] Fix an issue caused by php's Bug #66606.
      [Yaml] Update README.md
      Don't add Accept-Range header on unsafe HTTP requests
      simplify hasScheme method
      adapted merge to 2.5
      adapted previous commit for 2.3
      [Security] Don't send remember cookie for sub request
      [Security] fixed wrong phpdoc
      [HttpKernel] Fix UriSigner::check when _hash is not at the end of the uri
      [2.3] Cleanup deprecations
    
    Conflicts:
    	src/Symfony/Bridge/Twig/composer.json
    	src/Symfony/Bundle/FrameworkBundle/composer.json
    	src/Symfony/Bundle/TwigBundle/composer.json
    	src/Symfony/Component/ClassLoader/UniversalClassLoader.php
    	src/Symfony/Component/Debug/composer.json
    	src/Symfony/Component/Form/ButtonBuilder.php
    	src/Symfony/Component/HttpKernel/Exception/FatalErrorException.php
    	src/Symfony/Component/HttpKernel/Exception/FlattenException.php
    	src/Symfony/Component/HttpKernel/composer.json
    	src/Symfony/Component/Security/composer.json
    	src/Symfony/Component/Validator/composer.json
  3. @nicolas-grekas

    Merge branch '2.5' into 2.6

    nicolas-grekas authored
    * 2.5:
      [2.3] Remove useless tests skips
      [ClassLoader] removes deprecated classes from documentation.
      [ClassLoader] added missing deprecation notice.
      [HttpFoundation] Fix an issue caused by php's Bug #66606.
      [Yaml] Update README.md
      Don't add Accept-Range header on unsafe HTTP requests
      simplify hasScheme method
      adapted merge to 2.5
      adapted previous commit for 2.3
      [Security] Don't send remember cookie for sub request
      [Security] fixed wrong phpdoc
      [HttpKernel] Fix UriSigner::check when _hash is not at the end of the uri
      [2.3] Cleanup deprecations
    
    Conflicts:
    	src/Symfony/Bundle/FrameworkBundle/composer.json
    	src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig
    	src/Symfony/Component/HttpKernel/composer.json
  4. @nicolas-grekas

    Merge branch '2.3' into 2.5

    nicolas-grekas authored
    * 2.3:
      [2.3] Remove useless tests skips
      [2.3] Cleanup deprecations
    
    Conflicts:
    	src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypePerformanceTest.php
    	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
    	src/Symfony/Bundle/FrameworkBundle/composer.json
    	src/Symfony/Bundle/TwigBundle/composer.json
    	src/Symfony/Component/Debug/Tests/MockExceptionHandler.php
    	src/Symfony/Component/Debug/composer.json
    	src/Symfony/Component/Form/Tests/ResolvedFormTypeTest.php
    	src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php
    	src/Symfony/Component/HttpKernel/Tests/DataCollector/LoggerDataCollectorTest.php
    	src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php
    	src/Symfony/Component/HttpKernel/Tests/Debug/TraceableEventDispatcherTest.php
    	src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php
    	src/Symfony/Component/HttpKernel/Tests/EventListener/RouterListenerTest.php
    	src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTest.php
    	src/Symfony/Component/HttpKernel/composer.json
    	src/Symfony/Component/Routing/Tests/Annotation/RouteTest.php
    	src/Symfony/Component/Security/Tests/Core/Validator/Constraints/UserPasswordValidatorTest.php
    	src/Symfony/Component/Security/composer.json
  5. @nicolas-grekas
  6. @fabpot

    Merge branch '2.7'

    fabpot authored
    * 2.7:
      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:
      Add deprecation warning to LegacyPdoSessionHandler
    
    Conflicts:
    	src/Symfony/Bridge/Monolog/Logger.php
    	src/Symfony/Bridge/Swiftmailer/LICENSE
    	src/Symfony/Component/Debug/composer.json
    	src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php
  7. @fabpot

    Merge branch '2.6' into 2.7

    fabpot authored
    * 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
  8. @fabpot

    Merge branch '2.5' into 2.6

    fabpot authored
    * 2.5:
      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
      Clarify a comment.
    
    Conflicts:
    	src/Symfony/Component/HttpKernel/Fragment/EsiFragmentRenderer.php
  9. @fabpot

    Merge branch '2.3' into 2.5

    fabpot authored
    * 2.3:
      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
    
    Conflicts:
    	src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php
    	src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php
    	src/Symfony/Bundle/TwigBundle/Command/LintCommand.php
    	src/Symfony/Component/Debug/ExceptionHandler.php
    	src/Symfony/Component/Process/Tests/AbstractProcessTest.php
Commits on Jan 1, 2015
  1. @saro0h

    Updated copyright to 2015

    saro0h authored
Commits on Dec 30, 2014
  1. @nicolas-grekas
  2. @fabpot

    Merge branch '2.7'

    fabpot authored
    * 2.7: (26 commits)
      Updated generateSql tool
      Fix grammar
      Fix the implementation of deprecated Locale classes
      Fix phpdoc and coding standards
      Replace usages of the deprecated TypeTestCase by the new one
      Remove usages of deprecated constants
      Update functional tests to use the PSR NullLogger
      Updated the SQL data generated from the generateSql tool
      Updated generateSql tool
      fix regression in form tests after pr #13027 | Q             | A | ------------- | --- | Bug fix?      | yes | New feature?  | no | BC breaks?    | no | Deprecations? | no | Tests pass?   | yes | Fixed tickets | - | License       | MIT | Doc PR        | -
      [FrameworkBundle] added a test router for the buil-in web server
      Make fabbot happy
      Clean up testing
      No global state for isolated tests and other fixes
      No global state for isolated tests and other fixes
      fix #10054 - form data collector with dynamic fields
      [TwigBundle] Moved the setting of the default escaping strategy from the Twig engine to the Twig environment
      [Debug] fix checkip6
      [HttpFoundation] fixed error when an IP in the X-Forwarded-For HTTP header contains a port
      [2.7] Allow 3.0 requirements
      ...
  3. @fabpot

    Merge branch '2.6' into 2.7

    fabpot authored
    * 2.6: (21 commits)
      Updated generateSql tool
      Fix grammar
      Fix the implementation of deprecated Locale classes
      Fix phpdoc and coding standards
      Replace usages of the deprecated TypeTestCase by the new one
      Remove usages of deprecated constants
      Update functional tests to use the PSR NullLogger
      fix regression in form tests after pr #13027 | Q             | A | ------------- | --- | Bug fix?      | yes | New feature?  | no | BC breaks?    | no | Deprecations? | no | Tests pass?   | yes | Fixed tickets | - | License       | MIT | Doc PR        | -
      Make fabbot happy
      Clean up testing
      No global state for isolated tests and other fixes
      No global state for isolated tests and other fixes
      fix #10054 - form data collector with dynamic fields
      [TwigBundle] Moved the setting of the default escaping strategy from the Twig engine to the Twig environment
      [Debug] fix checkip6
      [HttpFoundation] fixed error when an IP in the X-Forwarded-For HTTP header contains a port
      Update the note about origins of the CssSelector component.
      Use the correct cssselect library name in docblocks.
      Fix wrong DateTransformer timezone param for non-UTC configuration. #12808
      [Form] Add further timezone tests for date type
      ...
    
    Conflicts:
    	src/Symfony/Component/Locale/Locale.php
    	src/Symfony/Component/Locale/composer.json
  4. @fabpot

    Merge branch '2.5' into 2.6

    fabpot authored
    * 2.5:
      Updated generateSql tool
      Fix the implementation of deprecated Locale classes
      Fix phpdoc and coding standards
      Replace usages of the deprecated TypeTestCase by the new one
      Remove usages of deprecated constants
      Update functional tests to use the PSR NullLogger
      fix regression in form tests after pr #13027 | Q             | A | ------------- | --- | Bug fix?      | yes | New feature?  | no | BC breaks?    | no | Deprecations? | no | Tests pass?   | yes | Fixed tickets | - | License       | MIT | Doc PR        | -
      Make fabbot happy
      Clean up testing
      No global state for isolated tests and other fixes
      No global state for isolated tests and other fixes
      fix #10054 - form data collector with dynamic fields
      [TwigBundle] Moved the setting of the default escaping strategy from the Twig engine to the Twig environment
      [Debug] fix checkip6
      [HttpFoundation] fixed error when an IP in the X-Forwarded-For HTTP header contains a port
      Update the note about origins of the CssSelector component.
      Use the correct cssselect library name in docblocks.
      [DomCrawler] fixed bug #12143
    
    Conflicts:
    	src/Symfony/Bundle/FrameworkBundle/Templating/GlobalVariables.php
    	src/Symfony/Component/Serializer/Normalizer/DenormalizableInterface.php
  5. @fabpot

    Merge branch '2.3' into 2.5

    fabpot authored
    * 2.3:
      Updated generateSql tool
      Fix the implementation of deprecated Locale classes
      Fix phpdoc and coding standards
      Replace usages of the deprecated TypeTestCase by the new one
      Remove usages of deprecated constants
      Update functional tests to use the PSR NullLogger
      Make fabbot happy
      Clean up testing
      [DomCrawler] fixed bug #12143
    
    Conflicts:
    	src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
    	src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TimedPhpEngineTest.php
    	src/Symfony/Bundle/TwigBundle/Tests/Loader/FilesystemLoaderTest.php
    	src/Symfony/Component/Console/Application.php
    	src/Symfony/Component/DomCrawler/Crawler.php
    	src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php
    	src/Symfony/Component/Form/Tests/Extension/Csrf/Type/FormTypeCsrfExtensionTest.php
    	src/Symfony/Component/HttpKernel/Tests/Bundle/BundleTest.php
    	src/Symfony/Component/Serializer/Encoder/EncoderInterface.php
    	src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
    	src/Symfony/Component/Validator/Tests/Mapping/ClassMetadataFactoryTest.php
  6. @fabpot

    minor #13165 Fix the implementation of deprecated Locale classes (stof)

    fabpot authored
    This PR was merged into the 2.3 branch.
    
    Discussion
    ----------
    
    Fix the implementation of deprecated Locale classes
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | n/a
    | License       | MIT
    | Doc PR        | n/a
    
    The ICU component does not exist anymore, but the BC layer was still referencing it.
    
    Commits
    -------
    
    eb0637f Fix the implementation of deprecated Locale classes
  7. @stof

    Fix the implementation of deprecated Locale classes

    stof authored
    The ICU component does not exist anymore.
Commits on Dec 29, 2014
  1. @stof

    Fix phpdoc and coding standards

    stof authored
    This removes the unused use statements which were not catched by
    PHP-CS-Fixer because of string occurences. It also fixes some invalid
    phpdoc (scalar is not recognized as a valid type for instance).
  2. @fabpot

    Merge branch '2.3' into 2.5

    fabpot authored
    * 2.3:
      No global state for isolated tests and other fixes
      [TwigBundle] Moved the setting of the default escaping strategy from the Twig engine to the Twig environment
      [Debug] fix checkip6
      [HttpFoundation] fixed error when an IP in the X-Forwarded-For HTTP header contains a port
      Update the note about origins of the CssSelector component.
      Use the correct cssselect library name in docblocks.
  3. @nicolas-grekas
Commits on Dec 27, 2014
  1. @nicolas-grekas
Commits on Dec 22, 2014
  1. @fabpot

    Merge branch '2.7'

    fabpot authored
    * 2.7:
      [2.3] CS And DocBlock Fixes
      [Serializer] Serialization groups support
      [2.3] CS Fixes
      Fixed the issue 11116
      [Security] Fixed tests
      [Debug] use ternary operator to simplify the getClassLoader() method in DebugClassLoader class.
      [FrameworkBundle] Fixed Translation loader and update translation command.
      [Console] remove « use » statement for PHP built-in exception classes.
      [SecurityBundle] replaced deprecated SecurityContextInterface dependency by new TokenStorageInterface instance in SecurityDataCollector. Also added unit tests suite for SecurityDataCollector class.
      [SecurityBundle] use TokenStorageInterface instead of deprecated SecurityContextInterface in SecurityDataCollector and added unit tests suite.
      [SecurityBundle] adds unit tests suite for SecurityDataCollector class.
      [Serializer] Add xml_format_output context option. Close #12517.
      [WebProfilerBundle] Fixed IE8 support
  2. @fabpot

    Merge branch '2.6' into 2.7

    fabpot authored
    * 2.6:
      [2.3] CS And DocBlock Fixes
      [2.3] CS Fixes
      [FrameworkBundle] Fixed Translation loader and update translation command.
      [Console] remove « use » statement for PHP built-in exception classes.
      [SecurityBundle] adds unit tests suite for SecurityDataCollector class.
    
    Conflicts:
    	src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php
  3. @fabpot

    Merge branch '2.5' into 2.6

    fabpot authored
    * 2.5:
      [2.3] CS And DocBlock Fixes
      [2.3] CS Fixes
      [FrameworkBundle] Fixed Translation loader and update translation command.
      [Console] remove « use » statement for PHP built-in exception classes.
      [SecurityBundle] adds unit tests suite for SecurityDataCollector class.
    
    Conflicts:
    	src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php
    	src/Symfony/Bundle/SecurityBundle/Tests/DataCollector/SecurityDataCollectorTest.php
    	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
    	src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
    	src/Symfony/Component/Form/Form.php
    	src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
    	src/Symfony/Component/OptionsResolver/Options.php
    	src/Symfony/Component/OptionsResolver/OptionsResolver.php
    	src/Symfony/Component/Process/ProcessPipes.php
    	src/Symfony/Component/Stopwatch/Stopwatch.php
    	src/Symfony/Component/Translation/Loader/XliffFileLoader.php
    	src/Symfony/Component/Validator/Tests/Constraints/AbstractComparisonValidatorTestCase.php
  4. @fabpot

    Merge branch '2.3' into 2.5

    fabpot authored
    * 2.3:
      [2.3] CS And DocBlock Fixes
      [2.3] CS Fixes
    
    Conflicts:
    	src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php
    	src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
    	src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php
    	src/Symfony/Bundle/FrameworkBundle/EventListener/TestSessionListener.php
    	src/Symfony/Component/Config/Definition/ReferenceDumper.php
    	src/Symfony/Component/Console/Application.php
    	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
    	src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
    	src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php
    	src/Symfony/Component/Form/FormError.php
    	src/Symfony/Component/HttpFoundation/Request.php
    	src/Symfony/Component/HttpFoundation/Response.php
    	src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
    	src/Symfony/Component/Process/ProcessUtils.php
    	src/Symfony/Component/PropertyAccess/PropertyAccessor.php
    	src/Symfony/Component/PropertyAccess/PropertyAccessorInterface.php
    	src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
    	src/Symfony/Component/Validator/Constraints/CardSchemeValidator.php
    	src/Symfony/Component/Validator/Constraints/GroupSequence.php
    	src/Symfony/Component/Validator/Mapping/ClassMetadata.php
    	src/Symfony/Component/Validator/Mapping/ClassMetadataFactory.php
    	src/Symfony/Component/Validator/Mapping/MemberMetadata.php
    	src/Symfony/Component/Validator/Tests/Fixtures/StubGlobalExecutionContext.php
  5. @GrahamCampbell @fabpot

    [2.3] CS And DocBlock Fixes

    GrahamCampbell authored fabpot committed
Commits on Dec 20, 2014
  1. @fabpot

    Merge branch '2.5' into 2.6

    fabpot authored
    * 2.5:
      [Config] adds missing « use » statement for InvalidTypeException type hint in documentation.
      [Config] fixes broken unit test on ArrayNode class.
      fixed CS
      [Security] Delete old session on auth strategy migrate
      update required minimum TwigBridge version
      Very minor grammar fix in error message
      [Tests] Silenced all deprecations in tests for 2.3
      BinaryFileResponse - add missing newline
      fixed CS
      add a limit and a test to FlattenExceptionTest.
      CS: There should be no empty lines following phpdocs
      [FrameworkBundle] fix cache:clear command
      [2.3] Docblocks should not be followed by a blank line
      Fix return phpdoc
      [PropertyAccess] Added test to verify #5775 is fixed
  2. @fabpot

    Merge branch '2.3' into 2.5

    fabpot authored
    * 2.3:
      [Config] adds missing « use » statement for InvalidTypeException type hint in documentation.
      [Config] fixes broken unit test on ArrayNode class.
      fixed CS
      [Security] Delete old session on auth strategy migrate
      update required minimum TwigBridge version
      Very minor grammar fix in error message
      [Tests] Silenced all deprecations in tests for 2.3
      BinaryFileResponse - add missing newline
      fixed CS
      add a limit and a test to FlattenExceptionTest.
      CS: There should be no empty lines following phpdocs
      [FrameworkBundle] fix cache:clear command
      [2.3] Docblocks should not be followed by a blank line
      Fix return phpdoc
      [PropertyAccess] Added test to verify #5775 is fixed
    
    Conflicts:
    	src/Symfony/Bundle/TwigBundle/composer.json
    	src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
    	src/Symfony/Component/Security/Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php
Commits on Dec 18, 2014
  1. @saro0h
Something went wrong with that request. Please try again.