Permalink
Commits on Sep 27, 2014
  1. Merge branch '2.3' into 2.4

    fabpot committed Sep 27, 2014
    * 2.3:
      Make Doctrine's dependency injection test less fragile.
      [Finder] [Iterator] Make the tests less fragile
      [Form][DateTime] Propagate invalid_message & invalid_message parameters to date & time sub widgets
Commits on Sep 26, 2014
Commits on Sep 23, 2014
  1. Merge branch '2.3' into 2.4

    fabpot committed Sep 23, 2014
    * 2.3:
      typo fixed in AbstractProcessTest (getoutput() => getOutput())
      Avoid question mark and asterisk in folder names to prevent windows filesystem issues.
      [Translation] [Config] Clear libxml errors after parsing XML file
    
    Conflicts:
    	src/Symfony/Component/Config/Util/XmlUtils.php
  2. Avoid question mark and asterisk in folder names to prevent windows f…

    Adam
    Adam committed Sep 23, 2014
    …ilesystem issues.
    
    A previous commit introduced a folder with a question mark and an asterisk which are invalid NTFS folder name characters and prevented checkout on those systems.
Commits on Sep 22, 2014
  1. Merge branch '2.3' into 2.4

    fabpot committed Sep 22, 2014
    * 2.3:
      [2.3] Add missing development dependencies
      Fix @return docs on HttpCache::restoreResponseBody()
      [Finder] Escape location for regex searches
      Make sure HttpCache is a trusted proxy
    
    Conflicts:
    	src/Symfony/Bridge/Doctrine/composer.json
    	src/Symfony/Bundle/FrameworkBundle/composer.json
    	src/Symfony/Bundle/SecurityBundle/composer.json
    	src/Symfony/Component/Form/composer.json
  2. bug #11970 [Finder] Escape location for regex searches (ymc-dabe)

    fabpot committed Sep 22, 2014
    This PR was squashed before being merged into the 2.3 branch (closes #11970).
    
    Discussion
    ----------
    
    [Finder] Escape location for regex searches
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | -
    | License       | MIT
    | Doc PR        | -
    
    If the location to start searching in contains a regex special char
    like + or ? and the path restriction is a regular expresion with a start
    limitation. No results will be found wtih at least GnuFindAdapter - e.g.:
    ```
    use Symfony\Component\Finder\Finder;
    use Symfony\Component\Finder\Adapter;
    
    mkdir('/tmp/reg+ex/dir/subdir', 0777, true);
    
    $finder = Finder::create()
        ->removeAdapters()
        ->addAdapter(new Adapter\GnuFindAdapter());
    $finder->in('/tmp/reg+ex')->path('/^dir/');
    
    print count($finder)."\n";
    ```
    
    Expected result: 2
    Actual result is: 0
    
    This pull request consists of:
    * a new test checking for this bug (0e81086a49425d0e12cff4f479fabeb97e9ed757)
    * the actual fix (6595b6b2b71afc57ef08686b4584713c0e4e48ed)
    * changes to comply with the coding standard (7f199c5b53b3c1f38b36dcc286d3b20ae877425b)
    
    ## How to reproduce
    ### Fastest way
    1. Move or copy your local symfony clone into a location containing special regex chars:
      * `mv symfony symfony+regex`
    2. Run tests in there
      * `cd symfony+regex && phpunit`
    
    > Result: Some tests in the finder component will fail.
    
    ### Alternative: A new clone
    1. Clone symfony in a directory containing at least one regex special char
      * `git clone https://github.com/symfony/symfony.git /tmp/symfony+regexchar`
    2. As usual get composer, install dependencies and get phpunit
      * You might simply want to follow [this guide](http://symfony.com/doc/current/contributing/code/tests.html)
    3. Run tests in there
       * `cd /tmp/symfony+regexchar && phpunit`
    
    > Result: Some tests in the finder component will fail.
    
    ### Alternative: Apply the new test
    1. Apply commit a29d1207ced2949c918357cf271200523960caef to your symfony clone
    2. Run tests
    
    > Result: The new test will fail.
    
    Commits
    -------
    
    b63926b [Finder] Escape location for regex searches
  3. Merge branch '2.3' into 2.4

    fabpot committed Sep 22, 2014
    * 2.3:
      fixed CS
      [Process] fixed some volatile tests
      [HttpKernel] fixed a volatile test
      [HttpFoundation] fixed some volatile tests
      Use getPathname() instead of string casting to get BinaryFileReponse file path
    
    Conflicts:
    	src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php
    	src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
    	src/Symfony/Bundle/FrameworkBundle/EventListener/SessionListener.php
    	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
    	src/Symfony/Component/ClassLoader/Tests/ApcUniversalClassLoaderTest.php
    	src/Symfony/Component/Config/Definition/ReferenceDumper.php
    	src/Symfony/Component/Config/Tests/Definition/Dumper/YamlReferenceDumperTest.php
    	src/Symfony/Component/Console/Application.php
    	src/Symfony/Component/Console/Tests/ApplicationTest.php
    	src/Symfony/Component/Filesystem/Exception/IOException.php
    	src/Symfony/Component/Form/Extension/Templating/TemplatingExtension.php
    	src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php
    	src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
    	src/Symfony/Component/HttpKernel/Tests/Bundle/BundleTest.php
    	src/Symfony/Component/HttpKernel/Tests/Fragment/RoutableFragmentRendererTest.php
    	src/Symfony/Component/HttpKernel/Tests/Profiler/Mock/RedisMock.php
    	src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
    	src/Symfony/Component/PropertyAccess/PropertyAccessor.php
    	src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTest.php
    	src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
    	src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php
    	src/Symfony/Component/Routing/Tests/Annotation/RouteTest.php
    	src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php
    	src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
    	src/Symfony/Component/Validator/Constraints/CollectionValidator.php
    	src/Symfony/Component/Validator/Tests/ExecutionContextTest.php
  4. fixed CS

    fabpot committed Sep 21, 2014
Commits on Sep 3, 2014
  1. Merge branch '2.3' into 2.4

    fabpot committed Sep 3, 2014
    * 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. [Finder] Fix findertest readability

    1emming authored and fabpot committed Aug 10, 2014
Commits on Aug 14, 2014
  1. Merge branch '2.3' into 2.4

    webmozart committed Aug 14, 2014
    * 2.3:
      [Validator] Backported constraint validator tests from 2.5
      Fix toolbar vertical alignment.
      [HttpFoundation] MongoDbSessionHandler supports auto expiry via configurable expiry_field
      [FrameworkBundle] add missing attribute to XSD
      Allow basic auth in url. Improve regex. Add tests.
      fix typos and syntax in Profiler controller method comments
      remove volatile tests
      [Console] fixed style creation when providing an unknown tag option
      [Validator] Convert objects to string in comparison validators. Reapplies 6cf5e0812e6f20d60acbc0324abf96475e89b6ef
      [HttpFoundation] Update QUERY_STRING when overrideGlobals
    
    Conflicts:
    	src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueValidatorTest.php
    	src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
    	src/Symfony/Component/Validator/Constraints/AllValidator.php
    	src/Symfony/Component/Validator/Constraints/CollectionValidator.php
    	src/Symfony/Component/Validator/Tests/Constraints/AbstractComparisonValidatorTestCase.php
    	src/Symfony/Component/Validator/Tests/Constraints/CallbackValidatorTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/EqualToValidatorTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/GreaterThanValidatorTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/IdenticalToValidatorTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/ImageValidatorTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/LessThanOrEqualValidatorTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/LessThanValidatorTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/NotEqualToValidatorTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/NotIdenticalToValidatorTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/UrlValidatorTest.php
Commits on Aug 8, 2014
  1. Merge branch '2.3' into 2.4

    fabpot committed Aug 8, 2014
    * 2.3:
      [HttpKernel] added an analyze of environment parameters for built-in server.
      change command to which available under most unix systems
      add way to test command under windows
      fix shell command injection
      [Form] allowed CallbackTransformer to use callable
      [Process] Added process synchronization to the incremental output tests
  2. remove volatile tests

    xabbuh committed Aug 7, 2014
    Some tests relying on timings and external network resources were not
    reliable and occasionally made builds on Travis fail.
Commits on Aug 7, 2014
  1. change command to which available under most unix systems

    gimler committed Aug 7, 2014
    agree i will change it which is available under suse, ubuntu, debian, fedora, bsd
  2. fix shell command injection

    gimler committed Aug 7, 2014
Commits on Jul 28, 2014
  1. Merge branch '2.3' into 2.4

    fabpot committed Jul 28, 2014
    * 2.3:
      Update validators.eu.xlf
      fixed CS
      remove unused imports
      Unify null comparisons
      [EventDispatcher] don't count empty listeners
      [Process] Fix unit tests in sigchild environment
      [Process] fix signal handling in wait()
      [BrowserKit] refactor code and fix unquoted regex
      Fixed server HTTP_HOST port uri conversion
      Bring code into standard
      [Process] Add test to verify fix for issue #11421
      [Process] Fixes issue #11421
      [DependencyInjection] Pass a Scope instance instead of a scope name.
    
    Conflicts:
    	src/Symfony/Component/EventDispatcher/Tests/EventDispatcherTest.php
Commits on Jul 27, 2014
  1. minor #11484 remove unused imports (xabbuh)

    fabpot committed Jul 27, 2014
    This PR was merged into the 2.3 branch.
    
    Discussion
    ----------
    
    remove unused imports
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets |
    | License       | MIT
    | Doc PR        |
    
    Commits
    -------
    
    9cd059e remove unused imports
Commits on Jul 26, 2014
  1. remove unused imports

    xabbuh committed Jul 26, 2014
  2. Unify null comparisons

    wouterj committed Jul 26, 2014
Commits on Jul 15, 2014
  1. Merge branch '2.3' into 2.4

    fabpot committed Jul 15, 2014
    * 2.3:
      Validate locales sets intos translator
      Fix UserPassword validator translation
      Remove Spaceless Blocks from Twig Form Templates
      fixed typo
      [HttpFoundation] Fix to prevent magic bytes injection in JSONP responses (Prevents CVE-2014-4671)
      added regression test
      fix issue #8171 on configuration tree for twig extension -- pairing up with @cordoval
      [HttpFoundation] Fix wrong assertion in Response test
      [Upgrade] Fixed markdown syntax
      [2.3][Form] Cleanup & fix phpdocs
    
    Conflicts:
    	src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
    	src/Symfony/Component/Form/Extension/Core/ChoiceList/SimpleChoiceList.php
    	src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php
Commits on Jul 10, 2014
  1. added regression test

    cordoval authored and stof committed Dec 22, 2013
Commits on Jul 9, 2014
  1. Merge branch '2.3' into 2.4

    fabpot committed Jul 9, 2014
    * 2.3:
      fixed CS
      [HttpFoundation] Remove content-related headers if content is empty
      removed defaults from PHPUnit configuration
Commits on Jul 8, 2014
  1. Merge branch '2.3' into 2.4

    fabpot committed Jul 8, 2014
    * 2.3:
      bumped Symfony version to 2.3.18
      updated VERSION for 2.3.17
      update CONTRIBUTORS for 2.3.17
      updated CHANGELOG for 2.3.17
      added XSD to PHPUnit configuration
      bug #11319 [HttpKernel] Ensure the storage exists before purging it in ProfilerTest
      [Translation] Added unescaping of ids in PoFileLoader
      updated italian translation for validation messages
      [DomCrawler] Fix docblocks and formatting.
      [DomCrawler] Remove the query string and the anchor of the uri of a link
      Simplified the Travis test command
      [Console] Make sure formatter is the same
    
    Conflicts:
    	src/Symfony/Component/HttpKernel/Kernel.php
Commits on Jul 7, 2014
  1. added XSD to PHPUnit configuration

    craue authored and fabpot committed Jul 6, 2014
Commits on Jun 20, 2014
  1. Merge branch '2.3' into 2.4

    fabpot committed Jun 20, 2014
    * 2.3:
      Added missing `break` statement
      don't disable constructor calls to mockups of classes that extend internal PHP classes
      Small comment update according to PSR-2
      [Console] Fixed notice in DialogHelper
      [HttpFoundation] Fixed Request::getPort returns incorrect value under IPv6
      [Filesystem] Fix test suite on OSX
      Add framework-bundle
    
    Conflicts:
    	src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
    	src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
  2. Added missing `break` statement

    apfelbox authored and fabpot committed Jun 20, 2014
    Added missing `break` statement in `AbstractFindAdapter` - a fall through doesn't seem to be intended here.
Commits on May 22, 2014
  1. Merge branch '2.3' into 2.4

    fabpot committed May 22, 2014
    * 2.3:
      [WIP][Finder] Fix wrong implementation on sortable callback comparator
      ommited space
      [Validator] Fixed StaticMethodLoader on systems that don't have E_STRICT enabled by default
      Include file path in exception
      [Process] Add validation on Process input
Commits on May 12, 2014
  1. Merge branch '2.3' into 2.4

    fabpot committed May 12, 2014
    * 2.3:
      [Console]Improve formatter for double-width character
      Lower mbstring dep, remove it for Yaml and CssSelector components
      [Security] Add check for supported attributes in AclVoter
      [Form] Fixed TrimListenerTest as of PHP 5.5
      Added more IDE links
      [DependencyInjection] Fix parameter description in ConfigurationExtensionInterface
      [Finder] fixed typehint of the Finder::addAdapter() method
      [TwigBridge][Transchoice] set %count% from the current context.
      [DependencyInjection] Fix travis unit tests
      Update PHPUnit before run
      [Validator] fixed wrong test
      [WebProfilerBundle] added test case for #10773
      [WebProfilerBundle] fixed profiler homepage, fixed #10806
      [WebProfilerBundle] Added test case for #10806
      changed travis to run on the nightly builds of HHVM until everything gets stable
      Fixed issue #5427
      Allow URLs that don't contain a path
    
    Conflicts:
    	.travis.yml
Commits on May 1, 2014
Commits on Apr 27, 2014
  1. Merge branch '2.3' into 2.4

    fabpot committed Apr 27, 2014
    * 2.3:
      bumped Symfony version to 2.3.14
      updated VERSION for 2.3.13
      update CONTRIBUTORS for 2.3.13
      updated CHANGELOG for 2.3.13
      [Console] Fixed the rendering of exceptions on HHVM with a terminal width
      [WebProfilerBundle ] Fixed an edge case on WDT loading
      fixed typo
      [Process] Disable TTY mode on Windows platform
      [Validator] added missing ANNOTATION config to @Target annotation
      [Finder] Fix ignoring of unreadable dirs in the RecursiveDirectoryIterator.
    
    Conflicts:
    	src/Symfony/Component/HttpKernel/Kernel.php
    	src/Symfony/Component/Validator/Constraints/Callback.php
Commits on Apr 23, 2014