Permalink
Commits on Jan 25, 2015
  1. Merge branch '2.3' into 2.5

    * 2.3:
      [2.3] [HttpFoundation] [MimeTypeGuesser]
      Removed dead code and various cleaning
      [Console] Make it clear that the second argument is not about command options.
      Added the '-' character for spaceless on tag start and end to be consistent for block, if, set and for nodes
      [Yaml] fixed parse shortcut Key after unindented collection.
      [Console] fixed #10531
      Make the container considered non-fresh if the environment parameters are changed
    
    Conflicts:
    	src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
    	src/Symfony/Bridge/Twig/Resources/views/Form/form_table_layout.html.twig
    	src/Symfony/Component/Console/Tests/ApplicationTest.php
    	src/Symfony/Component/Security/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php
    fabpot committed Jan 25, 2015
  2. bug #13352 [Yaml] fixed parse shortcut Key after unindented collectio…

    …n. (aitboudad)
    
    This PR was merged into the 2.3 branch.
    
    Discussion
    ----------
    
    [Yaml] fixed parse shortcut Key after unindented collection.
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Fixed tickets  | #13345, #8093, #11019 and #10885
    | Tests pass?   | yes
    | License       | MIT
    
    Commits
    -------
    
    58a7426 [Yaml] fixed parse shortcut Key after unindented collection.
    fabpot committed Jan 25, 2015
Commits on Jan 20, 2015
  1. Merge branch '2.3' into 2.5

    * 2.3:
      [HttpFoundation] [Request] fix baseUrl parsing to fix wrong path_info
      [Twig][Bridge][TranslationDefaultDomain] add support of named arguments.
      [Form] Improved exception message if the data class is not found
      Fixes ArgvInput's argument getter with empty tokens
      execute cheaper checks before more expensive ones
    
    Conflicts:
    	src/Symfony/Component/Form/FormConfigBuilder.php
    fabpot committed Jan 20, 2015
Commits on Jan 16, 2015
  1. Merge branch '2.3' into 2.5

    * 2.3:
      fixed tests
      [EventDispatcher] Add missing checks to RegisterListenersPass
      Inline private 'is quoting required' methods in Escaper
      [Debug] fix loading order for legacy classes
      Add comment as requested
      Remove duplicate 'require'
      [Yaml] Improve YAML boolean escaping
    
    Conflicts:
    	src/Symfony/Component/Debug/Exception/FatalErrorException.php
    	src/Symfony/Component/HttpKernel/DependencyInjection/RegisterListenersPass.php
    fabpot committed Jan 16, 2015
  2. bug #13262 [Yaml] Improve YAML boolean escaping (petert82, larowlan)

    This PR was merged into the 2.3 branch.
    
    Discussion
    ----------
    
    [Yaml] Improve YAML boolean escaping
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | #13209
    | License       | MIT
    | Doc PR        | None
    
    This PR ensures that PHP [values which would be interpreted as booleans][1] in older versions of the YAML spec are escaped with single quotes when dumped by the Dumper.
    
    For example, dumping this:
    
    ```php
    array(
        'country_code' => 'no',
        'speaks_norwegian' => 'y',
        'heating' => 'on',
    )
    ```
    
    Will produce this YAML:
    
    ```yaml
    country_code: 'no'
    speaks_norwegian: 'y'
    heating: 'on'
    ```
    
    [1]: http://yaml.org/type/bool.html
    
    Commits
    -------
    
    8fa056b Inline private 'is quoting required' methods in Escaper
    afe827a Merge pull request #2 from larowlan/patch-2
    a0ec0fe Add comment as requested
    1e0633e Merge pull request #1 from larowlan/patch-1
    81a8090 Remove duplicate 'require'
    3760e67 [Yaml] Improve YAML boolean escaping
    fabpot committed Jan 16, 2015
Commits on Jan 11, 2015
Commits on Jan 9, 2015
  1. Merge branch '2.3' into 2.5

    * 2.3:
      [PropertyAccessor] Added test to allow null value for a array
      [Yaml] Fixed #10597: Improved Yaml directive parsing
      [Form] Set a child type to text if added to the form without a type.
    
    Conflicts:
    	src/Symfony/Component/PropertyAccess/PropertyAccessor.php
    	src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
    fabpot committed Jan 9, 2015
Commits on Jan 6, 2015
  1. Add comment as requested

    larowlan committed Jan 6, 2015
  2. Remove duplicate 'require'

    larowlan committed Jan 6, 2015
Commits on Jan 5, 2015
  1. [Yaml] Improve YAML boolean escaping

    - Moves dumping single-quoting logic into Yaml\Escaper
    - Ensures that PHP values which would be interpreted as booleans in
      older versions of the YAML spec are escaped with single quotes when
      dumped by the Dumper.
    petert82 committed Jan 5, 2015
