Permalink
Commits on Sep 18, 2013
Commits on May 6, 2013
  1. Merge branch '2.1' into 2.2

    * 2.1:
      bumped Symfony version to 2.1.11-DEV
      updated VERSION for 2.1.10
      update CONTRIBUTORS for 2.1.10
      updated CHANGELOG for 2.1.10
      fixed CS
      [Process] Cleanup tests & prevent assertion that kills randomly Travis-CI
      [Filesystem] Fix regression introduced in 10dea948
    
    Conflicts:
    	src/Symfony/Component/Form/Extension/Core/DataTransformer/DataTransformerChain.php
    	src/Symfony/Component/HttpKernel/Kernel.php
    	src/Symfony/Component/HttpKernel/Profiler/RedisProfilerStorage.php
    	src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php
    fabpot committed May 6, 2013
Commits on May 1, 2013
  1. Merge branch '2.1' into 2.2

    * 2.1:
      remove validation related headers when needed
      use while loop for iterating
      [Filesystem] copy() is not working when open_basedir is set
    
    Conflicts:
    	src/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php
    fabpot committed May 1, 2013
Commits on Apr 28, 2013
Commits on Apr 21, 2013
  1. Merge branch '2.1' into 2.2

    * 2.1:
      Removed trailing whitespace
      [Validator] added missing estonian translation of messages
      Filesystem::touch() not working with different owners (utime/atime issue)
    
    Conflicts:
    	src/Symfony/Component/Validator/Resources/translations/validators.et.xlf
    fabpot committed Apr 21, 2013
