Commits on Jan 3, 2016
  1. @fabpot

    Merge branch '2.7' into 2.8

    * 2.7:
      updated copyright year
      Update copyright year
      [2.3] Static Code Analysis for Components
    fabpot committed Jan 3, 2016
  2. @fabpot

    Merge branch '2.3' into 2.7

    * 2.3:
      Update copyright year
      [2.3] Static Code Analysis for Components
    fabpot committed Jan 3, 2016
Commits on Jan 2, 2016
  1. @dosten

    Update copyright year

    dosten committed Jan 1, 2016
Commits on Dec 5, 2015
  1. @stof

    Merge branch '3.0'

    * 3.0:
      [Process] Fix stopping a process on Windows
      [PhpUnitBridge] Add weak-verbose mode and match against message instead of test name
      Added a note about the new requirement iconv.
      Improved error messages for Yaml Deprecations
      Added a test case for the Logger class.
      [Form] Fix choices defined as Traversable
      CS: general fixes
      Suggested Process dependency
    stof committed Dec 5, 2015
  2. @stof

    Merge branch '2.8' into 3.0

    * 2.8:
      [Process] Fix stopping a process on Windows
      [PhpUnitBridge] Add weak-verbose mode and match against message instead of test name
      Added a note about the new requirement iconv.
      Improved error messages for Yaml Deprecations
      Added a test case for the Logger class.
      [Form] Fix choices defined as Traversable
      CS: general fixes
      Suggested Process dependency
    stof committed Dec 5, 2015
  3. @stof

    Merge branch '2.7' into 2.8

    * 2.7:
      [Process] Fix stopping a process on Windows
      Added a test case for the Logger class.
      CS: general fixes
    stof committed Dec 5, 2015
  4. @stof

    Merge branch '2.3' into 2.7

    * 2.3:
      [Process] Fix stopping a process on Windows
      Added a test case for the Logger class.
      CS: general fixes
    stof committed Dec 5, 2015
  5. @derrabus
  6. @derrabus
Commits on Nov 30, 2015
  1. @fabpot

    updated version to 3.1

    fabpot committed Nov 30, 2015
Commits on Nov 18, 2015
  1. @nicolas-grekas

    Merge branch '2.8'

    * 2.8:
      Fix undefined array $server
      Fix call to undefined function json_last_error_message
      Fix bug in windows detection
      [ProxyManager] Tmp fix composer reqs issue in ZF
      Fix PropertyInfo extractor namespace in framework bundle
      Add missing exclusions from phpunit.xml.dist
      [Serializer] ObjectNormalizer: don't serialize static methods and props
      [Form] Enhance some FormRegistry deprecation messages
      [Validator] [sl] BIC (SWIFT-BIC) validation constraint
      [WebProfilerBundle] correct typo in show stack trace link
      bumped Symfony version to 2.8.0
      updated VERSION for 2.8.0-BETA1
      updated CHANGELOG for 2.8.0-BETA1
      Fix the server variables in the router_*.php files
      [Validator] Allow an empty path with a non empty fragment or a query
      The following change adds support for Armenian pluralization.
      [2.3][Process] fix Proccess run with pts enabled
    
    Conflicts:
    	src/Symfony/Bridge/ProxyManager/composer.json
    	src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/FormPass.php
    	src/Symfony/Component/Form/FormRegistry.php
    nicolas-grekas committed Nov 18, 2015
  2. @nicolas-grekas

    Merge branch '2.7' into 2.8

    * 2.7:
      Fix undefined array $server
      Fix bug in windows detection
      [ProxyManager] Tmp fix composer reqs issue in ZF
      Add missing exclusions from phpunit.xml.dist
      [Serializer] ObjectNormalizer: don't serialize static methods and props
      Fix the server variables in the router_*.php files
      [Validator] Allow an empty path with a non empty fragment or a query
      The following change adds support for Armenian pluralization.
      [2.3][Process] fix Proccess run with pts enabled
    
    Conflicts:
    	composer.json
    	src/Symfony/Bridge/ProxyManager/composer.json
    	src/Symfony/Component/Security/phpunit.xml.dist
    nicolas-grekas committed Nov 18, 2015
  3. @nicolas-grekas

    Merge branch '2.3' into 2.7

    * 2.3:
      Fix undefined array $server
      [ProxyManager] Tmp fix composer reqs issue in ZF
      Add missing exclusions from phpunit.xml.dist
      Fix the server variables in the router_*.php files
      [Validator] Allow an empty path with a non empty fragment or a query
      The following change adds support for Armenian pluralization.
      [2.3][Process] fix Proccess run with pts enabled
    
    Conflicts:
    	composer.json
    	src/Symfony/Bridge/ProxyManager/composer.json
    	src/Symfony/Bundle/DebugBundle/phpunit.xml.dist
    	src/Symfony/Component/Security/phpunit.xml.dist
    nicolas-grekas committed Nov 18, 2015
  4. @nicolas-grekas