Commits on Jan 3, 2015
  1. Merge branch '2.3' into 2.5

    * 2.3:
      [ClassLoader] removes deprecated classes from documentation.
      [Yaml] Update README.md
      [Security] fixed wrong phpdoc
    fabpot committed Jan 3, 2015
  2. [Yaml] Update README.md

    The ability to pass file names to Yaml::parse() was deprecated in 2.2 and will be removed in 3.0. So show an up-to-date example.
    xelaris committed Jan 3, 2015
  3. Merge branch '2.3' into 2.5

    * 2.3:
      Use PHPUnit ini_set wrapper in tests
      [Process] Added a test skip check for Windows
      [Process] Removed unused variable assignment
      Fixes various phpdoc and coding standards.
      Fixes Issue #13184 - incremental output getters now return empty strings
      Updated copyright to 2015
    
    Conflicts:
    	src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php
    	src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php
    	src/Symfony/Bundle/TwigBundle/Command/LintCommand.php
    	src/Symfony/Component/Debug/ExceptionHandler.php
    	src/Symfony/Component/Process/Tests/AbstractProcessTest.php
    fabpot committed Jan 3, 2015
Commits on Jan 1, 2015
  1. Updated copyright to 2015

    saro0h committed Jan 1, 2015
Commits on Dec 30, 2014
  1. Merge branch '2.3' into 2.5

    * 2.3:
      Updated generateSql tool
      Fix the implementation of deprecated Locale classes
      Fix phpdoc and coding standards
      Replace usages of the deprecated TypeTestCase by the new one
      Remove usages of deprecated constants
      Update functional tests to use the PSR NullLogger
      Make fabbot happy
      Clean up testing
      [DomCrawler] fixed bug #12143
    
    Conflicts:
    	src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
    	src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TimedPhpEngineTest.php
    	src/Symfony/Bundle/TwigBundle/Tests/Loader/FilesystemLoaderTest.php
    	src/Symfony/Component/Console/Application.php
    	src/Symfony/Component/DomCrawler/Crawler.php
    	src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php
    	src/Symfony/Component/Form/Tests/Extension/Csrf/Type/FormTypeCsrfExtensionTest.php
    	src/Symfony/Component/HttpKernel/Tests/Bundle/BundleTest.php
    	src/Symfony/Component/Serializer/Encoder/EncoderInterface.php
    	src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
    	src/Symfony/Component/Validator/Tests/Mapping/ClassMetadataFactoryTest.php
    fabpot committed Dec 30, 2014
Commits on Dec 29, 2014
  1. Fix phpdoc and coding standards

    This removes the unused use statements which were not catched by
    PHP-CS-Fixer because of string occurences. It also fixes some invalid
    phpdoc (scalar is not recognized as a valid type for instance).
    stof committed Dec 29, 2014
Commits on Dec 22, 2014
  1. Merge branch '2.3' into 2.5

    * 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
    fabpot committed Dec 22, 2014
  2. [2.3] CS And DocBlock Fixes

    GrahamCampbell committed with fabpot Dec 21, 2014
Commits on Dec 20, 2014
  1. Merge branch '2.3' into 2.5

    * 2.3:
      [Config] adds missing « use » statement for InvalidTypeException type hint in documentation.
      [Config] fixes broken unit test on ArrayNode class.
      fixed CS
      [Security] Delete old session on auth strategy migrate
      update required minimum TwigBridge version
      Very minor grammar fix in error message
      [Tests] Silenced all deprecations in tests for 2.3
      BinaryFileResponse - add missing newline
      fixed CS
      add a limit and a test to FlattenExceptionTest.
      CS: There should be no empty lines following phpdocs
      [FrameworkBundle] fix cache:clear command
      [2.3] Docblocks should not be followed by a blank line
      Fix return phpdoc
      [PropertyAccess] Added test to verify #5775 is fixed
    
    Conflicts:
    	src/Symfony/Bundle/TwigBundle/composer.json
    	src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
    	src/Symfony/Component/Security/Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php
    fabpot committed Dec 20, 2014
Commits on Dec 18, 2014
Commits on Dec 4, 2014
  1. Merge branch '2.3' into 2.5

    * 2.3:
      [2.3] More cs fixes
      Removed unused imports
      CS fixes
      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/Bundle/FrameworkBundle/EventListener/SessionListener.php
    	src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
    	src/Symfony/Component/HttpKernel/Kernel.php
    	src/Symfony/Component/HttpKernel/Tests/Bundle/BundleTest.php
    	src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
    fabpot committed Dec 4, 2014
Commits on Dec 3, 2014
  1. Removed unused imports

    GrahamCampbell committed Dec 3, 2014
Commits on Dec 2, 2014
  1. Merge branch '2.3' into 2.5

    * 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
    fabpot committed Dec 2, 2014
  2. PSR-2 fixes

    GrahamCampbell committed Dec 2, 2014
Commits on Nov 30, 2014
  1. Docblock fixes

    GrahamCampbell committed Nov 30, 2014
