Permalink
Commits on Sep 22, 2014
  1. Merge branch '2.3' into 2.4

    fabpot committed Sep 22, 2014
    * 2.3:
      fixed CS
      [Process] fixed some volatile tests
      [HttpKernel] fixed a volatile test
      [HttpFoundation] fixed some volatile tests
      Use getPathname() instead of string casting to get BinaryFileReponse file path
    
    Conflicts:
    	src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php
    	src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
    	src/Symfony/Bundle/FrameworkBundle/EventListener/SessionListener.php
    	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
    	src/Symfony/Component/ClassLoader/Tests/ApcUniversalClassLoaderTest.php
    	src/Symfony/Component/Config/Definition/ReferenceDumper.php
    	src/Symfony/Component/Config/Tests/Definition/Dumper/YamlReferenceDumperTest.php
    	src/Symfony/Component/Console/Application.php
    	src/Symfony/Component/Console/Tests/ApplicationTest.php
    	src/Symfony/Component/Filesystem/Exception/IOException.php
    	src/Symfony/Component/Form/Extension/Templating/TemplatingExtension.php
    	src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php
    	src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
    	src/Symfony/Component/HttpKernel/Tests/Bundle/BundleTest.php
    	src/Symfony/Component/HttpKernel/Tests/Fragment/RoutableFragmentRendererTest.php
    	src/Symfony/Component/HttpKernel/Tests/Profiler/Mock/RedisMock.php
    	src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
    	src/Symfony/Component/PropertyAccess/PropertyAccessor.php
    	src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTest.php
    	src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
    	src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php
    	src/Symfony/Component/Routing/Tests/Annotation/RouteTest.php
    	src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php
    	src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
    	src/Symfony/Component/Validator/Constraints/CollectionValidator.php
    	src/Symfony/Component/Validator/Tests/ExecutionContextTest.php
  2. fixed CS

    fabpot committed Sep 21, 2014
Commits on Sep 3, 2014
  1. Merge branch '2.3' into 2.4

    fabpot committed Sep 3, 2014
    * 2.3:
      [HttpKernel] fixed internal fragment handling
      fixing yaml indentation
      [WebProfiler] replaced the import/export feature from the web interface to a CLI tool
      Forced all fragment uris to be signed, even for ESI
      Add tests and more assertions
      [FrameworkBundle][Translator] Validate locales.
      [HttpFoundation] added some missing tests
      [HttpFoundation] Improve string values in test codes
      fix comment: not fourth but sixth argument
      fixing typo in a comment
      [FrameworkBundle] fixed CS
      [FrameworkBundle] PhpExtractor bugfix and improvements
      [Finder] Fix findertest readability
      [Filesystem] Add FTP stream wrapper context option to enable overwrite (override)
      fix parsing of Authorization header
      Test examples from Drupal SA-CORE-2014-003
      Fix potential DoS when parsing HOST
      Made optimization deprecating modulus operator
    
    Conflicts:
    	src/Symfony/Bundle/FrameworkBundle/Resources/config/esi.xml
    	src/Symfony/Component/HttpFoundation/Request.php
    	src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
    	src/Symfony/Component/HttpKernel/Fragment/EsiFragmentRenderer.php
Commits on Aug 31, 2014
  1. [Filesystem] Add FTP stream wrapper context option to enable overwrit…

    Damian Sromek committed with fabpot Aug 26, 2014
    …e (override)
  2. Merge branch '2.3' into 2.4

    fabpot committed Aug 31, 2014
    * 2.3:
      [HttpKernel] add use statement for phpdoc
      Disabled the PHPUnit self-update on Travis
      [ClassLoader] simplified phpdoc
      [ClassLoader] Add a __call() method to XcacheClassLoader
      fix some minor typos in tests
      [Yaml] fixed mapping keys containing a quoted #
      Added fixture to test parsing of hash keys ending with a space and #
      [Filesystem Component] mkdir race condition fix #11626
      [Validator] reverted permissions change on translation files
      Fixed Factory services not within the ServiceReferenceGraph.
      [CssSelector] Fix URL to SimonSapin/cssselect repo
      [Validator] Fixed wrong translation keys/messages for Collection constraint. The error messages for a missing field and an unexpected field did not match the Contraint class
      [YAML] resolve variables in inlined YAML
      Disallow abstract definitions from doctrine event listener registration
    
    Conflicts:
    	src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php
    	src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPassTest.php
    	src/Symfony/Bundle/FrameworkBundle/EventListener/SessionListener.php
    	src/Symfony/Component/Filesystem/Filesystem.php
Commits on Aug 27, 2014
Commits on Jul 9, 2014
  1. Merge branch '2.3' into 2.4

    fabpot committed Jul 9, 2014
    * 2.3:
      fixed CS
      [HttpFoundation] Remove content-related headers if content is empty
      removed defaults from PHPUnit configuration