Commits on Oct 30, 2015
  1. @fabpot

    Merge branch '2.8'

    * 2.8:
      added the new Composer exclude-from-classmap option
      added the new Composer exclude-from-classmap option
      fix docblock description for the build() method
      fix expected argument type docblock
      Set back libxml settings after testings.
      fixed Twig deprecation notices
    fabpot committed Oct 30, 2015
  2. @fabpot

    Merge branch '2.7' into 2.8

    * 2.7:
      added the new Composer exclude-from-classmap option
      added the new Composer exclude-from-classmap option
      fix expected argument type docblock
      Set back libxml settings after testings.
      fixed Twig deprecation notices
    fabpot committed Oct 30, 2015
  3. @fabpot

    Merge branch '2.3' into 2.7

    * 2.3:
      added the new Composer exclude-from-classmap option
      fix expected argument type docblock
      Set back libxml settings after testings.
      fixed Twig deprecation notices
    fabpot committed Oct 30, 2015
  4. @annesosensio @fabpot
Commits on Oct 11, 2015
  1. @nicolas-grekas

    Merge branch '2.3' into 2.7

    * 2.3:
      [ci] SymfonyTestsListener is now auto-registered
      adds validation messages missing italian translations
    nicolas-grekas committed Oct 11, 2015
  2. @nicolas-grekas
  3. @nicolas-grekas

    Merge branch '2.8'

    * 2.8:
      [PhpUnit] Auto-register SymfonyTestsListener
      [phpunit] Upgrade when a change is detected and when install subcommand is used
      [Filesystem] Fix test on Windows
      Fix merge
      [HttpFoundation] Extend ClockMock to session storage tests
      [Process] Don't use @requires on abstract class
      [VarDumper] Fix wordwrap with Bootstrap
      Fix the BC layer for the key->secret renaming for remember_me
      Fix potential access to undefined index
    
    Conflicts:
    	src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php
    	src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/LegacyPdoSessionHandlerTest.php
    	src/Symfony/Component/Locale/phpunit.xml.dist
    nicolas-grekas committed Oct 11, 2015
  4. @nicolas-grekas
