Skip to content

HTTPS clone URL

Subversion checkout URL

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

    Merge branch '2.6' into 2.7

    fabpot authored
    * 2.6: (30 commits)
      [Translation] fixed JSON loader on PHP 7 when file is empty
      Fix typo
      Check instance of FormBuilderInterface instead of FormBuilder
      [Security] TokenBasedRememberMeServices test to show why encoding username is required
      [Security] AbstractRememberMeServices::encodeCookie() validates cookie parts
      fixed typo
      [console][formater] allow format toString object.
      [HttpFoundation] Fix baseUrl when script filename is contained in pathInfo
      Avoid redirection to XHR URIs
      [HttpFoundation] IpUtils::checkIp4() should allow  networks
      [2.6] Fix HTML escaping of to-source links
      Fix HTML escaping of to-source links
      ExceptionHandler: More Encoding
      Fix the rendering of deprecation log messages
      [FrameworkBundle] Removed unnecessary parameter in TemplateController
      [DomCrawler] Throw an exception if a form field path is incomplete.
      Fixed the indentation in the compiled template for the DumpNode
      [Console] Delete duplicate test in CommandTest
      [TwigBundle] Refresh twig paths when resources change.
      WebProfiler break words
      ...
    
    Conflicts:
    	src/Symfony/Bridge/Twig/composer.json
    	src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig
    	src/Symfony/Component/Debug/ExceptionHandler.php
  2. @fabpot

    Merge branch '2.3' into 2.6

    fabpot authored
    * 2.3:
      Fix typo
      Check instance of FormBuilderInterface instead of FormBuilder
      [Security] TokenBasedRememberMeServices test to show why encoding username is required
      [Security] AbstractRememberMeServices::encodeCookie() validates cookie parts
      [console][formater] allow format toString object.
      [HttpFoundation] Fix baseUrl when script filename is contained in pathInfo
      Avoid redirection to XHR URIs
      [HttpFoundation] IpUtils::checkIp4() should allow  networks
      Fix HTML escaping of to-source links
      [FrameworkBundle] Removed unnecessary parameter in TemplateController
      [DomCrawler] Throw an exception if a form field path is incomplete.
      [Console] Delete duplicate test in CommandTest
      [TwigBundle] Refresh twig paths when resources change.
      WebProfiler break words
      fixed typo
      Update README.md
      [HttpKernel] Handle an array vary header in the http cache store
      [Security][Translation] fixes #14584
      [Framework] added test for Router commands.
      Handled bearer authorization header in REDIRECT_ form
    
    Conflicts:
    	src/Symfony/Component/Debug/ExceptionHandler.php
Commits on May 21, 2015
  1. @dosten
