Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on May 16, 2015
  1. @fabpot

    feature #14145 Removed deprecations in Filesystem component (dosten)

    fabpot authored
    This PR was squashed before being merged into the 3.0-dev branch (closes #14145).
    
    Discussion
    ----------
    
    Removed deprecations in Filesystem component
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | -
    | License       | MIT
    | Doc PR        | -
    
    Commits
    -------
    
    5d1e558 Removed deprecations in Filesystem component
Commits on May 15, 2015
  1. @fabpot

    Merge branch '2.6' into 2.7

    fabpot authored
    * 2.6:
      [DebugBundle] Allow alternative destination for dumps
      [DebugBundle] Use output mechanism of dumpers instead of echoing
      [DebugBundle] Always collect dumps
      Fix tests in HHVM
      CS: Pre incrementation/decrementation should be used if possible
    
    Conflicts:
    	src/Symfony/Component/Finder/Expression/Glob.php
  2. @fabpot

    Merge branch '2.3' into 2.6

    fabpot authored
    * 2.3:
      Fix tests in HHVM
      CS: Pre incrementation/decrementation should be used if possible
    
    Conflicts:
    	src/Symfony/Bundle/TwigBundle/Command/LintCommand.php
    	src/Symfony/Component/Console/Helper/TableHelper.php
    	src/Symfony/Component/EventDispatcher/Tests/EventDispatcherTest.php
    	src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php
    	src/Symfony/Component/HttpKernel/HttpCache/EsiResponseCacheStrategy.php
    	src/Symfony/Component/Security/Acl/Dbal/AclProvider.php
    	src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php
  3. @fabpot

    minor #14121 CS: Pre incrementation/decrementation should be used if …

    fabpot authored
    …possible (gharlan)
    
    This PR was merged into the 2.3 branch.
    
    Discussion
    ----------
    
    CS: Pre incrementation/decrementation should be used if possible
    
    | 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
    
    Fixes provided by new fixer: FriendsOfPHP/PHP-CS-Fixer#1113
    
    If this pr is merged I would change the level of the fixer to `symfony`.
    
    Commits
    -------
    
    c5123d6 CS: Pre incrementation/decrementation should be used if possible
Commits on May 11, 2015
  1. @fabpot

    Merge branch '2.6' into 2.7

    fabpot authored
    * 2.6: (21 commits)
      bumped Symfony version to 2.6.8
      updated VERSION for 2.6.7
      updated CHANGELOG for 2.6.7
      bumped Symfony version to 2.3.29
      updated VERSION for 2.3.28
      update CONTRIBUTORS for 2.3.28
      updated CHANGELOG for 2.3.28
      [Debug] Fixed ClassNotFoundFatalErrorHandlerTest
      [SecurityBundle] use access decision constants in config
      [SecurityBundle] use session auth constants in config
      PhpDoc fix in AbstractRememberMeServices
      [Filesystem] Simplified an if statement
      [SecurityBundle] Use Enum Nodes Instead Of Scalar
      [Debug 2.3] Fix test for PHP7
      [HttpKernel] Check if "symfony/proxy-manager-bridge" package is installed
      [Translation] simplify getMessages.
      [Framework][Translation] added test for debug command.
      Run tests on hhvm instead of hhvm-nightly
      Use HTTPS in README and some other fixes
      add more entropy to generated classnames
      ...
    
    Conflicts:
    	.travis.yml
    	src/Symfony/Component/HttpKernel/Kernel.php
Commits on Mar 22, 2015
  1. @fabpot

    Merge branch '2.6' into 2.7

    fabpot authored
    * 2.6:
      Fix small coding style
      [2.3] Static Code Analysis for Components
      [Form] fixed phpdoc
      CS: Convert double quotes to single quotes
      Fixed MongoODM entity loader. Improved loading behavior of entities and documents by reusing entity loader.
      [Validator] added Japanese translation for unmatched charset (id: 80)
      [WebProfilerBundle] fixed undefined buttons.
      [WebProfilerBundle] Fix javascript toolbar on IE8
      [DependencyInjection] Highest precedence for user parameters
      bumped Symfony version to 2.6.6
      [Translation][MoFileLoader] fixed load empty translation.
      updated VERSION for 2.6.5
      updated CHANGELOG for 2.6.5
      bumped Symfony version to 2.3.27
      updated VERSION for 2.3.26
      update CONTRIBUTORS for 2.3.26
      updated CHANGELOG for 2.3.26
      [HttpKernel] UriSigner::buildUrl - default params for http_build_query
    
    Conflicts:
    	src/Symfony/Bridge/Propel1/Tests/DataCollector/PropelDataCollectorTest.php
    	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
    	src/Symfony/Component/HttpKernel/Kernel.php
    	src/Symfony/Component/Security/Http/Firewall/AbstractPreAuthenticatedListener.php
    	src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf
  2. @fabpot

    Merge branch '2.3' into 2.6

    fabpot authored
    * 2.3:
      Fix small coding style
      [2.3] Static Code Analysis for Components
      [Form] fixed phpdoc
      CS: Convert double quotes to single quotes
      Fixed MongoODM entity loader. Improved loading behavior of entities and documents by reusing entity loader.
      [Validator] added Japanese translation for unmatched charset (id: 80)
      [DependencyInjection] Highest precedence for user parameters
      [Translation][MoFileLoader] fixed load empty translation.
      bumped Symfony version to 2.3.27
      updated VERSION for 2.3.26
      update CONTRIBUTORS for 2.3.26
      updated CHANGELOG for 2.3.26
    
    Conflicts:
    	src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php
    	src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
    	src/Symfony/Bundle/TwigBundle/Command/LintCommand.php
    	src/Symfony/Component/Config/Definition/ReferenceDumper.php
    	src/Symfony/Component/Debug/ExceptionHandler.php
    	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
    	src/Symfony/Component/DependencyInjection/Tests/Compiler/MergeExtensionConfigurationPassTest.php
    	src/Symfony/Component/DependencyInjection/Tests/DefinitionTest.php
    	src/Symfony/Component/Filesystem/Filesystem.php
    	src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php
    	src/Symfony/Component/HttpKernel/Kernel.php
    	src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
    	src/Symfony/Component/Translation/PluralizationRules.php
    	src/Symfony/Component/Validator/Constraints/IssnValidator.php
    	src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf
    	src/Symfony/Component/Yaml/Tests/InlineTest.php
Commits on Jan 3, 2015
  1. @fabpot

    feature #12653 [Filesystem] Keep executable permission when a file is…

    fabpot authored
    … copied (joelwurtz)
    
    This PR was merged into the 2.7 branch.
    
    Discussion
    ----------
    
    [Filesystem] Keep executable permission when a file is copied
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | /
    | License       | MIT
    | Doc PR        | /
    
    I made this PR in order to have the same behavior as the default `cp` unix command: permissions are not keep when copying a file at the exception of the execution flag (unless `-p` is passed to the command).
    
    Commits
    -------
    
    b8f8234 [Filesystem] Keep executable permission when a file is copied
Commits on Dec 30, 2014
  1. @fabpot

    Merge branch '2.5' into 2.6

    fabpot authored
    * 2.5:
      [Form] Remove a redundant test.
      use value of DIRECTORY_SEPARATOR to detect Windows
    
    Conflicts:
    	src/Symfony/Component/Process/Process.php
  2. @fabpot

    Merge branch '2.3' into 2.5

    fabpot authored
    * 2.3:
      [Form] Remove a redundant test.
      use value of DIRECTORY_SEPARATOR to detect Windows
    
    Conflicts:
    	src/Symfony/Component/Console/Application.php
    	src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
    	src/Symfony/Component/Form/Tests/Extension/Csrf/Type/FormTypeCsrfExtensionTest.php
    	src/Symfony/Component/Process/Process.php
Commits on Dec 22, 2014
  1. @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
  2. @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
Commits on Dec 12, 2014
  1. @fabpot

    bug #12761 [Filesystem] symlink use RealPath instead LinkTarget (aitb…

    fabpot authored
    …oudad)
    
    This PR was squashed before being merged into the 2.3 branch (closes #12761).
    
    Discussion
    ----------
    
    [Filesystem] symlink use RealPath instead LinkTarget
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | License       | MIT
    
    Commits
    -------
    
    a8b8d33 [Filesystem] symlink use RealPath instead LinkTarget
Commits on Dec 5, 2014
  1. @fabpot

    Merge branch '2.5' into 2.6

    fabpot authored
    * 2.5:
      CS fixes
      [2.3] More cs fixes
      Removed unused imports
      CS fixes
      bumped Symfony version to 2.5.9
      updated VERSION for 2.5.8
      update CONTRIBUTORS for 2.5.8
      updated CHANGELOG for 2.5.8
      bumped Symfony version to 2.3.24
      updated VERSION for 2.3.23
      update CONTRIBUTORS for 2.3.23
      updated CHANGELOG for 2.3.23
    
    Conflicts:
    	src/Symfony/Component/Console/Helper/ProgressBar.php
    	src/Symfony/Component/Debug/ErrorHandler.php
    	src/Symfony/Component/HttpKernel/Kernel.php
    	src/Symfony/Component/Security/Http/HttpUtils.php
    	src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php
Commits on Dec 2, 2014
  1. @fabpot

    Merge branch '2.5' into 2.6

    fabpot authored
    * 2.5:
      Configure firewall's kernel exception listener with configured entry point or a default entry point
      PSR-2 fixes
      [DependencyInjection] make paths relative to __DIR__ in the generated container
      Fixed the syntax of a composer.json file
      Fixed the symfony/config version constraint
      Tweaked the password-compat version constraint
      Docblock fixes
      Remove dialog usage
      define constant only if it wasn't defined before
      Fix incorrect spanish translation
      Fixed typos
    
    Conflicts:
    	src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php
    	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
    	src/Symfony/Component/OptionsResolver/Options.php
    	src/Symfony/Component/OptionsResolver/OptionsResolverInterface.php
    	src/Symfony/Component/Process/ProcessPipes.php
    	src/Symfony/Component/Security/Http/Tests/Firewall/RememberMeListenerTest.php
    	src/Symfony/Component/Serializer/Normalizer/DenormalizableInterface.php
    	src/Symfony/Component/Validator/ConstraintViolation.php
    	src/Symfony/Component/Yaml/Inline.php
    	src/Symfony/Component/Yaml/Parser.php
  2. @fabpot

    Merge branch '2.3' into 2.5

    fabpot authored
    * 2.3:
      Configure firewall's kernel exception listener with configured entry point or a default entry point
      PSR-2 fixes
      [DependencyInjection] make paths relative to __DIR__ in the generated container
      Fixed the syntax of a composer.json file
      Fixed the symfony/config version constraint
      Tweaked the password-compat version constraint
      Docblock fixes
      define constant only if it wasn't defined before
      Fix incorrect spanish translation
      Fixed typos
    
    Conflicts:
    	composer.json
    	src/Symfony/Bridge/Twig/TwigEngine.php
    	src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
    	src/Symfony/Bundle/FrameworkBundle/Templating/Loader/FilesystemLoader.php
    	src/Symfony/Bundle/FrameworkBundle/composer.json
    	src/Symfony/Component/Console/Descriptor/MarkdownDescriptor.php
    	src/Symfony/Component/Console/Helper/TableHelper.php
    	src/Symfony/Component/Console/Tests/Helper/HelperSetTest.php
    	src/Symfony/Component/Debug/ErrorHandler.php
    	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
    	src/Symfony/Component/Finder/Tests/Iterator/RecursiveDirectoryIteratorTest.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/Controller/ControllerResolver.php
    	src/Symfony/Component/HttpKernel/Controller/ControllerResolverInterface.php
    	src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
    	src/Symfony/Component/HttpKernel/Fragment/RoutableFragmentRenderer.php
    	src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php
    	src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
    	src/Symfony/Component/Process/Process.php
    	src/Symfony/Component/Process/Tests/AbstractProcessTest.php
    	src/Symfony/Component/PropertyAccess/PropertyAccessorBuilder.php
    	src/Symfony/Component/Routing/Tests/Fixtures/validpattern.php
    	src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php
    	src/Symfony/Component/Security/composer.json
    	src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
    	src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
    	src/Symfony/Component/Stopwatch/StopwatchEvent.php
    	src/Symfony/Component/Stopwatch/StopwatchPeriod.php
    	src/Symfony/Component/Templating/PhpEngine.php
    	src/Symfony/Component/Templating/TemplateReference.php
    	src/Symfony/Component/Templating/TemplateReferenceInterface.php
    	src/Symfony/Component/Translation/TranslatorInterface.php
    	src/Symfony/Component/Validator/ConstraintViolation.php
    	src/Symfony/Component/Validator/ExecutionContextInterface.php
    	src/Symfony/Component/Validator/Mapping/ClassMetadata.php
    	src/Symfony/Component/Validator/MetadataFactoryInterface.php
Commits on Nov 16, 2014
  1. @fabpot

    Merge branch '2.5' into 2.6

    fabpot authored
    * 2.5:
      Update filesystem readme.md to include exists method
      Add machine readable events
      [HttpKernel][2.6] Adding support for invokable controllers in the RequestDataCollector
      fixed typo
      [Translations] Added missing Hebrew language trans-unit sources
      [DependencyInjection] inlined factory not referenced
      Fixed case for empty folder
      Fixed whitespace control for password form widget
      [Routing] correctly initialize condition as string
  2. @fabpot

    Merge branch '2.3' into 2.5

    fabpot authored
    * 2.3:
      Update filesystem readme.md to include exists method
      Add machine readable events
      fixed typo
      [Translations] Added missing Hebrew language trans-unit sources
      [DependencyInjection] inlined factory not referenced
      Fixed case for empty folder
Commits on Sep 22, 2014
  1. @fabpot

    feature #11857 [Filesystem] Check number of bytes copied. (skigun)

    fabpot authored
    This PR was merged into the 2.6-dev branch.
    
    Discussion
    ----------
    
    [Filesystem] Check number of bytes copied.
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | #10838
    | License       | MIT
    | Doc PR        | n/a
    
    This only test local files (because of `filesize`), wonder if we should include the remote files using `get_headers` in order to get the Content-length for example. However, it will perform an additional request...
    
    Here's a little benchmark for 500 copy from a remote origin file :
    - Standard without check -> Time: 47.34 seconds, Memory: 3.75Mb
    - Check with `get_headers` ->Time: 1.32 minutes, Memory: 3.75Mb
    
    Commits
    -------
    
    81eca38 [Filesystem] Check number of bytes copied.
  2. @fabpot

    feature #11312 Make assets:install smarter with symlinks (Roy Van Gin…

    fabpot authored
    …neken)
    
    This PR was squashed before being merged into the 2.6-dev branch (closes #11312).
    
    Discussion
    ----------
    
    Make assets:install smarter with symlinks
    
    | Q             | A
    | ------------- | ---
    | Bug fix?   | no
    | New feature?      | yes
    | BC breaks?      | no
    | Deprecations?      | no
    | Tests pass?      | -
    | Fixed tickets     | #11297
    | License     | MIT
    | Doc PR | -
    
    Commits
    -------
    
    6537333 Make assets:install smarter with symlinks
Commits on Sep 3, 2014
  1. @fabpot

    Merge branch '2.5'

    fabpot authored
    * 2.5: (23 commits)
      [HttpKernel] fixed some unit tests for 2.4 (signature now uses SHA256 instead of MD5)
      [HttpKernel] simplified code
      [HttpKernel] fixed internal fragment handling
      fixing yaml indentation
      Unexpexted ));"
      [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
      [Security] Add more tests for StringUtils::equals
      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
      ...
    
    Conflicts:
    	src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/admin.html.twig
    	src/Symfony/Component/Filesystem/Filesystem.php
    	src/Symfony/Component/HttpKernel/Fragment/EsiFragmentRenderer.php
  2. @fabpot

    Merge branch '2.3' into 2.4

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

    Merge branch '2.5'

    fabpot authored
    * 2.5:
      fix typos
      [HttpKernel] add use statement for phpdoc
      fixed DateComparator if file does not exist
      Disabled the PHPUnit self-update on Travis
      fix mustRun() in sigchild environments
      [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 #
      [Validator] Pass strict argument into the strict email validator
      [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
      Remove hard dependency of RequestContext in AssetsExtension
      added useful reminder about form.vars.errors into UPGRADE-2.5 notes
      [YAML] resolve variables in inlined YAML
      Disallow abstract definitions from doctrine event listener registration
    
    Conflicts:
    	src/Symfony/Component/Yaml/Inline.php
    	src/Symfony/Component/Yaml/Parser.php
    	src/Symfony/Component/Yaml/Tests/InlineTest.php
  2. @fabpot

    Merge branch '2.3' into 2.4

    fabpot authored
    * 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 Apr 16, 2014
  1. @fabpot

    Merge branch '2.3' into 2.4

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

    fixed types in phpdocs

    fabpot authored
  3. @fabpot

    Merge branch '2.3' into 2.4

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

    fixed types in phpdocs

    fabpot authored
Commits on Apr 15, 2014
  1. @fabpot
Commits on Mar 26, 2014
  1. @fabpot

    Merge branch '2.3' into 2.4

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

    fixed typo

    fabpot authored
Commits on Dec 31, 2013
  1. @fabpot

    Merge branch '2.3' into 2.4

    fabpot authored
    * 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 28, 2013
  1. @fabpot

    Merge branch '2.3' into 2.4

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

    minor #9869 fixed various typos (fabpot)

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

    fixed various typos

    fabpot authored
Something went wrong with that request. Please try again.