Commits on Oct 10, 2015
  1. @nicolas-grekas

    Merge branch '2.8'

    * 2.8:
      Fix merge
      [tests] Use @requires annotation when possible
      [tests] Use @requires annotation when possible
      [PhpUnitBridge] Add SkippedTestsListener to collect and replay skipped tests
      [ci] Enable collecting and replaying skipped tests
      [tests] Use @requires annotation when possible
      [Process] Workaround buggy PHP warning
      [FrameworkBundle] Replace PhpFileCache by FilesystemCache
      [FrameworkBundle] composer suggest fix
      [Console] Add additional ways to detect OS400 platform
      [Yaml] Allow tabs before comments at the end of a line
      Added more tests for PropertyAccess
    
    Conflicts:
    	.travis.yml
    	src/Symfony/Bridge/Doctrine/composer.json
    	src/Symfony/Bridge/Monolog/composer.json
    	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/Tests/DependencyInjection/FrameworkExtensionTest.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/Asset/composer.json
    	src/Symfony/Component/BrowserKit/composer.json
    	src/Symfony/Component/ClassLoader/Tests/ApcClassLoaderTest.php
    	src/Symfony/Component/ClassLoader/composer.json
    	src/Symfony/Component/Config/composer.json
    	src/Symfony/Component/Console/Tests/Helper/LegacyProgressHelperTest.php
    	src/Symfony/Component/Console/Tests/Helper/LegacyTableHelperTest.php
    	src/Symfony/Component/Console/composer.json
    	src/Symfony/Component/CssSelector/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/ExpressionLanguage/composer.json
    	src/Symfony/Component/Filesystem/composer.json
    	src/Symfony/Component/Finder/composer.json
    	src/Symfony/Component/Form/Tests/Extension/Csrf/CsrfProvider/LegacyDefaultCsrfProviderTest.php
    	src/Symfony/Component/Form/composer.json
    	src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/LegacyPdoSessionHandlerTest.php
    	src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php
    	src/Symfony/Component/HttpFoundation/Tests/Session/Storage/PhpBridgeSessionStorageTest.php
    	src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/AbstractProxyTest.php
    	src/Symfony/Component/HttpFoundation/composer.json
    	src/Symfony/Component/HttpKernel/Tests/Profiler/MongoDbProfilerStorageTest.php
    	src/Symfony/Component/HttpKernel/Tests/Profiler/SqliteProfilerStorageTest.php
    	src/Symfony/Component/HttpKernel/composer.json
    	src/Symfony/Component/Intl/Tests/Data/Bundle/Writer/PhpBundleWriterTest.php
    	src/Symfony/Component/Intl/Tests/DateFormatter/AbstractIntlDateFormatterTest.php
    	src/Symfony/Component/Intl/composer.json
    	src/Symfony/Component/Ldap/composer.json
    	src/Symfony/Component/Locale/composer.json
    	src/Symfony/Component/Locale/phpunit.xml.dist
    	src/Symfony/Component/OptionsResolver/composer.json
    	src/Symfony/Component/Process/composer.json
    	src/Symfony/Component/PropertyAccess/composer.json
    	src/Symfony/Component/PropertyInfo/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/Guard/composer.json
    	src/Symfony/Component/Security/Http/composer.json
    	src/Symfony/Component/Security/composer.json
    	src/Symfony/Component/Serializer/composer.json
    	src/Symfony/Component/Stopwatch/composer.json
    	src/Symfony/Component/Templating/composer.json
    	src/Symfony/Component/Translation/composer.json
    	src/Symfony/Component/Validator/Tests/Mapping/Cache/LegacyApcCacheTest.php
    	src/Symfony/Component/Validator/composer.json
    	src/Symfony/Component/VarDumper/composer.json
    	src/Symfony/Component/Yaml/composer.json
    nicolas-grekas committed Oct 10, 2015
  2. @nicolas-grekas

    Merge branch '2.7' into 2.8

    * 2.7:
      [tests] Use @requires annotation when possible
      [tests] Use @requires annotation when possible
      [ci] Enable collecting and replaying skipped tests
      [Process] Workaround buggy PHP warning
      [Console] Add additional ways to detect OS400 platform
      [Yaml] Allow tabs before comments at the end of a line
      Added more tests for PropertyAccess
    
    Conflicts:
    	.travis.yml
    	src/Symfony/Bridge/Doctrine/composer.json
    	src/Symfony/Bridge/Monolog/composer.json
    	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/composer.json
    	src/Symfony/Bundle/SecurityBundle/composer.json
    	src/Symfony/Bundle/TwigBundle/composer.json
    	src/Symfony/Bundle/WebProfilerBundle/composer.json
    	src/Symfony/Component/Asset/composer.json
    	src/Symfony/Component/BrowserKit/composer.json
    	src/Symfony/Component/ClassLoader/composer.json
    	src/Symfony/Component/Config/composer.json
    	src/Symfony/Component/Console/composer.json
    	src/Symfony/Component/CssSelector/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/ExpressionLanguage/composer.json
    	src/Symfony/Component/Filesystem/composer.json
    	src/Symfony/Component/Finder/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/Locale/composer.json
    	src/Symfony/Component/OptionsResolver/composer.json
    	src/Symfony/Component/Process/composer.json
    	src/Symfony/Component/PropertyAccess/composer.json
    	src/Symfony/Component/Routing/composer.json
    	src/Symfony/Component/Security/Acl/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/Stopwatch/composer.json
    	src/Symfony/Component/Templating/composer.json
    	src/Symfony/Component/Translation/Tests/Dumper/IcuResFileDumperTest.php
    	src/Symfony/Component/Translation/composer.json
    	src/Symfony/Component/Validator/composer.json
    	src/Symfony/Component/VarDumper/composer.json
    	src/Symfony/Component/Yaml/composer.json
    nicolas-grekas committed Oct 10, 2015
  3. @nicolas-grekas

    Merge branch '2.3' into 2.7

    * 2.3:
      [tests] Use @requires annotation when possible
      [ci] Enable collecting and replaying skipped tests
      [Process] Workaround buggy PHP warning
      [Console] Add additional ways to detect OS400 platform
      [Yaml] Allow tabs before comments at the end of a line
    
    Conflicts:
    	composer.json
    	src/Symfony/Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php
    	src/Symfony/Bridge/Monolog/composer.json
    	src/Symfony/Bridge/Twig/composer.json
    	src/Symfony/Bundle/FrameworkBundle/composer.json
    	src/Symfony/Bundle/SecurityBundle/composer.json
    	src/Symfony/Component/Asset/composer.json
    	src/Symfony/Component/ClassLoader/Tests/LegacyApcUniversalClassLoaderTest.php
    	src/Symfony/Component/Console/composer.json
    	src/Symfony/Component/Debug/composer.json
    	src/Symfony/Component/DomCrawler/composer.json
    	src/Symfony/Component/EventDispatcher/composer.json
    	src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
    	src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
    	src/Symfony/Component/HttpFoundation/composer.json
    	src/Symfony/Component/Intl/composer.json
    	src/Symfony/Component/Routing/composer.json
    	src/Symfony/Component/Security/composer.json
    	src/Symfony/Component/Serializer/composer.json
    	src/Symfony/Component/Templating/composer.json
    	src/Symfony/Component/Translation/composer.json
    	src/Symfony/Component/Validator/composer.json
    nicolas-grekas committed Oct 10, 2015
  4. @nicolas-grekas
