Skip to content
Commits on Feb 4, 2016
  1. @nicolas-grekas

    Merge branch '3.0'

    nicolas-grekas committed
    * 3.0: (105 commits)
      [Console] remove readline support
      bumped Symfony version to 3.0.3
      updated VERSION for 3.0.2
      updated CHANGELOG for 3.0.2
      [Routing] added a suggestion to add the HttpFoundation component.
      [FrameworkBundle] fix assets and templating tests
      [ClassLoader] fix ApcClassLoader tests on HHVM
      [travis] Add some comments
      changed operator from and to &&
      [DependencyInjection] Remove unused parameter
      [Process] Fix transient tests for incremental outputs
      [Console] Add missing `@require` annotation in test
      Fix merge
      [appveyor] Fix failure reporting
      [#17634] move DebugBundle license file
      Limit Ldap component version for the 3.0 branch
      backport GlobTest from 2.7 branch
      Move licenses according to new best practices
      [FrameworkBundle] Remove unused code in test
      [2.3] Fixed an undefined variable in Glob::toRegex
      ...
    
    Conflicts:
    	.travis.yml
    	composer.json
    	src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
    	src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
    	src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
    	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/assets.php
    	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/assets.xml
    	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/assets.yml
    	src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_item.html.twig
    	src/Symfony/Component/Console/CHANGELOG.md
    	src/Symfony/Component/HttpKernel/Kernel.php
    	src/Symfony/Component/PropertyInfo/Tests/PropertyInfoExtractorTest.php
    	src/Symfony/Component/Yaml/Tests/ParserTest.php
Commits on Feb 2, 2016
  1. @nicolas-grekas

    Merge branch '2.8' into 3.0

    nicolas-grekas committed
    * 2.8:
      [Process] Fix transient tests for incremental outputs
      [Console] Add missing `@require` annotation in test
      Fix merge
      [appveyor] Fix failure reporting
      [#17634] move DebugBundle license file
      backport GlobTest from 2.7 branch
      Move licenses according to new best practices
      [FrameworkBundle] Remove unused code in test
      [2.3] Fixed an undefined variable in Glob::toRegex
      simplified a test
      fix container cache key generation
      [Form] fix option name in upgrade file
      [Form] fix option name in changelog
      [Translation] Add resources from fallback locale
      [DependencyInjection] enforce tags to have a name
      [YAML] Refine the return value of Yaml::parse()
    
    Conflicts:
    	UPGRADE-2.8.md
  2. @nicolas-grekas

    Merge branch '2.7' into 2.8

    nicolas-grekas committed
    * 2.7:
      [Console] Add missing `@require` annotation in test
      Fix merge
      [appveyor] Fix failure reporting
      [#17634] move DebugBundle license file
      backport GlobTest from 2.7 branch
      Move licenses according to new best practices
      [FrameworkBundle] Remove unused code in test
      [2.3] Fixed an undefined variable in Glob::toRegex
      simplified a test
      fix container cache key generation
      [Form] fix option name in changelog
      [Translation] Add resources from fallback locale
      [DependencyInjection] enforce tags to have a name
      [YAML] Refine the return value of Yaml::parse()
    
    Conflicts:
    	src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
Commits on Feb 1, 2016
  1. @nicolas-grekas

    Merge branch '2.3' into 2.7

    nicolas-grekas committed
    * 2.3:
      [appveyor] Fix failure reporting
  2. @nicolas-grekas
Commits on Jan 31, 2016
  1. @fabpot

    simplified a test

    fabpot committed
  2. @fabpot

    Merge branch '2.3' into 2.7

    fabpot committed
    * 2.3:
      fix container cache key generation
      [Translation] Add resources from fallback locale
      [DependencyInjection] enforce tags to have a name
      [YAML] Refine the return value of Yaml::parse()
  3. @fabpot

    bug #17596 [Translation] Add resources from fallback locale to parent…

    fabpot committed
    … catalogue (c960657)
    
    This PR was merged into the 2.3 branch.
    
    Discussion
    ----------
    
    [Translation] Add resources from fallback locale to parent catalogue
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | -
    | License       | MIT
    | Doc PR        | -
    
    The resources representing a locale includes those of the fallback locale. However, `getCatalogue()->getResources()` only returns the resources belonging specifically to the selected locale.
    
    Example: The locale `en_GB` falls back to `en`. I use the locale `en_GB`. During development, when I modify the `en_GB` translation file, the changes appear instantly when reloading the page. If I modify the `en` translation file, I need to manually clear the cache in order for the new translation to appear.
    
    I believe this is a regression that was introduced in #15527.
    
    This patch is for the 2.3 branch. For 2.6 and later, the test can be updated to use the getCatalogue() method instead of using ReflectionProperty.
    
    Commits
    -------
    
    f7f82fa [Translation] Add resources from fallback locale
Commits on Jan 28, 2016
  1. @c960657
Commits on Jan 27, 2016
  1. @fabpot

    Merge branch '2.8' into 3.0

    fabpot committed
    * 2.8:
      [WebProfilerBundle] Don't inherit CSS text-transform property for the toolbar.
      Remove duplicate cursor property
      Increase the inlining YAML level for config:debug
      [Serializer] Minor: fix CS and PHPDoc
      [Form] fix tests
      [Serializer] Ensure that groups are strings
      [Debug] Tell that the extension is for PHP 5 only
      Static code analysis
      Update AnnotationDirectoryLoader.php
      added a test
      Escape the delimiter in Glob::toRegex
      [FrameworkBundle] Fix template location for PHP templates
      [FrameworkBundle] Add path verification to the template parsing test cases
  2. @fabpot

    Merge branch '2.7' into 2.8

    fabpot committed
    * 2.7:
      Increase the inlining YAML level for config:debug
      [Serializer] Minor: fix CS and PHPDoc
      [Form] fix tests
      [Serializer] Ensure that groups are strings
      [Debug] Tell that the extension is for PHP 5 only
      Static code analysis
      Update AnnotationDirectoryLoader.php
      added a test
      Escape the delimiter in Glob::toRegex
      [FrameworkBundle] Fix template location for PHP templates
      [FrameworkBundle] Add path verification to the template parsing test cases
  3. @fabpot

    Merge branch '2.3' into 2.7

    fabpot committed
    * 2.3:
      Static code analysis
      Update AnnotationDirectoryLoader.php
      [FrameworkBundle] Fix template location for PHP templates
      [FrameworkBundle] Add path verification to the template parsing test cases
  4. @fabpot

    minor #17480 Static code analysis (Koc)

    fabpot committed
    This PR was merged into the 2.3 branch.
    
    Discussion
    ----------
    
    Static code analysis
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | -
    | License       | MIT
    | Doc PR        | -
    
    Things that done:
    * fix case in method calls
    * removed unused imports
    * use shorter concat where it possible
    * optimize some css
    * removed duplicated array keys
    * removed redurant return statements
    * removed one-time variables
    * do not pass arguments that not used in functions
    
    Commits
    -------
    
    8db691a Static code analysis
Commits on Jan 25, 2016
  1. @Koc

    Static code analysis

    Koc committed
  2. @fabpot

    Merge branch '2.8' into 3.0

    fabpot committed
    * 2.8:
      fixed test
      [Request] Ignore invalid IP addresses sent by proxies
      [EventDispatcher] TraceableEventDispatcher resets listener priorities
      Throw for missing container extensions
      [TwigBridge] add missing unit tests (AppVariable)
      Able to load big xml files with DomCrawler
      fixed typo
      [Form] Fix constraints could be null if not set
      [Finder] Check PHP version before applying a workaround for a PHP bug
      fixed CS
      add defaultNull to version
      sort bundles in config:dump-reference command
      Fixer findings.
      Profiler CSS position conflicts with JS detection
      [Translation][Writer] avoid calling setBackup if the dumper is not an instance of FileDumper.
      [FrameworkBundle] Compute the kernel root hash only one time
  3. @fabpot

    Merge branch '2.7' into 2.8

    fabpot committed
    * 2.7:
      fixed test
      [Request] Ignore invalid IP addresses sent by proxies
      Throw for missing container extensions
      [TwigBridge] add missing unit tests (AppVariable)
      Able to load big xml files with DomCrawler
      fixed typo
      [Form] Fix constraints could be null if not set
      [Finder] Check PHP version before applying a workaround for a PHP bug
      fixed CS
      add defaultNull to version
      sort bundles in config:dump-reference command
      Fixer findings.
      [Translation][Writer] avoid calling setBackup if the dumper is not an instance of FileDumper.
      [FrameworkBundle] Compute the kernel root hash only one time
  4. @fabpot

    bug #16912 [Translation][Writer] avoid calling setBackup if the dumpe…

    fabpot committed
    …r is not FileDumper (aitboudad)
    
    This PR was merged into the 2.7 branch.
    
    Discussion
    ----------
    
    [Translation][Writer] avoid calling setBackup if the dumper is not FileDumper
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets |  ~
    | License       | MIT
    | Doc PR        | n/a
    
    Commits
    -------
    
    369b2d4 [Translation][Writer] avoid calling setBackup if the dumper is not an instance of FileDumper.
Commits on Jan 21, 2016
  1. @fabpot

    Merge branch '3.0'

    fabpot committed
    * 3.0:
      fixed CS
      fixed CS
      fixed CS
      fixed test
      fixed CS
      Remove default match from AbstractConfigCommand::findExtension
      Remove unused imports
      [FrameworkBundle][Validator] Fix apc cache service deprecation
  2. @fabpot

    Merge branch '2.8' into 3.0

    fabpot committed
    * 2.8:
      fixed CS
      fixed CS
      fixed test
      fixed CS
      Remove default match from AbstractConfigCommand::findExtension
      [FrameworkBundle][Validator] Fix apc cache service deprecation
  3. @fabpot

    fixed CS

    fabpot committed
  4. @fabpot

    Merge branch '2.3' into 2.7

    fabpot committed
    * 2.3:
      fixed test
  5. @fabpot

    fixed test

    fabpot committed
  6. @fabpot

    Merge branch '2.3' into 2.7

    fabpot committed
    * 2.3:
      fixed CS
  7. @fabpot

    fixed CS

    fabpot committed
Commits on Jan 12, 2016
  1. @kalessil @fabpot
Commits on Jan 3, 2016
  1. @fabpot

    Merge branch '3.0'

    fabpot committed
    * 3.0:
      updated copyright year
      updated copyright year
      Update copyright year
      [2.3] Static Code Analysis for Components
  2. @fabpot

    Merge branch '2.8' into 3.0

    fabpot committed
    * 2.8:
      updated copyright year
      updated copyright year
      Update copyright year
      [2.3] Static Code Analysis for Components
  3. @fabpot

    Merge branch '2.7' into 2.8

    fabpot committed
    * 2.7:
      updated copyright year
      Update copyright year
      [2.3] Static Code Analysis for Components
  4. @fabpot

    Merge branch '2.3' into 2.7

    fabpot committed
    * 2.3:
      Update copyright year
      [2.3] Static Code Analysis for Components
Commits on Jan 2, 2016
  1. @dosten

    Update copyright year

    dosten committed
Commits on Dec 31, 2015
  1. @kalessil @fabpot
Commits on Dec 11, 2015
  1. @aitboudad
Commits on Dec 5, 2015
  1. @stof

    Merge branch '3.0'

    stof committed
    * 3.0:
      [Process] Fix stopping a process on Windows
      [PhpUnitBridge] Add weak-verbose mode and match against message instead of test name
      Added a note about the new requirement iconv.
      Improved error messages for Yaml Deprecations
      Added a test case for the Logger class.
      [Form] Fix choices defined as Traversable
      CS: general fixes
      Suggested Process dependency
  2. @stof

    Merge branch '2.8' into 3.0

    stof committed
    * 2.8:
      [Process] Fix stopping a process on Windows
      [PhpUnitBridge] Add weak-verbose mode and match against message instead of test name
      Added a note about the new requirement iconv.
      Improved error messages for Yaml Deprecations
      Added a test case for the Logger class.
      [Form] Fix choices defined as Traversable
      CS: general fixes
      Suggested Process dependency
  3. @stof

    Merge branch '2.7' into 2.8

    stof committed
    * 2.7:
      [Process] Fix stopping a process on Windows
      Added a test case for the Logger class.
      CS: general fixes
Something went wrong with that request. Please try again.