Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Apr 18, 2014

  1. Fabien Potencier

    Merge branch '2.4'

    * 2.4:
      unified return null usages
      [Validator] added Japanese translation
      Textarea value should default to empty string instead of null.
      Fix doc blocks
      [Process] Fix #10681, process are failing on Windows Server 2003
      updated doc
      [Security] fix DBAL connection typehint
      [HttpFoundation] status 201 is allowed to have a body
      unified return null usages
    
    Conflicts:
    	src/Symfony/Component/DependencyInjection/ContainerBuilder.php
    	src/Symfony/Component/DomCrawler/Crawler.php
    	src/Symfony/Component/Security/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php
    authored April 18, 2014
  2. Fabien Potencier

    Merge branch '2.3' into 2.4

    * 2.3:
      Textarea value should default to empty string instead of null.
      Fix doc blocks
      [Process] Fix #10681, process are failing on Windows Server 2003
      [Security] fix DBAL connection typehint
      [HttpFoundation] status 201 is allowed to have a body
      unified return null usages
    
    Conflicts:
    	src/Symfony/Component/Console/Helper/DescriptorHelper.php
    	src/Symfony/Component/DependencyInjection/ContainerBuilder.php
    	src/Symfony/Component/Finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php
    	src/Symfony/Component/Form/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php
    	src/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php
    authored April 18, 2014
  3. Fabien Potencier

    minor #10717 unified return null usages (fabpot)

    This PR was merged into the 2.3 branch.
    
    Discussion
    ----------
    
    unified return null usages
    
    | Q             | A
    | ------------- | ---
    | License       | MIT
    
    This PR unifies the way we return `null` from a function or method:
    
     * always use `return;` instead of `return null;` (the current code base uses both);
     * never use `return;` at the end of a function/method.
    
    Commits
    -------
    
    d1d569b unified return null usages
    authored April 18, 2014

Apr 16, 2014

  1. Fabien Potencier

    Merge branch '2.4'

    * 2.4:
      fixed types in phpdocs
      fixed types in phpdocs
    
    Conflicts:
    	src/Symfony/Component/Security/Core/Encoder/BasePasswordEncoder.php
    	src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php
    	src/Symfony/Component/Serializer/Encoder/JsonEncoder.php
    	src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
    	src/Symfony/Component/Validator/Mapping/ClassMetadata.php
    	src/Symfony/Component/Validator/Mapping/ElementMetadata.php
    	src/Symfony/Component/Validator/Mapping/MemberMetadata.php
    	src/Symfony/Component/Validator/MetadataFactoryInterface.php
    authored April 16, 2014
  2. Fabien Potencier

    Merge branch '2.3' into 2.4

    * 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
    authored April 16, 2014
  3. Fabien Potencier

    fixed types in phpdocs

    authored April 16, 2014
  4. Fabien Potencier

    Merge branch '2.4'

    * 2.4:
      made types consistent with those defined in Hack
      made {@inheritdoc} annotations consistent across the board
      made {@inheritdoc} annotations consistent across the board
      fixed types in phpdocs
      [Debug] Fixed ClassNotFoundFatalErrorHandler on windows.
      made phpdoc types consistent with those defined in Hack
      Add support Thai translations
      [Validator] Add missing czech 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/Component/Console/Helper/TableHelper.php
    	src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
    	src/Symfony/Component/Form/FormError.php
    	src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
    	src/Symfony/Component/Process/ProcessPipes.php
    	src/Symfony/Component/PropertyAccess/PropertyAccessor.php
    	src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php
    	src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php
    	src/Symfony/Component/Translation/Dumper/FileDumper.php
    	src/Symfony/Component/Validator/ConstraintViolation.php
    	src/Symfony/Component/Validator/Constraints/EmailValidator.php
    	src/Symfony/Component/Validator/ExecutionContextInterface.php
    	src/Symfony/Component/Validator/Mapping/BlackholeMetadataFactory.php
    authored April 16, 2014
  5. Fabien Potencier

    Merge branch '2.3' into 2.4

    * 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
    authored April 16, 2014
  6. Fabien Potencier

    unified return null usages

    authored April 16, 2014

Apr 15, 2014

  1. Fabien Potencier

    made phpdoc types consistent with those defined in Hack

    authored April 12, 2014

Apr 13, 2014

  1. Fabien Potencier

    made types consistent with those defined in Hack

    authored April 12, 2014