Commits on Nov 20, 2014
  1. Merge branch '2.3' into 2.5

    * 2.3:
      [SecurityBundle] Authentication entry point is only registered with firewall exception listener, not with authentication listeners
      be smarter when guessing the document root
      Azerbaijani locale
      Fixed grammar error in docblock
      Adjust upgrade file rendering
      [Bridge/Propel1] Changed deps to accepts all upcoming propel1 versions
      compare version using PHP_VERSION_ID
      [Form] Add doc for FormEvents
      don't override internal PHP constants
    
    Conflicts:
    	UPGRADE-3.0.md
    	src/Symfony/Bundle/FrameworkBundle/Command/ServerRunCommand.php
    	src/Symfony/Component/Debug/ErrorHandler.php
    	src/Symfony/Component/HttpFoundation/Response.php
    fabpot committed Nov 20, 2014
Commits on Nov 17, 2014
  1. compare version using PHP_VERSION_ID

    To let opcode caches optimize cached code, the `PHP_VERSION_ID`
    constant is used to detect the current PHP version instead of calling
    `version_compare()` with `PHP_VERSION`.
    xabbuh committed Nov 17, 2014
Commits on Nov 16, 2014
  1. minor #12372 [Yaml] don't override internal PHP constants (xabbuh)

    This PR was merged into the 2.3 branch.
    
    Discussion
    ----------
    
    [Yaml] don't override internal PHP constants
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | #11783
    | License       | MIT
    | Doc PR        |
    
    Commits
    -------
    
    376cc03 don't override internal PHP constants
    fabpot committed Nov 16, 2014
Commits on Nov 3, 2014
  1. Merge branch '2.3' into 2.5

    * 2.3:
      added missing files
      [TwigBundle] added a test
      Indicate which file was being parsed if an exception is thrown while running translation:debug
      [ClassLoader] Cast $useIncludePath property to boolean
      [HttpFoundation] Minor spelling fix in PHPDocs
      improve error message for multiple documents
      [Session] remove invalid workaround in session regenerate
      [Kernel] ensure session is saved before sending response
      [Routing] serialize the compiled route to speed things up
      [Validator] Fixed Regex::getHtmlPattern() to work with complex and negated patterns
      [DependencyInjection] use inheritdoc for loaders
      [Config] fix filelocator with empty name
      [Form] fix form handling with unconventional request methods like OPTIONS
      CSRF warning docs on Request::enableHttpMethodParameterOverride()
    
    Conflicts:
    	src/Symfony/Component/Routing/Route.php
    fabpot committed Nov 3, 2014
Commits on Nov 1, 2014
  1. improve error message for multiple documents

    The YAML parser doesn't support multiple documents. This pull requests
    improves the error message when the parser detects multiple YAML
    documents.
    xabbuh committed Nov 1, 2014
Commits on Oct 26, 2014
  1. Merge branch '2.3' into 2.5

    * 2.3:
      Remove aligned '=>' and '='
      Break infinite loop while resolving aliases
      [Security][listener] change priority of switchuser
      Improved the phpdoc for security token classes
      bumped Symfony version to 2.3.22
      updated VERSION for 2.3.21
      update CONTRIBUTORS for 2.3.21
      updated CHANGELOG for 2.3.21
    
    Conflicts:
    	src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php
    	src/Symfony/Bridge/Propel1/Form/Type/ModelType.php
    	src/Symfony/Bridge/Propel1/Logger/PropelLogger.php
    	src/Symfony/Bridge/Propel1/Tests/Fixtures/ItemQuery.php
    	src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php
    	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
    	src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
    	src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
    	src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Controller/LocalizedController.php
    	src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Controller/LoginController.php
    	src/Symfony/Component/Console/Descriptor/JsonDescriptor.php
    	src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php
    	src/Symfony/Component/Console/Helper/ProgressHelper.php
    	src/Symfony/Component/Debug/ErrorHandler.php
    	src/Symfony/Component/DependencyInjection/Container.php
    	src/Symfony/Component/Finder/Shell/Command.php
    	src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php
    	src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php
    	src/Symfony/Component/Form/Extension/Core/Type/FormType.php
    	src/Symfony/Component/Form/Extension/Core/Type/IntegerType.php
    	src/Symfony/Component/Form/Extension/Core/Type/NumberType.php
    	src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php
    	src/Symfony/Component/HttpFoundation/File/UploadedFile.php
    	src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php
    	src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
    	src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php
    	src/Symfony/Component/HttpKernel/Kernel.php
    	src/Symfony/Component/HttpKernel/Tests/EventListener/TestSessionListenerTest.php
    	src/Symfony/Component/HttpKernel/Tests/HttpCache/TestMultipleHttpKernel.php
    	src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
    	src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
    	src/Symfony/Component/Routing/Route.php
    	src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php
    	src/Symfony/Component/Security/Tests/Core/Validator/Constraints/UserPasswordValidatorTest.php
    	src/Symfony/Component/Templating/PhpEngine.php
    	src/Symfony/Component/Validator/Constraints/ImageValidator.php
    	src/Symfony/Component/Validator/Constraints/TypeValidator.php
    fabpot committed Oct 26, 2014