Commits on Sep 14, 2015
  1. @fabpot

    Merge branch '2.8'

    * 2.8: (31 commits)
      [DomCrawler] Invalid uri created from forms if base tag present
      [VarDumper] Add caster for OuterIterator objects
      [Console] update param type phpdoc for StreamOutput
      [Console] fix typo in OutputInterface
      Use stderr by default when a specific output is not injected
      fixed bad merge
      [Debug] Fix case mismatch detection
      [HttpKernel] Add entry point to more easily create/configure the DI extension
      [DX] Added a logout link in the security panel of the web debug toolbar
      [HttpKernel] fix broken multiline <esi:remove>
      [DoctrineBridge] Fixed #14840
      [FrameworkBundle] add a suggest for the serializer component
      fixed CS
      removed non-working tests
      [WIP] #15502 Make template shortcuts be usable without Templating component
      Redesigned the Symfony Profiler
      [Yaml] Fix the parsing of float keys
      Make the exception output visible even in quiet mode, fixes #15680
      Convert Output::write's type to an options arg where verbosity can be passed in as well
      [Console] Ensure the console output is only detected as decorated when both stderr and stdout support colors
      ...
    fabpot committed Sep 14, 2015
  2. @fabpot

    Merge branch '2.7' into 2.8

    * 2.7:
      [DomCrawler] Invalid uri created from forms if base tag present
      [Console] update param type phpdoc for StreamOutput
      [Console] fix typo in OutputInterface
      Use stderr by default when a specific output is not injected
      [Debug] Fix case mismatch detection
      [HttpKernel] fix broken multiline <esi:remove>
      [DoctrineBridge] Fixed #14840
      [FrameworkBundle] add a suggest for the serializer component
      [Yaml] Fix the parsing of float keys
      [Console] Ensure the console output is only detected as decorated when both stderr and stdout support colors
      [HttpKernel] fix DumpDataCollector compat with Twig 2.0
      Improve exception messages.
      Fix that two DirectoryResources with different patterns would be deduplicated
      Tests fix clockmock
      [WebProfilerBundle] Added tabindex="-1" to not interfer with normal UX
      missing "YAML" in the exception message.
      [Translator][warmup][fallback locales] fixed missing cache file generation.
      [framework-bundle] Add Test for TranslationUpdateCommand
      Use ObjectManager interface instead of EntityManager
    fabpot committed Sep 14, 2015
  3. @Seldaek