Apr 10, 2014

  1. Fabien Potencier

    Merge branch '2.4'

    * 2.4:
      Update MimeTypeExtensionGuesser.php
      [Validator] Add missing polish translations
      [Validator] Added missing strings from Image validator
      [Templating] PhpEngine should propagate charset to its helpers
      Fix ticket #10663 - Added setCharset method call to PHP templating engine.
      Changed the typehint of the EsiFragmentRenderer to the interface
      [Form] Improved test coverage of UrlType
      [BrowserKit] Fix #10641 : BrowserKit is broken when using ip as host
    authored April 10, 2014
  2. Fabien Potencier

    Merge branch '2.3' into 2.4

    * 2.3:
      Update MimeTypeExtensionGuesser.php
      [Templating] PhpEngine should propagate charset to its helpers
      Fix ticket #10663 - Added setCharset method call to PHP templating engine.
      Changed the typehint of the EsiFragmentRenderer to the interface
      [Form] Improved test coverage of UrlType
      [BrowserKit] Fix #10641 : BrowserKit is broken when using ip as host
    
    Conflicts:
    	src/Symfony/Component/HttpKernel/Fragment/EsiFragmentRenderer.php
    	src/Symfony/Component/Templating/PhpEngine.php
    authored April 10, 2014

Apr 08, 2014

  1. Romain Neutron

    [BrowserKit] Fix #10641 : BrowserKit is broken when using ip as host

    authored April 08, 2014

Mar 27, 2014

  1. Fabien Potencier

    Merge branch '2.4'

    * 2.4:
      added missing unit test
      fixed too greedy replacements
      fixed protocol-relative URLs
      added override power to server parameters provided on request method
      made parsing controllers more robust
      Fixed YamlFileLoader imports path
    authored March 27, 2014
  2. Fabien Potencier

    Merge branch '2.3' into 2.4

    * 2.3:
      added missing unit test
      fixed too greedy replacements
      fixed protocol-relative URLs
      added override power to server parameters provided on request method
      made parsing controllers more robust
      Fixed YamlFileLoader imports path
    
    Conflicts:
    	src/Symfony/Component/HttpKernel/Tests/Controller/ControllerResolverTest.php
    authored March 27, 2014
  3. Fabien Potencier

    fixed too greedy replacements

    authored March 27, 2014
  4. Fabien Potencier

    fixed protocol-relative URLs

    authored March 27, 2014
  5. Luis Cordova

    added override power to server parameters provided on request method

    authored December 19, 2013 fabpot committed March 27, 2014

