Permalink
Commits on Nov 25, 2013
  1. @fabpot
Commits on Sep 19, 2013
  1. @bronze1man @fabpot

    Fix some annotates

    bronze1man committed with fabpot Sep 18, 2013
Commits on Sep 18, 2013
  1. @fabpot
Commits on Aug 9, 2013
  1. @larowlan @fabpot

    Use strstr instead of strpos

    larowlan committed with fabpot May 17, 2013
Commits on May 6, 2013
  1. @fabpot

    Merge branch '2.1' into 2.2

    * 2.1:
      bumped Symfony version to 2.1.11-DEV
      updated VERSION for 2.1.10
      update CONTRIBUTORS for 2.1.10
      updated CHANGELOG for 2.1.10
      fixed CS
      [Process] Cleanup tests & prevent assertion that kills randomly Travis-CI
      [Filesystem] Fix regression introduced in 10dea948
    
    Conflicts:
    	src/Symfony/Component/Form/Extension/Core/DataTransformer/DataTransformerChain.php
    	src/Symfony/Component/HttpKernel/Kernel.php
    	src/Symfony/Component/HttpKernel/Profiler/RedisProfilerStorage.php
    	src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php
    fabpot committed May 6, 2013
  2. @fabpot

    fixed CS

    fabpot committed May 6, 2013
Commits on Mar 19, 2013
  1. @fabpot

    [ClassLoader] fixed heredocs handling

    The end of an hereodc must have a newline to avoid PHP syntax errors.
    fabpot committed Mar 19, 2013
  2. @fabpot

    fixed handling of heredocs

    fabpot committed Mar 19, 2013