Commits on Aug 24, 2015
  1. @fabpot

    Merge branch '2.8'

    * 2.8:
      fixes CS
      fixed CS
      [DependencyInjection] Add missing file headers
      fixed typo
      made Symfony compatible with both Twig 1.x and 2.x
      [FrameworkBundle] Fix precedence of xdebug.file_link_format
    fabpot committed Aug 24, 2015
  2. @fabpot

    Merge branch '2.7' into 2.8

    * 2.7:
      fixes CS
    fabpot committed Aug 24, 2015
  3. @fabpot

    fixes CS

    fabpot committed Aug 24, 2015
Commits on Jul 1, 2015
  1. @nicolas-grekas

    Merge branch '2.8'

    * 2.8: (65 commits)
      [VarDumper] Fix tests for HHVM
      Update DateTimeToArrayTransformer.php
      Mock microtime() and time() in transient tests
      Azerbaijani language pluralization rule
      Move HHVM tests out of the allowed failures
      Fix merge
      [2.6] Towards 100% HHVM compat
      [Security/Http] Fix test
      [Stopwatch] Fix test
      Minor fixes
      [Validator] Added missing error codes and turned codes into UUIDs
      Towards 100% HHVM compat
      Warmup twig templates in non-standard paths (closes #12507)
      [Bridge/PhpUnit] Enforce a consistent locale
      Fix param order of assertEquals (expected, actual) in test for Finder\Glob
      Fix choice translation domain for expanded choice widget
      unify default AccessDeniedExeption message
      trigger event with right user (add test)
      [Security] Initialize SwitchUserEvent::targetUser on attemptExitUser
      fixed CS
      ...
    
    Conflicts:
    	UPGRADE-2.8.md
    	src/Symfony/Bridge/ProxyManager/composer.json
    	src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
    	src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php
    	src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
    	src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php
    	src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
    	src/Symfony/Bundle/FrameworkBundle/Resources/config/old_assets.xml
    	src/Symfony/Bundle/FrameworkBundle/Resources/config/test.xml
    	src/Symfony/Bundle/FrameworkBundle/Resources/config/validator.xml
    	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.json
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.md
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.xml
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.json
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.md
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.xml
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.json
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.md
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.xml
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.json
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.md
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.xml
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.json
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.md
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.txt
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.xml
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.json
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.md
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.txt
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.xml
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.json
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.md
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.txt
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.xml
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.json
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.md
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.txt
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.xml
    	src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/CsrfFormLoginBundle/Form/UserLoginFormType.php
    	src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/CsrfFormLogin/config.yml
    	src/Symfony/Bundle/SecurityBundle/composer.json
    	src/Symfony/Component/Debug/ErrorHandler.php
    	src/Symfony/Component/DependencyInjection/Compiler/CheckDefinitionValidityPass.php
    	src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php
    	src/Symfony/Component/DependencyInjection/Definition.php
    	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
    	src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php
    	src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
    	src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
    	src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php
    	src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/legacy-container9.php
    	src/Symfony/Component/DependencyInjection/Tests/Fixtures/graphviz/legacy-services9.dot
    	src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/legacy-services6.xml
    	src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/legacy-services9.xml
    	src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/legacy-services6.yml
    	src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/legacy-services9.yml
    	src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
    	src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
    	src/Symfony/Component/Form/ResolvedFormType.php
    	src/Symfony/Component/Form/Tests/CompoundFormTest.php
    	src/Symfony/Component/Process/Tests/AbstractProcessTest.php
    	src/Symfony/Component/VarDumper/Tests/CliDumperTest.php
    	src/Symfony/Component/VarDumper/Tests/HtmlDumperTest.php
    nicolas-grekas committed Jul 1, 2015
  2. @aitboudad

    Merge remote-tracking branch 'origin/2.7' into 2.8

    Conflicts:
    	src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php
    	src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveDefinitionTemplatesPassTest.php
    aitboudad committed Jul 1, 2015
Commits on Jun 25, 2015
  1. @aitboudad

    Merge remote-tracking branch 'origin/2.6' into 2.7

    Conflicts:
    	src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php
    	src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
    	src/Symfony/Component/Validator/Constraints/EmailValidator.php
    aitboudad committed Jun 25, 2015