Commits on Jan 17, 2013
  1. Merge branch '2.1'

    * 2.1:
      [Yaml] fixed default value
      Added Yaml\Dumper::setIndentation() method to allow a custom indentation level of nested nodes.
      added a way to enable/disable object support when parsing/dumping
      added a way to enable/disable PHP support when parsing a YAML input via Yaml::parse()
      fixed CS
      [Process] Fix docblocks, remove `return` from `PhpProcess#start()` as parent returns nothing, cleaned up `ExecutableFinder`
      fixes a bug when output/error output contains a % character
      [Console] fixed input bug when the value of an option is empty (closes #6649, closes #6689)
      [Profiler] [Redis] Fix sort of profiler rows.
      Fix version_compare() calls for PHP 5.5.
      Removed underscores from test method names to be consistent with other components.
      [Process] In edge cases `getcwd()` can return `false`, then `proc_open()` should get `null` to use default value (the working dir of the current PHP process)
      Fix version_compare() calls for PHP 5.5.
      Handle the deprecation of IntlDateFormatter::setTimeZoneId() in PHP 5.5.
      removed the .gitattributes files (closes #6605, reverts #5674)
      [HttpKernel] Clarify misleading comment in ExceptionListener
    
    Conflicts:
    	src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_style.html.twig
    	src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php
    	src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php
    	src/Symfony/Component/Form/Tests/Util/PropertyPathTest.php
    	src/Symfony/Component/HttpKernel/Profiler/RedisProfilerStorage.php
    	src/Symfony/Component/Process/Process.php
    fabpot committed Jan 17, 2013
Commits on Jan 9, 2013
Commits on Jan 5, 2013
Commits on Jan 4, 2013
  1. Merge branch '2.0' into 2.1

    * 2.0:
      updated license year
      Update src/Symfony/Component/HttpFoundation/Response.php
      [Console] fixed unitialized properties (closes #5935)
      [Bundle] [FrameworkBundle] fixed typo in phpdoc of the SessionListener.
      bumped Symfony version to 2.0.21-DEV
      updated VERSION for 2.0.21
      updated CHANGELOG for 2.0.21
    
    Conflicts:
    	src/Symfony/Bundle/SwiftmailerBundle/LICENSE
    	src/Symfony/Component/Filesystem/LICENSE
    	src/Symfony/Component/HttpFoundation/Response.php
    	src/Symfony/Component/HttpKernel/Kernel.php
    fabpot committed Jan 4, 2013
  2. updated license year

    fabpot committed Jan 4, 2013
Commits on Dec 14, 2012
  1. Fixed typos

    pborreli committed Dec 14, 2012
Commits on Dec 11, 2012
  1. merged branch mylen/master (PR #6014)

    This PR was squashed before being merged into the master branch (closes #6014).
    
    Commits
    -------
    
    2b13760 [Filesystem] [mirror] added "delete" option
    
    Discussion
    ----------
    
    [Filesystem] [mirror] added "delete" option
    
    Bug fix: no
    Feature addition: yes
    Backwards compatibility break: no
    Symfony2 tests pass: yes
    Fixes the following tickets:
    Todo: -
    License of the code: MIT
    Documentation PR: symfony/symfony-docs#123
    
    I added a "delete" option to the mirror function. If set to true, then
    files present in target dir and not in origin dir will be removed.
    
    Added also unit test for these feature.
    
    ---------------------------------------------------------------------------
    
    by pborreli at 2012-11-16T00:58:19Z
    
    Symfony2 code standard use lowercase `true` and `false`
    
    ---------------------------------------------------------------------------
    
    by mylen at 2012-11-16T20:25:19Z
    
    I have problem to believe that the last commit (merging two if together) was to blame for the segfault on  travis...
    when I run the unit testing on my machine, I get:
    
    I'm using PHP 5.4.7 by the way...
    
    Time: 2 seconds, Memory: 3.25Mb
    
    OK, but incomplete or skipped tests!
    Tests: 80, Assertions: 106, Skipped: 14.
    
    ---------------------------------------------------------------------------
    
    by pborreli at 2012-11-16T20:38:40Z
    
    Can you fix end-of-lines ?
    
    ---------------------------------------------------------------------------
    
    by mylen at 2012-11-16T20:52:37Z
    
    I put UNIX line feed and UTF8 charset
    
    ---------------------------------------------------------------------------
    
    by mylen at 2012-11-16T20:53:59Z
    
    Sorry, I add to clone the symfony repo with github and did small editing using pspad, I forgot to setup charset and line feed...
    fabpot committed Dec 11, 2012
  2. Merge branch '2.1'

    * 2.1:
      fixed CS
      fixed CS
      [Security] fixed path info encoding (closes #6040, closes #5695)
      [HttpFoundation] added some tests for the previous merge and removed dead code (closes #6037)
      Improved Cache-Control header when no-cache is sent
      removed unneeded comment
      Fix to allow null values in labels array
      fix date in changelog
      removed the Travis icon (as this is not stable enough -- many false positive, closes #6186)
      Revert "merged branch gajdaw/finder_splfileinfo_fpassthu (PR #4751)" (closes #6224)
      Fixed a typo
      Fixed: HeaderBag::parseCacheControl() not parsing quoted zero correctly
      [Form] Fix const inside an anonymous function
      [Config] Loader::import must return imported data
      [DoctrineBridge] Fixed caching in DoctrineType when "choices" or "preferred_choices" is passed
      [Form] Fixed the default value of "format" in DateType to DateType::DEFAULT_FORMAT if "widget" is not "single_text"
      [HttpFoundation] fixed a small regression
    
    Conflicts:
    	src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
    fabpot committed Dec 11, 2012
  3. fixed CS

    fabpot committed Dec 11, 2012
Commits on Dec 6, 2012
Commits on Nov 29, 2012
  1. Merge branch '2.1'

    * 2.1: (29 commits)
      [DependencyInjection] fixed composer.json
      [Validator] Fix typos in validators.ru.xlf
      Edited some minor grammar and style errors in russian validation file
      Updated Bulgarian translation
      [Form] improve error message with a "hasser" hint for PropertyAccessDeniedException
      [Form] Updated checks for the ICU version from 4.5+ to 4.7+ due to test failures with ICU 4.6
      [Form] simplified a test from previous merge
      Update src/Symfony/Component/Form/Extension/Core/Type/FileType.php
      fixed CS
      Xliff with other node than source or target are ignored
      small fix of #5984 when the container param is not set
      Filesystem Component mirror symlinked directory fix
      [Process][Tests] fixed chainedCommandsOutput tests
      fixed CS
      Use better default ports in urlRedirectAction
      Add tests for urlRedirectAction
      info about session namespace
      fix upgrade info about locale
      Update src/Symfony/Component/DomCrawler/Tests/FormTest.php
      Update src/Symfony/Component/DomCrawler/Form.php
      ...
    fabpot committed Nov 29, 2012
Commits on Nov 20, 2012
Commits on Nov 13, 2012
  1. Merge branch '2.1'

    * 2.1: (24 commits)
      forced Travis to use source to workaround their not-up-to-date Composer on PHP 5.3.3
      [Routing] removed irrelevant string cast in Route
      Fixed typo
      Make YamlFileLoader and XmlFileLoader file loading extensible
      [HttpKernel] fix typo
      Fixed singularization of "prices"
      [Form] Removed an exception that prevented valid formats from being passed, e.g. "h" for the hour, "L" for the month etc.
      [HttpKernel] fixed Client when using StreamedResponses (closes #5370)
      fixed PDO session handler for Oracle (closes #5829)
      [HttpFoundation] fixed PDO session handler for Oracle (closes #5829)
      [Locale] removed a check that is done too early (and it is done twice anyways)
      Update src/Symfony/Component/Validator/Resources/translations/validators.fa.xlf
      Adding new localized strings for farsi validation.
      [HttpFoundation] moved the HTTP protocol check from StreamedResponse to Response (closes #5937)
      [Form] Fixed forms not to be marked invalid if their children are already marked invalid
      [Form] Excluded some tests in NumberToLocalizedStringTransformerTest which fail on ICU 4.4, but work on ICU 4.8
      added missing tests from previous merge
      [Form] Fixed NumberToLocalizedStringTransformer to accept both comma and dot as decimal separator, if possible
      Fix export-ignore on Windows
      Show correct class name InputArgument in error message
      ...
    
    Conflicts:
    	.travis.yml
    	src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php
    fabpot committed Nov 13, 2012
Commits on Nov 9, 2012
Commits on Nov 8, 2012
  1. Fix export-ignore on Windows

    gajdaw committed Nov 8, 2012
Commits on Oct 24, 2012
  1. Merge branch '2.1'

    * 2.1:
      added missing use statment (closes #5825)
      Code cleanup
      [WebProfilerBundle] Fixed the use of nested macros
      Removed unused use statements.
      Nsdocblocks
      [ConfigDumpReference] avoid notice for variable nodes
      fixed fallback locale
      UniqueValidatorTest, Change message on assertions
      Documented removed _form_is_choice_group function
    
    Conflicts:
    	src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php
    	src/Symfony/Bundle/WebProfilerBundle/Profiler/TemplateManager.php
    fabpot committed Oct 24, 2012
Commits on Oct 20, 2012
  1. Nsdocblocks

    Drak committed with fabpot Oct 19, 2012
Commits on Oct 6, 2012
  1. Merge branch '2.1'

    * 2.1:
      fixed CS
      added doc comments
      added doc comments
      [Validator] Updated swedish translation
      Update src/Symfony/Component/Validator/Resources/translations/validators.de.xlf
      [2.1] Exclude tests from zips via gitattributes
      [HttpKernel][Translator] Fixed type-hints
      Updated lithuanian validation translation
      [DomCrawler] Allows using multiselect through Form::setValues().
      [Translation] forced the catalogue to be regenerated when a resource is added (closes symfony/translation#1)
      Unit test for patched method OptionsResolver::validateOptionValues().
      validateOptionValues throw a notice if an allowed value is set and the corresponding option isn't.
      [Form] Hardened code of ViolationMapper against errors
      [HttpFoundation] Fixed #5611 - Request::splitHttpAcceptHeader incorrect result order.
      [Form] Fixed negative index access in PropertyPathBuilder
      Update src/Symfony/Component/Validator/Resources/translations/validators.ro.xlf
    
    Conflicts:
    	src/Symfony/Component/DomCrawler/Form.php
    	src/Symfony/Component/Process/Process.php
    fabpot committed Oct 6, 2012
Commits on Oct 4, 2012
Commits on Sep 28, 2012
  1. Merge branch '2.1'

    * 2.1:
      Added Base64 encoding, decoding to MongoDBProfilerStorage
      Fix duplicated code and a field name
      refactor src/Symfony/Component/Translation/Loader/MoFileLoader.php
      fixed typo
      Update src/Symfony/Component/Validator/Resources/translations/validators.pl.xlf
      fixed issue #5596 (Broken DOM with the profiler's toolbar set in position top)
      [Form] Fixed the testsuite for PHPUnit 3.6 as travis still uses it
      added dirs generated by build-data.php in locale component to .gitignore
      [Process] Fixed bug introduced by 7bafc69.
      [Process][Tests] Prove process fail (Add more test case)
      [Process][Tests] Prove process fail
      [HttpFoundation] Fixed the tests
      [DomCrawler] Added test for supported encodings by mbstring
      [Config] Fixed preserving keys in associative arrays
      [Console] Fixed return value for Command::run
      [Locale] Fixed tests
      [Console] Fix some input tests
      [Filesystem] Fixed tests on Windows
      [Config] Fixed tests on Windows
    fabpot committed Sep 28, 2012
  2. Optimize autoload prefix in composer.json

    By having more specific autoload prefixes it is possible to reduce the
    number of stat calls made. Also it prevents conflicts with similar
    namespaces.
    Slamdunk committed Sep 28, 2012
Commits on Sep 21, 2012
Commits on Sep 6, 2012
  1. udpated composer.json to 2.2

    fabpot committed Sep 6, 2012
Commits on Aug 22, 2012
Commits on Aug 13, 2012
  1. [Filesystem] missing realpath breaking FilesystemTest class on Window…

    …s (one line of code change)
    bdmu committed Aug 10, 2012
Commits on Jul 28, 2012
  1. Fixed Phpdoc

    pborreli committed Jul 28, 2012