Commits on Jul 8, 2014
  1. Merge branch '2.3' into 2.4

    fabpot committed Jul 8, 2014
    * 2.3:
      bumped Symfony version to 2.3.18
      updated VERSION for 2.3.17
      update CONTRIBUTORS for 2.3.17
      updated CHANGELOG for 2.3.17
      added XSD to PHPUnit configuration
      bug #11319 [HttpKernel] Ensure the storage exists before purging it in ProfilerTest
      [Translation] Added unescaping of ids in PoFileLoader
      updated italian translation for validation messages
      [DomCrawler] Fix docblocks and formatting.
      [DomCrawler] Remove the query string and the anchor of the uri of a link
      Simplified the Travis test command
      [Console] Make sure formatter is the same
    
    Conflicts:
    	src/Symfony/Component/HttpKernel/Kernel.php
Commits on Jul 7, 2014
  1. added XSD to PHPUnit configuration

    craue committed with fabpot Jul 6, 2014
Commits on Jun 20, 2014
  1. fixed previous merge

    fabpot committed Jun 20, 2014
Commits on Jun 17, 2014
Commits on Apr 16, 2014
  1. Merge branch '2.3' into 2.4

    fabpot committed Apr 16, 2014
    * 2.3:
      fixed types in phpdocs
    
    Conflicts:
    	src/Symfony/Bridge/Twig/TwigEngine.php
    	src/Symfony/Bundle/FrameworkBundle/Templating/Loader/FilesystemLoader.php
    	src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
    	src/Symfony/Component/Form/Extension/Core/ChoiceList/SimpleChoiceList.php
    	src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
    	src/Symfony/Component/HttpKernel/Controller/ControllerResolverInterface.php
    	src/Symfony/Component/PropertyAccess/PropertyAccessorBuilder.php
    	src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
    	src/Symfony/Component/Stopwatch/StopwatchEvent.php
    	src/Symfony/Component/Templating/PhpEngine.php
  2. fixed types in phpdocs

    fabpot committed Apr 16, 2014
  3. Merge branch '2.3' into 2.4

    fabpot committed Apr 16, 2014
    * 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
  4. fixed types in phpdocs

    fabpot committed Apr 16, 2014
Commits on Apr 15, 2014
Commits on Mar 26, 2014
  1. Merge branch '2.3' into 2.4

    fabpot committed Mar 26, 2014
    * 2.3: (34 commits)
      Fix #8205 : Deprecate file mode update when calling dumpFile
      Fix #10437: Catch exceptions when reloading a no-cache request
      Fix libxml_use_internal_errors and libxml_disable_entity_loader usage
      removed ini check to make uploadedfile work on gae
      Update OptionsResolver.php
      fixed comment in forms.xml file
      Clean KernelInterface docblocks
      Cast the group name as a string
      Fixed doc of InitAclCommand
      [Form] Fix "Array was modified outside object" in ResizeFormListener.
      Fix IBAN validator
      [Process] Remove unreachable code + avoid skipping tests in sigchild environment
      Fixed bug that incorrectly causes the "required" attribute to be omitted from select even though it contains the "multiple" attribute
      Added travis_retry to .travis.yml
      [Process] fix some typos and refactor some code
      [Process] Fix unit tests in sigchild disabled environment
      [Process] Trow exceptions in case a Process method is supposed to be called after termination
      fixed typo
      [Process] fixed fatal errors in getOutput and getErrorOutput when process was not started
      [Process] Fix escaping on Windows
      ...
    
    Conflicts:
    	src/Symfony/Component/DomCrawler/Crawler.php
    	src/Symfony/Component/Filesystem/Filesystem.php
    	src/Symfony/Component/Process/Process.php
Commits on Mar 18, 2014
  1. fixed typo

    fabpot committed Mar 18, 2014
Commits on Jan 7, 2014
  1. Merge branch '2.3' into 2.4

    fabpot committed Jan 7, 2014
    * 2.3:
      update year on licenses
      rundown and typo fix
      [Process] Fix #9861 : Revert TTY mode
      [Form] Update minimal requirement in composer.json
      Fix Empty translations with Qt files
      Update UPGRADE-2.3.md to account for #9388
    
    Conflicts:
    	src/Symfony/Component/Validator/Tests/Constraints/LessThanValidatorTest.php
  2. update year on licenses

    cordoval committed Jan 6, 2014