Commits on Mar 11, 2013
  1. @fabpot

    Merge branch '2.1' into 2.2

    * 2.1:
      [FrameworkBundle] Fix code status in dockblock
      Fixed test to use Reflection
      [Finder] fixed a potential issue on Solaris where INF value is wrong (refs #7269)
      Update RouteCompiler.php
      [FrameworkBundle] avoids cache:clear to break if new/old folders already exist
      [HttpKernel] Fixed possible profiler token collision (closes #7272, closes #7171)
      [ClassLoader] tweaked test
      [ClassLoader] made DebugClassLoader idempotent
      [DomCrawler] Fix relative path handling in links
    
    Conflicts:
    	src/Symfony/Component/DomCrawler/Link.php
    	src/Symfony/Component/Finder/Iterator/DepthRangeFilterIterator.php
    	src/Symfony/Component/Routing/RouteCompiler.php
    fabpot committed Mar 11, 2013
Commits on Mar 8, 2013
  1. @merk

    Fixed test to use Reflection

    merk committed Mar 8, 2013
Commits on Mar 3, 2013
  1. @kriswallsmith
Commits on Mar 2, 2013
  1. @kriswallsmith
Commits on Mar 1, 2013
  1. @fabpot

    fixed CS

    fabpot committed Mar 1, 2013
  2. @fabpot

    Merge branch '2.1' into 2.2

    * 2.1:
      Options small typo
      [Console] fixed unparsed StringInput tokens
      [TwigBridge] fixed trans twig extractor
      [DomCrawler] fix handling of schemes by Link::getUri()
      [Console] Fixed comment
      [TwigBridge] fixed the translator extractor that were not trimming the text in trans tags (closes #7056)
      Fixed handling absent href attribute in base tag
      added a DebuClassLoader::findFile() method to make the wrapping less invasive
      fixed CHANGELOG
      bumped Symfony version to 2.1.9-DEV
      updated VERSION for 2.1.8
      updated CHANGELOG for 2.1.8
      StringInput resets the given options.
    
    Conflicts:
    	src/Symfony/Component/HttpKernel/Kernel.php
    fabpot committed Mar 1, 2013
Commits on Feb 27, 2013
  1. @fabpot

    merged branch lsmith77/debugclassloader_findfile_2_1 (PR #7168)

    This PR was merged into the 2.1 branch.
    
    Commits
    -------
    
    0690709 added a DebuClassLoader::findFile() method to make the wrapping less invasive
    
    Discussion
    ----------
    
    added a DebuClassLoader::findFile() method to make the wrapping less invasive
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | -
    | License       | MIT
    
    i have classified it as a bug fix, since due to the wrapping it can break assumptions about the loaded class loader, so implementing this method at least doesnt break the assumption that ``findFile()`` is available.
    
    actually i think we should also introduced a loader interface to reduce the duct typing
    
    ---------------------------------------------------------------------------
    
    by stof at 2013-02-24T16:39:46Z
    
    👎 for the interface:
    
    - it would make the use of the autoloader more difficult (you would have to require the interface before requiring the loader)
    - it would forbid using these wrappers with the composer ClassLoader
    
    ---------------------------------------------------------------------------
    
    by digitalkaoz at 2013-02-24T19:16:36Z
    
    mh, i think all autoloaders should follow a common interface, maybe its worth to think about a PSR?
    
    ---------------------------------------------------------------------------
    
    by lsmith77 at 2013-02-24T19:27:27Z
    
    ah I see
    
    ---------------------------------------------------------------------------
    
    by stof at 2013-02-24T20:33:07Z
    
    @digitalkaoz Such an interface would have to be in PHP itself, otherwise, you would have to require it first each time (as it cannot be autoloaded before registering the autoloader). And an autoloader in PHP is just a callable.
    
    ---------------------------------------------------------------------------
    
    by digitalkaoz at 2013-02-24T20:47:10Z
    
    Yes @stof, i know, but it would be nice if all autoloaders follows a common pattern , call it a convention ;)
    fabpot committed Feb 27, 2013
Commits on Feb 24, 2013
  1. @lsmith77
Commits on Feb 8, 2013
  1. @fabpot
Commits on Feb 1, 2013
  1. @vicb @fabpot
Commits on Jan 27, 2013
  1. @fabpot

    Merge branch '2.1'

    * 2.1:
      [Yaml] fixed wrong merge (indentation default is 4 as of 2.1)
      Fixed missing class argument when throwing exception
    fabpot committed Jan 27, 2013
Commits on Jan 26, 2013
  1. @xamado @fabpot
Commits on Jan 23, 2013
  1. @fabpot

    Merge branch '2.1'

    * 2.1:
      [DependencyInjection] fixed the creation of synthetic services in ContainerBuilder
      [Security] PHPDoc in SecurityEvents
      Fix typos in README
      Added an error message in the DebugClassLoader when using / instead of \.
      KNOWN_ISSUES with php 5.3.16
      [FrameworkBundle] fixed Client::doRequest that must call its parent method (closes #6737)
      [Yaml] fixed ignored text when parsing an inlined mapping or sequence (closes #6786)
      [Yaml] fixed #6773
      [Yaml] fixed #6770
      bumped Symfony version to 2.1.8-DEV
      bumped Symfony version to 2.0.23-DEV
    
    Conflicts:
    	src/Symfony/Bundle/FrameworkBundle/Client.php
    	src/Symfony/Component/HttpKernel/Kernel.php
    fabpot committed Jan 23, 2013
Commits on Jan 19, 2013
  1. @stof @fabpot
Commits on Jan 17, 2013
  1. @fabpot

    Merge branch '2.1'

    * 2.1:
      [Yaml] fixed default value
      Added Yaml\Dumper::setIndentation() method to allow a custom indentation level of nested nodes.
      added a way to enable/disable object support when parsing/dumping
      added a way to enable/disable PHP support when parsing a YAML input via Yaml::parse()
      fixed CS
      [Process] Fix docblocks, remove `return` from `PhpProcess#start()` as parent returns nothing, cleaned up `ExecutableFinder`
      fixes a bug when output/error output contains a % character
      [Console] fixed input bug when the value of an option is empty (closes #6649, closes #6689)
      [Profiler] [Redis] Fix sort of profiler rows.
      Fix version_compare() calls for PHP 5.5.
      Removed underscores from test method names to be consistent with other components.
      [Process] In edge cases `getcwd()` can return `false`, then `proc_open()` should get `null` to use default value (the working dir of the current PHP process)
      Fix version_compare() calls for PHP 5.5.
      Handle the deprecation of IntlDateFormatter::setTimeZoneId() in PHP 5.5.
      removed the .gitattributes files (closes #6605, reverts #5674)
      [HttpKernel] Clarify misleading comment in ExceptionListener
    
    Conflicts:
    	src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_style.html.twig
    	src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php
    	src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php
    	src/Symfony/Component/Form/Tests/Util/PropertyPathTest.php
    	src/Symfony/Component/HttpKernel/Profiler/RedisProfilerStorage.php
    	src/Symfony/Component/Process/Process.php
    fabpot committed Jan 17, 2013
Commits on Jan 9, 2013
  1. @fabpot
Commits on Jan 4, 2013
  1. @fabpot

    Merge branch '2.0' into 2.1

    * 2.0:
      updated license year
      Update src/Symfony/Component/HttpFoundation/Response.php
      [Console] fixed unitialized properties (closes #5935)
      [Bundle] [FrameworkBundle] fixed typo in phpdoc of the SessionListener.
      bumped Symfony version to 2.0.21-DEV
      updated VERSION for 2.0.21
      updated CHANGELOG for 2.0.21
    
    Conflicts:
    	src/Symfony/Bundle/SwiftmailerBundle/LICENSE
    	src/Symfony/Component/Filesystem/LICENSE
    	src/Symfony/Component/HttpFoundation/Response.php
    	src/Symfony/Component/HttpKernel/Kernel.php
    fabpot committed Jan 4, 2013
  2. @fabpot

    updated license year

    fabpot committed Jan 4, 2013
  3. @fabpot

    updated license year

    fabpot committed Jan 4, 2013
Commits on Dec 19, 2012
  1. @dlsniper @fabpot
Commits on Dec 11, 2012
  1. @fabpot

    fixed CS

    fabpot committed Dec 11, 2012
Commits on Dec 6, 2012
  1. @hason
Commits on Nov 19, 2012
  1. @fabpot

    merged branch raziel057/COMPONENT_Form (PR #5888)

    This PR was squashed before being merged into the master branch (closes #5888).
    
    Commits
    -------
    
    2379d86 CS Fixes - Replaced "array of type" by "Type[]" in PHPDoc block
    
    Discussion
    ----------
    
    CS Fixes - Replaced "array of type" by "Type[]" in PHPDoc block
    
    Bug fix: no
    Feature addition: no
    Backwards compatibility break: no
    Symfony2 tests pass: no (but tests doesn't pass on master too). See Travis.
    License of the code: MIT
    Documentation PR: Not Applicable
    Status: Finished
    
    To improve support of the eclipse PDT pluggin (for autocompletion), I propose to change the array notation in PHPDoc blocks to match the phpDocumentor notation for "array of type".
    
    Modifications are made for the following components:
    - BrowserKit
    - ClassLoader
    - Config
    - Console
    - CssSelector
    - DependencyInjection
    - DomCrawler
    - EventDispatcher (no changes)
    - Filesystem (no changes)
    - Finder
    - Form
    - HttpFoundation
    - HttpKernel
    - Locale
    - OptionResolver (no changes)
    - Process (no changes)
    - Routing (no changes)
    - Serializer (no changes)
    - Templating
    - Translation
    - Validator
    - Yaml (no changes)
    - Security
    - Stopwatch (no changes)
    
    See Proposal symfony/symfony#5852
    
    ---------------------------------------------------------------------------
    
    by pborreli at 2012-11-01T15:19:27Z
    
    will you make a PR for each component ? why not only one PR with one commit for each component instead ?
    
    ---------------------------------------------------------------------------
    
    by raziel057 at 2012-11-01T15:32:39Z
    
    Ok, I'm going try to do it.
    
    ---------------------------------------------------------------------------
    
    by raziel057 at 2012-11-01T16:12:56Z
    
    I would like to rename my branch from COMPONENT_Form to changes-phpdoc (as all modifications would be commited in only one branch), so I tried to execute the following command but I have an error.
    
    git remote rename COMPONENT_Form changes-phpdoc
    error: Could not rename config section 'remote.COMPONENT_Form' to 'remote.changes-phpdoc'
    
    Do you know how to do it?
    
    ---------------------------------------------------------------------------
    
    by pborreli at 2012-11-01T16:14:26Z
    
    don't rename it, you will have to close and make another PR which is useless here, just edit the title.
    
    ---------------------------------------------------------------------------
    
    by stof at 2012-11-01T16:16:17Z
    
    and ``git remote rename`` is about renaming a remote repo, not a branch
    
    ---------------------------------------------------------------------------
    
    by raziel057 at 2012-11-03T11:36:02Z
    
    Is it normal that all my commit are duplicated? I would like just update my master and merge with my branch.
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2012-11-06T10:22:55Z
    
    @raziel057 Can you rebase on master? That should fix your problem.
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2012-11-09T13:28:53Z
    
    @raziel057 Can you finish this PR?
    
    ---------------------------------------------------------------------------
    
    by Tobion at 2012-11-09T13:34:45Z
    
    I'll do it for the routing component this evening because I know it by heart. ^^
    
    ---------------------------------------------------------------------------
    
    by raziel057 at 2012-11-09T15:06:26Z
    
    @Tobion ok Thanks!
    
    @fabpot Yes, I will try to finish it this week end.
    
    ---------------------------------------------------------------------------
    
    by raziel057 at 2012-11-11T13:04:07Z
    
    @Tobion Did you already change PHPDoc in the Routing component?
    
    ---------------------------------------------------------------------------
    
    by Tobion at 2012-11-11T15:21:18Z
    
    @raziel057 Yes I'm working on it.
    
    ---------------------------------------------------------------------------
    
    by Tobion at 2012-11-12T15:16:31Z
    
    @raziel057 Done. See #5994
    fabpot committed Nov 19, 2012
  2. @raziel057 @fabpot
Commits on Nov 13, 2012
  1. @fabpot

    Merge branch '2.1'

    * 2.1: (24 commits)
      forced Travis to use source to workaround their not-up-to-date Composer on PHP 5.3.3
      [Routing] removed irrelevant string cast in Route
      Fixed typo
      Make YamlFileLoader and XmlFileLoader file loading extensible
      [HttpKernel] fix typo
      Fixed singularization of "prices"
      [Form] Removed an exception that prevented valid formats from being passed, e.g. "h" for the hour, "L" for the month etc.
      [HttpKernel] fixed Client when using StreamedResponses (closes #5370)
      fixed PDO session handler for Oracle (closes #5829)
      [HttpFoundation] fixed PDO session handler for Oracle (closes #5829)
      [Locale] removed a check that is done too early (and it is done twice anyways)
      Update src/Symfony/Component/Validator/Resources/translations/validators.fa.xlf
      Adding new localized strings for farsi validation.
      [HttpFoundation] moved the HTTP protocol check from StreamedResponse to Response (closes #5937)
      [Form] Fixed forms not to be marked invalid if their children are already marked invalid
      [Form] Excluded some tests in NumberToLocalizedStringTransformerTest which fail on ICU 4.4, but work on ICU 4.8
      added missing tests from previous merge
      [Form] Fixed NumberToLocalizedStringTransformer to accept both comma and dot as decimal separator, if possible
      Fix export-ignore on Windows
      Show correct class name InputArgument in error message
      ...
    
    Conflicts:
    	.travis.yml
    	src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php
    fabpot committed Nov 13, 2012
Commits on Nov 10, 2012
  1. @dlsniper

    Removed duplicate line

    dlsniper committed Nov 10, 2012
Commits on Nov 9, 2012
  1. @fabpot