Mar 26, 2014

  1. Fabien Potencier

    Merge branch '2.4'

    * 2.4: (52 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/Bundle/FrameworkBundle/Command/ServerRunCommand.php
    	src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
    	src/Symfony/Component/Process/Process.php
    	src/Symfony/Component/Process/ProcessPipes.php
    	src/Symfony/Component/Process/Tests/AbstractProcessTest.php
    authored March 26, 2014

Mar 12, 2014

  1. Fabien Potencier

    Merge branch '2.3' into 2.4

    * 2.3:
      [Process] Fix #9160 : escaping an argument with a trailing backslash on windows fails
      [Process] Fix some unit tests that create the process object instead of delegate it to the implementation
      [Process] Make process tests more accurate on exception messages
      [Process] Fix process status in TTY mode
      [Process] Use assertSame instead of assertEquals to avoid comparison against `null`
      [HttpFoundation] added some unit tests
      10158 get vary multiple
      made Cookie stringification more robust
      [Yaml] fix for a HHVM bug
    authored March 12, 2014

Mar 04, 2014

  1. Fabien Potencier

    made Cookie stringification more robust

    authored March 04, 2014

Jan 24, 2014

  1. Fabien Potencier

    Merge branch '2.4'

    * 2.4: (35 commits)
      Update validators.ro.xlf
      add non-standard port to HTTP_HOST
      fixed attribute "source-language" for translations
      [Process] clarify idle timeout
      [Security] fix DI for SimpleFormAuthenticationListener
      Update PluralizationRules.php
      Update validators.pt_BR.xlf
      Translated remaining items (57-72)
      Updated Vietnamese translation
      allow null value in fragment handler
      added missing dot in translation
      updated Arabic translations
      Update validators.id.xlf
      [Validator] Translate validator messages into Brazilian Portuguese
      Added more Swedish validator translations
      Update validators.ca.xlf
      fixed typos in Welsh translation
      Added missing Croatian translations
      [Form] fixed allow render 0 and 0.0 numeric input values
      Fixed validators.nl.xlf
      ...
    
    Conflicts:
    	src/Symfony/Bridge/Twig/composer.json
    authored January 24, 2014
  2. Fabien Potencier

    Merge branch '2.3' into 2.4

    * 2.3: (30 commits)
      Update validators.ro.xlf
      add non-standard port to HTTP_HOST
      fixed attribute "source-language" for translations
      Update PluralizationRules.php
      Update validators.pt_BR.xlf
      Translated remaining items (57-72)
      Updated Vietnamese translation
      added missing dot in translation
      updated Arabic translations
      Update validators.id.xlf
      [Validator] Translate validator messages into Brazilian Portuguese
      Added more Swedish validator translations
      Update validators.ca.xlf
      fixed typos in Welsh translation
      Added missing Croatian translations
      [Form] fixed allow render 0 and 0.0 numeric input values
      Fixed validators.nl.xlf
      [Component/Security] Fixed some phpdocs in Security/Core
      Completed Luxembourgish translation
      Fixing the Logger deprecation notices to match the correct method name it should be informing of
      ...
    
    Conflicts:
    	src/Symfony/Bridge/Twig/composer.json
    	src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_widget_simple.html.php
    	src/Symfony/Component/Console/Application.php
    authored January 24, 2014
  3. Kevin Bond

    add non-standard port to HTTP_HOST

    authored January 19, 2014 fabpot committed January 24, 2014

Jan 07, 2014

  1. Fabien Potencier

    Merge branch '2.4'

    * 2.4:
      udpated LICENSE year
      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
      [Console] Fixed command name guessing if an alternative is an alias.
      Update UPGRADE-2.3.md to account for #9388
      [WebProfilerBundle] Fixed profiler toolbar icons for XHTML.
      [BrowserKit] Throw exception on invalid cookie expiration timestamp
      [Propel1Bridge][ModelChoiceList] add exception message for invalid classes
    authored January 07, 2014
  2. Fabien Potencier

    Merge branch '2.3' into 2.4

    * 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
    authored January 07, 2014
  3. Luis Cordova

    update year on licenses

    authored January 06, 2014

Jan 06, 2014

  1. Fabien Potencier

    Merge branch '2.3' into 2.4

    * 2.3:
      [WebProfilerBundle] Fixed profiler toolbar icons for XHTML.
      [BrowserKit] Throw exception on invalid cookie expiration timestamp
      [Propel1Bridge][ModelChoiceList] add exception message for invalid classes
    authored January 06, 2014
  2. Andreas Lutro

    [BrowserKit] Throw exception on invalid cookie expiration timestamp

    authored January 06, 2014 fabpot committed January 06, 2014

Jan 02, 2014

  1. Christophe Coevoet

    Removed all codeCoverageIgnore annotations from the code

    These annotations are artificially bumping the code coverage. Unreached
    code should be reported in the coverage report, even if we cannot reach
    100% coverage for some safeguards.
    Thus, some places using them were actually testable (and tested) code.
    authored January 02, 2014

Dec 28, 2013

  1. Fabien Potencier

    Merge branch '2.4'

    * 2.4:
      fixed typos
      Fixed deprecated method calls
      Add testing against HHVM at Travis-CI
      Fixed typo
      Fixed typo
      Fixed typo
      fixed acronyms
      [Validator] Fixed IBAN validator with 0750447346 value
    
    Conflicts:
    	src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
    authored December 28, 2013
  2. Fabien Potencier

    Merge branch '2.3' into 2.4

    * 2.3:
      fixed typos
      Fixed deprecated method calls
      Add testing against HHVM at Travis-CI
      Fixed typo
      Fixed typo
      fixed acronyms
      [Validator] Fixed IBAN validator with 0750447346 value
    
    Conflicts:
    	src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
    authored December 28, 2013
  3. Fabien Potencier

    fixed acronyms

    authored December 28, 2013
  4. Fabien Potencier

    Merge branch '2.4'

    * 2.4:
      fixed CS
      fixed a typo
      fixed CS for lambdas
      [Yaml] fixed some license headers
      Fixes message value for objects
      Check for hour, minute & second validity
      avoid tables to have apparently long blank line breaks and be too far appart for long nested array params
      fixed various typos
      [Filesystem] Fixed mirror for symlinks
      [Validator] Removed duplicated test for IBAN in data provider
    authored December 28, 2013
Something went wrong with that request. Please try again.