Commits on Dec 31, 2013
  1. Merge branch '2.3' into 2.4

    fabpot committed Dec 31, 2013
    * 2.3:
      [Security] fixed pre/post authentication checks
      Updated lithuanian validator translation: changed vartotojas to naudotojas as it is more proper term.
      Fixed CSS
      [HttpFoundation] Throw proper exception when invalid data is passed to JsonResponse class
      addressed == -> === suggestion
      Fixed #9020 - Added support for collections in service#parameters
      fixes PSR-0 issues in tests
      adjusted behavior to always copy override on url files
      Skips test that need full lib-intl.
    
    Conflicts:
    	src/Symfony/Component/Security/Acl/Tests/Permission/MaskBuilderTest.php
    	src/Symfony/Component/Security/Core/Tests/Authentication/Token/RememerMeTokenTest.php
    	src/Symfony/Component/Security/Core/Tests/User/AccountCheckerTest.php
    	src/Symfony/Component/Security/Core/Tests/User/InMemoryProviderTest.php
    	src/Symfony/Component/Security/Http/Tests/Authentication/DefaultAuthenticationFailureHandlerTest.php
    	src/Symfony/Component/Security/Http/Tests/Authentication/DefaultAuthenticationSuccessHandlerTest.php
    	src/Symfony/Component/Security/Tests/Core/Authentication/Token/RememberMeTokenTest.php
    	src/Symfony/Component/Security/Tests/Core/Authentication/Token/RememerMeTokenTest.php
    	src/Symfony/Component/Security/Tests/Core/User/AccountCheckerTest.php
    	src/Symfony/Component/Security/Tests/Core/User/InMemoryProviderTest.php
    	src/Symfony/Component/Security/Tests/Core/User/InMemoryUserProviderTest.php
    	src/Symfony/Component/Security/Tests/Core/User/UserCheckerTest.php
Commits on Dec 30, 2013
  1. addressed == -> === suggestion

    cordoval committed Dec 30, 2013
Commits on Dec 28, 2013
  1. Merge branch '2.3' into 2.4

    fabpot committed Dec 28, 2013
    * 2.3:
      fixed a typo
      fixed CS for lambdas
      [Yaml] fixed some license headers
      Fixes message value for objects
      Check for hour, minute & second validity
      fixed various typos
      [Filesystem] Fixed mirror for symlinks
      [Validator] Removed duplicated test for IBAN in data provider
    
    Conflicts:
    	src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
    	src/Symfony/Component/Console/Application.php
    	src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
    	src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
    	src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ContainerAwareHttpKernelTest.php
Commits on Dec 27, 2013
  1. minor #9869 fixed various typos (fabpot)

    fabpot committed Dec 27, 2013
    This PR was merged into the 2.3 branch.
    
    Discussion
    ----------
    
    fixed various typos
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | n/a
    | License       | MIT
    | Doc PR        | n/a
    
    Commits
    -------
    
    2f15ac7 fixed various typos
  2. fixed various typos

    fabpot committed Dec 27, 2013
Commits on Dec 26, 2013
  1. Merge branch '2.3' into 2.4

    fabpot committed Dec 26, 2013
    * 2.3: (31 commits)
      Fix parent serialization of user object
      [DependencyInjection] fixed typo
      add memcache, memcached, and mongodb extensions to run skipped tests
      [DependencyInjection] Fixed support for backslashes in service ids.
      fix #9356 [Security] Logger should manipulate the user reloaded from provider
      [BrowserKit] fixes #8311 CookieJar is totally ignorant of RFC 6265 edge cases
      [HttpFoundation] fixed constants that do exist in 2.3 (only in 2.4)
      fix 5528 let ArrayNode::normalizeValue respect order of value array provided
      fix #7243 allow 0 as arraynode name
      Fixed issue in BaseDateTimeTransformer when invalid timezone cause Transformation filed exception (closes #9403).
      BinaryFileResponse should also return 416 or 200 on some range-requets
      Do normalization on tag options
      bumped Symfony version to 2.3.9
      updated VERSION for 2.3.8
      update CONTRIBUTORS for 2.3.8
      updated CHANGELOG for 2.3.8
      [Filesystem] Changed the mode for a target file in copy() to be write only.
      [Console] fixed CS
      fixed TableHelper when cell value has new line
      Improved and fixed grammar mistakes. Added pluralized messages
      ...
    
    Conflicts:
    	src/Symfony/Component/BrowserKit/Cookie.php
    	src/Symfony/Component/HttpKernel/Kernel.php
    	src/Symfony/Component/Routing/Matcher/UrlMatcher.php
Commits on Dec 16, 2013
  1. [Filesystem] Changed the mode for a target file in copy() to be write…

    jakzal committed Dec 16, 2013
    … only.
    
    Stream wrappers like S3 do not support w+.
Commits on Nov 16, 2013
  1. Fixed typos

    pborreli committed Nov 16, 2013
Commits on Sep 27, 2013