Commits on May 20, 2015
  1. @fabpot

    feature #14403 [Form] deprecate read_only option (Tobion)

    fabpot authored
    This PR was squashed before being merged into the 2.8 branch (closes #14403).
    
    Discussion
    ----------
    
    [Form] deprecate read_only option
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | yes
    | Tests pass?   | yes
    | Fixed tickets | #10658
    | License       | MIT
    | Doc PR        | symfony/symfony-docs#3782
    
    Replaces #10676 with a slightly different implementation.
    - fixes BC break when 'read_only' => true option and at the same time custom attributes are used by using a normalizer
    - adds deprecation notice
    - keeps legacy tests
    
    Commits
    -------
    
    53330e1 [Form] deprecate read_only option
  2. @Tobion @fabpot

    [Form] deprecate read_only option

    Tobion authored fabpot committed
  3. @fabpot

    bug #14551 [2.7][Form] Fixed ChoiceType with legacy ChoiceList (xelaris)

    fabpot authored
    This PR was merged into the 2.7 branch.
    
    Discussion
    ----------
    
    [2.7][Form] Fixed ChoiceType with legacy ChoiceList
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | #14382
    | License       | MIT
    | Doc PR        |
    
    The "Backwards compatibility" condition doesn't grap (e.g. when passing a `SimpleChoiceList` as `choice_list` on `ChoiceType`), as the default value for the `ChoiceType` option `preferred_choices` is `array()` instead of `null`. So I changed the condition from `null === $preferredChoices` to `empty($preferredChoices)`.
    Then there was an issue with accessing `attr` in `form_div_layout.html.twig`, since the deprecated `Symfony\Component\Form\Extension\Core\View\ChoiceView` doesn't provide an `attr` attribute. Since the docblocks of `Symfony\Component\Form\ChoiceList\View\ChoiceListView` state `$choices` and `$preferredChoices` to be instances of `Symfony\Component\Form\ChoiceList\View\ChoiceView` instead of `Symfony\Component\Form\Extension\Core\View\ChoiceView` I fixed the template issue by mapping the deprecated `ChoiceView` objects to the new one with an empty `attr`.
    
    @webmozart Could you have a look at it, please?
    
    Without this PR the following example would render numeric values as labels:
    ```php
            $formBuilder->add('choices', 'choice', array(
                'choice_list' => new SimpleChoiceList(array(
                    'creditcard' => 'Credit card payment',
                    'cash' => 'Cash payment'
                ))
            ));
    ```
    
    Commits
    -------
    
    a98e484 [Form] Fix ChoiceType with legacy ChoiceList
Commits on May 15, 2015
  1. @fabpot

    bug #14644 [Bridge\Twig] Adding a space between the icon and the erro…

    fabpot authored
    …r message (zmikael, nicolas-grekas)
    
    This PR was merged into the 2.6 branch.
    
    Discussion
    ----------
    
    [Bridge\Twig] Adding a space between the icon and the error message
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | #14557
    | License       | MIT
    | Doc PR        |
    
    Commits
    -------
    
    d0f6342 [Form] Test for space in AbstractBootstrap3LayoutTest::testErrors
    7a1fac2 Adding a space between the icon and the error message
  2. @nicolas-grekas
  3. @nicolas-grekas

    Merge branch '2.8'

    nicolas-grekas authored
    * 2.8:
      [EventDispatcher] make listeners removable from an executed listener
      [2.7][DoctrineBridge] change Logger interface in tests to use Psr\\Log\\LoggerInterface instead of Symfony\\Component\\HttpKernel\\Log\\LoggerInterface"
      [HttpFoundation] Fix volatile MongoDbSessionHandlerTest::testRead()
      bumped Symfony version to 2.7.0
      updated VERSION for 2.7.0-BETA2
      updated CHANGELOG for 2.7.0-BETA2
      Fixed compatibility with PHP7 and up by introducing new constraints (IsNull, IsTrue, IsFalse) and related validators (IsNullValidator, IsTrueValidator, IsFalseValidator)
      [Console] SymfonyStyle: fix block rpadding when escaping '<'
      [Console] fix code style
    
    Conflicts:
    	CHANGELOG-2.7.md
    	src/Symfony/Component/Form/composer.json
  4. @nicolas-grekas

    Merge branch '2.7' into 2.8

    nicolas-grekas authored
    * 2.7:
      [EventDispatcher] make listeners removable from an executed listener
      [2.7][DoctrineBridge] change Logger interface in tests to use Psr\\Log\\LoggerInterface instead of Symfony\\Component\\HttpKernel\\Log\\LoggerInterface"
      [HttpFoundation] Fix volatile MongoDbSessionHandlerTest::testRead()
      bumped Symfony version to 2.7.0
      updated VERSION for 2.7.0-BETA2
      updated CHANGELOG for 2.7.0-BETA2
      Fixed compatibility with PHP7 and up by introducing new constraints (IsNull, IsTrue, IsFalse) and related validators (IsNullValidator, IsTrueValidator, IsFalseValidator)
      [Console] SymfonyStyle: fix block rpadding when escaping '<'
      [Console] fix code style
    
    Conflicts:
    	src/Symfony/Component/Form/composer.json
  5. @nicolas-grekas

    Merge branch '2.6' into 2.7

    nicolas-grekas authored
    * 2.6:
      [EventDispatcher] make listeners removable from an executed listener
      [HttpFoundation] Fix volatile MongoDbSessionHandlerTest::testRead()
      Fixed compatibility with PHP7 and up by introducing new constraints (IsNull, IsTrue, IsFalse) and related validators (IsNullValidator, IsTrueValidator, IsFalseValidator)
    
    Conflicts:
    	src/Symfony/Component/Validator/Constraints/FalseValidator.php
    	src/Symfony/Component/Validator/Constraints/NullValidator.php
    	src/Symfony/Component/Validator/Constraints/TrueValidator.php
    	src/Symfony/Component/Validator/Tests/Constraints/LegacyFalseValidator2Dot4ApiTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/LegacyFalseValidatorLegacyApiTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/LegacyNullValidator2Dot4ApiTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/LegacyNullValidatorLegacyApiTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/LegacyTrueValidator2Dot4ApiTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/LegacyTrueValidatorLegacyApiTest.php
  6. @nicolas-grekas

    Merge branch '2.3' into 2.6

    nicolas-grekas authored
    * 2.3:
      Fixed compatibility with PHP7 and up by introducing new constraints (IsNull, IsTrue, IsFalse) and related validators (IsNullValidator, IsTrueValidator, IsFalseValidator)
    
    Conflicts:
    	src/Symfony/Component/Form/composer.json
    	src/Symfony/Component/Validator/CHANGELOG.md
    	src/Symfony/Component/Validator/Constraints/FalseValidator.php
    	src/Symfony/Component/Validator/Constraints/NullValidator.php
    	src/Symfony/Component/Validator/Constraints/TrueValidator.php
    	src/Symfony/Component/Validator/Tests/Constraints/IsFalseValidatorTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/IsNullValidatorTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/IsTrueValidatorTest.php
  7. @stof

    minor #14228 Add PHP7 compatible versions for the Null/True/False con…

    stof authored
    …straints as they are reserved words in PHP7 (stefan.r)
    
    This PR was merged into the 2.3 branch.
    
    Discussion
    ----------
    
    Add PHP7 compatible versions for the Null/True/False constraints as they are reserved words in PHP7
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      |  PHP7 compatibility
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | N/A
    | Fixed tickets | N/A - helps towards symfony/symfony#14086
    | License       | MIT
    
    Null, True and False are reserved words in PHP7:
    
    https://wiki.php.net/rfc/reserve_more_types_in_php_7
    
    Commits
    -------
    
    44edbdf Fixed compatibility with PHP7 and up by introducing new constraints (IsNull, IsTrue, IsFalse) and related validators (IsNullValidator, IsTrueValidator, IsFalseValidator)
Commits on May 13, 2015
  1. Fixed compatibility with PHP7 and up by introducing new constraints (…

    stefan.r authored
    …IsNull, IsTrue, IsFalse) and related validators (IsNullValidator, IsTrueValidator, IsFalseValidator)
Commits on May 12, 2015
  1. @nicolas-grekas

    Merge branch '2.8'

    nicolas-grekas authored
    * 2.8: (77 commits)
      [travis] Use container-based infrastructure
      [HttpKernel] use ConfigCache::getPath() method when it exists
      [PropertyAccess] Fix setting public property on a class having a magic getter
      [Routing] Display file which contain deprecated option
      ContainerInterface: unused exception dropped
      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
      [FrameworkBundle][DX] Add option to specify additional translation loading paths
      [Filesystem] Simplified an if statement
      fixed CS
      [SecurityBundle] Use Enum Nodes Instead Of Scalar
      ...
    
    Conflicts:
    	CHANGELOG-2.3.md
    	CHANGELOG-2.6.md
    	src/Symfony/Bridge/Swiftmailer/composer.json
    	src/Symfony/Bundle/DebugBundle/composer.json
    	src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
    	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/full.xml
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/event_dispatcher_1_event1.txt
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/event_dispatcher_1_events.txt
    	src/Symfony/Component/Debug/DebugClassLoader.php
    	src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
    	src/Symfony/Component/Form/README.md
    	src/Symfony/Component/Intl/README.md
    	src/Symfony/Component/Locale/composer.json
    	src/Symfony/Component/Routing/Loader/XmlFileLoader.php
    	src/Symfony/Component/Routing/Loader/YamlFileLoader.php
    	src/Symfony/Component/Security/README.md
    	src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php
    	src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
    	src/Symfony/Component/Serializer/Tests/Normalizer/PropertyNormalizerTest.php
    	src/Symfony/Component/Translation/README.md
    	src/Symfony/Component/Validator/README.md
    	src/Symfony/Component/Yaml/Yaml.php
  2. @nicolas-grekas

    Merge branch '2.7' into 2.8

    nicolas-grekas authored
    * 2.7: (70 commits)
      [travis] Use container-based infrastructure
      [HttpKernel] use ConfigCache::getPath() method when it exists
      [PropertyAccess] Fix setting public property on a class having a magic getter
      [Routing] Display file which contain deprecated option
      ContainerInterface: unused exception dropped
      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
      ...
    
    Conflicts:
    	src/Symfony/Bundle/DebugBundle/composer.json
    	src/Symfony/Bundle/FrameworkBundle/Command/ServerRunCommand.php
    	src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php
    	src/Symfony/Component/Form/README.md
    	src/Symfony/Component/Intl/README.md
    	src/Symfony/Component/Security/README.md
    	src/Symfony/Component/Translation/Loader/CsvFileLoader.php
    	src/Symfony/Component/Translation/Loader/IniFileLoader.php
    	src/Symfony/Component/Translation/Loader/MoFileLoader.php
    	src/Symfony/Component/Translation/Loader/PhpFileLoader.php
    	src/Symfony/Component/Translation/Loader/PoFileLoader.php
    	src/Symfony/Component/Translation/Loader/YamlFileLoader.php
    	src/Symfony/Component/Translation/README.md
    	src/Symfony/Component/Translation/Translator.php
    	src/Symfony/Component/Validator/README.md
Commits on May 5, 2015
  1. @webmozart

    bug #14465 [Form] Fixed regression: Empty values were not accepted an…

    webmozart authored
    …ymore for collapsed, optional choice fields (webmozart)
    
    This PR was merged into the 2.7 branch.
    
    Discussion
    ----------
    
    [Form] Fixed regression: Empty values were not accepted anymore for collapsed, optional choice fields
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | #14393
    | License       | MIT
    | Doc PR        | -
    
    Commits
    -------
    
    7997f24 [Form] Fixed regression: Empty values were not accepted anymore for collapsed, optional choice fields
  2. @xelaris
  3. @fabpot

    Merge branch '2.6' into 2.7

    fabpot authored
    * 2.6:
      [Validator] Property paths starting with 0 are broken.
      Fixed test
      [2.6][Validator] Fix Interface reference in docblock
      Fix getOrigin
    
    Conflicts:
    	src/Symfony/Component/Validator/ValidatorInterface.php
Commits on May 4, 2015
  1. @WouterJ

    Fix getOrigin

    WouterJ authored
  2. @webmozart

    [Form] Fixed regression: Empty values were not accepted anymore for c…

    webmozart authored
    …ollapsed, optional choice fields
Commits on May 2, 2015
  1. @fabpot

    Merge branch '2.6' into 2.7

    fabpot authored
    * 2.6: (25 commits)
      [2.6] link to https://symfony.com where possible
      Do not override PHP constants, only use when available
      link to https://symfony.com where possible
      [FrameworkBundle] Added missing log in server:run command
      [Finder] Only use GLOB_BRACE when available
      [HttpFoundation] Allow curly braces in trusted host patterns
      Fix merge
      Fix typo in variable name
      [profiler][security] check authenticated user by tokenClass instead of username.
      [WebProfiler] fix html syntax for input types
      [TwigBundle] Fix deprecated use of FlattenException
      [DependencyInjection] Removed extra strtolower calls
      Use https://symfony.com/search for searching
      [Debug] PHP7 compatibility with BaseException
      [Validator] Fixed Choice when an empty array is used in the "choices" option
      Fixed tests
      [StringUtil] Fixed singularification of 'selfies'
      Fix Portuguese (Portugal) translation for Security
      improved exception when missing required component
      [DependencyInjection] resolve circular reference
      ...
    
    Conflicts:
    	src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig
    	src/Symfony/Component/Form/README.md
    	src/Symfony/Component/Intl/README.md
    	src/Symfony/Component/Security/README.md
    	src/Symfony/Component/Translation/README.md
    	src/Symfony/Component/Validator/README.md
  2. @fabpot

    Merge branch '2.3' into 2.6

    fabpot authored
    * 2.3:
      link to https://symfony.com where possible
      [FrameworkBundle] Added missing log in server:run command
      [HttpFoundation] Allow curly braces in trusted host patterns
      [profiler][security] check authenticated user by tokenClass instead of username.
      Use https://symfony.com/search for searching
    
    Conflicts:
    	src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php
    	src/Symfony/Component/Form/README.md
    	src/Symfony/Component/Intl/README.md
    	src/Symfony/Component/Routing/composer.json
    	src/Symfony/Component/Security/README.md
    	src/Symfony/Component/Translation/README.md
    	src/Symfony/Component/Validator/README.md
Commits on May 1, 2015
  1. @xabbuh
Commits on Apr 24, 2015
  1. @nicolas-grekas

    Merge branch '2.8'

    nicolas-grekas authored
    * 2.8: (61 commits)
      [Debug] Fix ClassNotFoundFatalErrorHandler candidates lookups
      [2.6][Translator] Extend, refactor and simplify Translator tests.
      [VarDumper] Allow preserving a subset of cut arrays
      [Console] Bind the closure (code) to the Command if possible
      [VarDumper] Added support for SplFileObject
      [VarDumper] Added support for SplFileInfo
      Update DebugClassLoader.php
      inject asset packages in assets helper service
      [travis] Do not exclude legacy tests on 2.7
      [HttpFoundation] remove getExtension method
      [2.6][Translation] fix legacy tests.
      [Form] Removed remaining deprecation notices in the test suite
      [Form] Moved deprecation notice triggers to file level
      [Debug] Map PHP errors to LogLevel::CRITICAL
      [FrameworkBundle][Server Command] add address port number option.
      [Routing][DependencyInjection] Support .yaml extension in YAML loaders
      [DX] improve file loader error for router/other resources in bundle
      [FrameworkBundle] Initialize translator with the default locale.
      [FrameworkBundle] Fix Routing\DelegatingLoader resiliency to fatal errors
      [2.7][Translation] remove duplicate code for loading catalogue.
      ...
    
    Conflicts:
    	composer.json
    	src/Symfony/Bridge/Swiftmailer/composer.json
    	src/Symfony/Component/Console/Helper/DialogHelper.php
    	src/Symfony/Component/Debug/ErrorHandler.php
    	src/Symfony/Component/Debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php
    	src/Symfony/Component/Form/Extension/HttpFoundation/EventListener/BindRequestListener.php
    	src/Symfony/Component/Locale/composer.json
  2. @nicolas-grekas

    Merge branch '2.7' into 2.8

    nicolas-grekas authored
    * 2.7: (40 commits)
      [Debug] Fix ClassNotFoundFatalErrorHandler candidates lookups
      [2.6][Translator] Extend, refactor and simplify Translator tests.
      Update DebugClassLoader.php
      inject asset packages in assets helper service
      [travis] Do not exclude legacy tests on 2.7
      [HttpFoundation] remove getExtension method
      [2.6][Translation] fix legacy tests.
      [Form] Removed remaining deprecation notices in the test suite
      [Form] Moved deprecation notice triggers to file level
      [Debug] Map PHP errors to LogLevel::CRITICAL
      [Routing][DependencyInjection] Support .yaml extension in YAML loaders
      [DX] improve file loader error for router/other resources in bundle
      [FrameworkBundle] Initialize translator with the default locale.
      [FrameworkBundle] Fix Routing\DelegatingLoader resiliency to fatal errors
      [2.7][Translation] remove duplicate code for loading catalogue.
      [2.6][Translation] remove duplicate code for loading catalogue.
      [HttpKernel] Cleanup ExceptionListener
      CS fixes
      [DependencyInjection] Show better error when the Yaml component is not installed
      [2.3] SCA for Components - reference mismatches
      ...
Commits on Apr 19, 2015
  1. @webmozart @nicolas-grekas
  2. @webmozart @nicolas-grekas
Commits on Apr 18, 2015
  1. @nicolas-grekas

    Merge branch '2.6' into 2.7

    nicolas-grekas authored
    * 2.6:
      [Routing][DependencyInjection] Support .yaml extension in YAML loaders
      [DX] improve file loader error for router/other resources in bundle
      [FrameworkBundle] Initialize translator with the default locale.
      [FrameworkBundle] Fix Routing\DelegatingLoader resiliency to fatal errors
      [2.6][Translation] remove duplicate code for loading catalogue.
      [HttpKernel] Cleanup ExceptionListener
      CS fixes
      [DependencyInjection] Show better error when the Yaml component is not installed
      [2.3] SCA for Components - reference mismatches
      [Debug] Scream as LogLevel::DEBUG (but for fatal errors / uncaught exceptions)
      [2.3] Static Code Analysis for Components
      [WebProfilerBundle] Fix resiliency to exceptions thrown by the url generator
      [Translation] LoggingTranslator simplifications
      [Translation][fixed test] refresh cache when resources are no longer fresh.
      [FrameworkBundle] Fixed server:start --router relative path issue #14124
      [FrameworkBundle] improve usage of Table helper
      [Validator] Added missing Simplified Chinese (zh_CN) translations
      [FrameworkBundle] Workaround php -S ignoring auto_prepend_file
    
    Conflicts:
    	src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php
    	src/Symfony/Component/Console/Helper/Table.php
    	src/Symfony/Component/Translation/LoggingTranslator.php
  2. @nicolas-grekas

    Merge branch '2.3' into 2.6

    nicolas-grekas authored
    * 2.3:
      [Routing][DependencyInjection] Support .yaml extension in YAML loaders
      [DX] improve file loader error for router/other resources in bundle
      [FrameworkBundle] Fix Routing\DelegatingLoader resiliency to fatal errors
      [HttpKernel] Cleanup ExceptionListener
      CS fixes
      [DependencyInjection] Show better error when the Yaml component is not installed
      [2.3] SCA for Components - reference mismatches
      [2.3] Static Code Analysis for Components
      [Translation][fixed test] refresh cache when resources are no longer fresh.
      [Validator] Added missing Simplified Chinese (zh_CN) translations
      [FrameworkBundle] Workaround php -S ignoring auto_prepend_file
    
    Conflicts:
    	src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php
    	src/Symfony/Component/Config/Exception/FileLoaderLoadException.php
    	src/Symfony/Component/Console/Descriptor/TextDescriptor.php
    	src/Symfony/Component/Console/Helper/TableHelper.php
    	src/Symfony/Component/Console/Tests/Formatter/OutputFormatterTest.php
    	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
    	src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
    	src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
    	src/Symfony/Component/HttpKernel/Tests/Debug/TraceableEventDispatcherTest.php
    	src/Symfony/Component/PropertyAccess/PropertyAccessor.php
    	src/Symfony/Component/Yaml/Tests/InlineTest.php
Commits on Apr 15, 2015
  1. @fabpot

    minor #14097 [2.3] Static Code Analysis for Components (kalessil)

    fabpot authored
    This PR was squashed before being merged into the 2.3 branch (closes #14097).
    
    Discussion
    ----------
    
    [2.3] Static Code Analysis for Components
    
    | 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
    
    Static Code Analysis with Php Inspections (EA Extended), no functional changes:
    - array_keys/array_values usage as foreach array
    - foreach value by reference - added unsets to keep scope clear
    - strstr usage as strpos fixed
    - array_push miss-use resolved
    
    Commits
    -------
    
    78cc93c [2.3] Static Code Analysis for Components
  2. @kalessil @fabpot

    [2.3] Static Code Analysis for Components

    kalessil authored fabpot committed
Commits on Apr 11, 2015
  1. @Tobion
  2. @fabpot

    Merge branch '2.7' into 2.8

    fabpot authored
    * 2.7:
      [HttpKernel] fixed a regression when no exception listeners are registered
      renamed some confusing tests
      propel/propel1 is now useless
      bumped Symfony version to 2.7.0
      updated VERSION for 2.7.0-BETA1
      updated CHANGELOG for 2.7.0-BETA1
      [2.3] Fix @link annotations
      [2.7] For @link annotations
      [2.6] Fix @link annotations
      [2.7][Console] Count the  array instead of
      [Config][cache factory] check type of callback argument.
      Fix javascript
      [2.3][Translation] test refresh cache when resources File change.
      Added deprecation message and original color back
      [Translator] Cache does not take fallback locales into consideration
  3. @fabpot

    Merge branch '2.6' into 2.7

    fabpot authored
    * 2.6:
      renamed some confusing tests
      [2.3] Fix @link annotations
      [2.6] Fix @link annotations
      Fix javascript
      [2.3][Translation] test refresh cache when resources File change.
      [Translator] Cache does not take fallback locales into consideration
    
    Conflicts:
    	src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php
    	src/Symfony/Component/Form/Extension/HttpFoundation/EventListener/BindRequestListener.php
    	src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php
    	src/Symfony/Component/Validator/ValidatorInterface.php
Something went wrong with that request. Please try again.