8000 Merge branch '2.3' into 2.4 · symfony/symfony@054f1b5 · GitHub
[go: up one dir, main page]
Skip to content

Commit 054f1b5

Browse files
webmozartwebmozart
committed
Merge branch '2.3' into 2.4
* 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 6cf5e08 [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
2 parents 05c3314 + 0ecb34f commit 054f1b5

File tree

74 files changed

+2140
-2280
lines changed
  • Tests/DependencyInjection
  • WebProfilerBundle
  • Component
  • NotIdenticalToValidatorTest.php
  • NotNullValidatorTest.php
  • NullValidatorTest.php
  • RangeValidatorTest.php
  • RegexValidatorTest.php
  • TimeValidatorTest.php
  • TrueValidatorTest.php
  • TypeValidatorTest.php
  • UrlValidatorTest.php
  • Fixtures

    • Some content is hidden

    Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

    74 files changed

    +2140
    -2280
    lines changed

    ‎src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php

    Lines changed: 414 additions & 0 deletions
    Large diffs are not rendered by default.

    ‎src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueValidatorTest.php

    Lines changed: 0 additions & 424 deletions
    This file was deleted.

    ‎src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -113,6 +113,7 @@
    113113
    <xsd:attribute name="assets-version" type="xsd:string" />
    114114
    <xsd:attribute name="assets-version-format" type="xsd:string" />
    115115
    <xsd:attribute name="cache" type="xsd:string" />
    116+
    <xsd:attribute name="hinclude-default-template" type="xsd:string" />
    116117
    </xsd:complexType>
    117118

    118119
    <xsd:complexType name="form-resources">

    ‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/full.php

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -56,6 +56,7 @@
    5656
    'form' => array(
    5757
    'resources' => array('theme1', 'theme2')
    5858
    ),
    59+
    'hinclude_default_template' => 'global_hinclude_template',
    5960
    ),
    6061
    'translator' => array(
    6162
    'enabled' => true,

    ‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/full.xml

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -13,7 +13,7 @@
    1313
    <framework:profiler only-exceptions="true" enabled="false" />
    1414
    <framework:router resource="%kernel.root_dir%/config/routing.xml" type="xml" />
    1515
    <framework:session gc-maxlifetime="90000" gc-probability="1" gc-divisor="108" storage-id="session.storage.native" handler-id="session.handler.native_file" name="_SYMFONY" cookie-lifetime="86400" cookie-path="/" cookie-domain="example.com" cookie-secure="true" cookie-httponly="true" save-path="/path/to/sessions" />
    16-
    <framework:templating assets-version="SomeVersionScheme" cache="/path/to/cache" >
    16+
    <framework:templating assets-version="SomeVersionScheme" cache="/path/to/cache" hinclude-default-template="global_hinclude_template">
    1717
    <framework:loader>loader.foo</framework:loader>
    1818
    <framework:loader>loader.bar</framework:loader>
    1919
    <framework:engine>php</framework:engine>

    ‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/full.yml

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -44,6 +44,7 @@ framework:
    4444
    base_urls: ["http://images1.example.com", "http://images2.example.com"]
    4545
    form:
    4646
    resources: [theme1, theme2]
    47+
    hinclude_default_template: global_hinclude_template
    4748
    translator:
    4849
    enabled: true
    4950
    fallback: fr

    ‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -180,6 +180,7 @@ public function testTemplating()
    180180
    $this->assertEquals(array('php', 'twig'), $container->getParameter('templating.engines'), '->registerTemplatingConfiguration() sets a templating.engines parameter');
    181181

    182182
    $this->assertEquals(array('FrameworkBundle:Form', 'theme1', 'theme2'), $container->getParameter('templating.helper.form.resources'), '->registerTemplatingConfiguration() registers the theme and adds the base theme');
    183+
    $this->assertEquals('global_hinclude_template', $container->getParameter('fragment.renderer.hinclude.global_template'), '->registerTemplatingConfiguration() registers the global hinclude.js template');
    183184
    }
    184185

    185186
    public function testTemplatingAssetsHelperScopeDependsOnPackageArgumentScopes()

    ‎src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php

    Lines changed: 2 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -310,7 +310,7 @@ public function searchBarAction(Request $request)
    310310
    }
    311311

    312312
    /**
    313-
    * Search results.
    313+
    * Renders the search results.
    314314
    *
    315315
    * @param Request $request The current HTTP Request
    316316
    * @param string $token The token
    @@ -351,7 +351,7 @@ public function searchResultsAction(Request $request, $token)
    351351
    }
    352352

    353353
    /**
    354-
    * Narrow the search bar.
    354+
    * Narrows the search bar.
    355355
    *
    356356
    * @param Request $request The current HTTP Request
    357357
    *

    ‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -22,6 +22,7 @@
    2222
    -webkit-box-sizing: content-box;
    2323
    -moz-box-sizing: content-box;
    2424
    box-sizing: content-box;
    25+
    vertical-align: baseline;
    2526
    }
    2627

    2728
    .sf-toolbarreset {

    ‎src/Symfony/Component/Console/Formatter/OutputFormatter.php

    Lines changed: 5 additions & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -215,7 +215,11 @@ private function createStyleFromString($string)
    215215
    } elseif ('bg' == $match[0]) {
    216216
    $style->setBackground($match[1]);
    217217
    } else {
    218-
    $style->setOption($match[1]);
    218+
    try {
    219+
    $style->setOption($match[1]);
    220+
    } catch (\InvalidArgumentException $e) {
    221+
    return false;
    222+
    }
    219223
    }
    220224
    }
    221225

    ‎src/Symfony/Component/Console/Tests/Formatter/OutputFormatterTest.php

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -151,7 +151,7 @@ public function testNonStyleTag()
    151151
    {
    152152
    $formatter = new OutputFormatter(true);
    153153

    154-
    $this->assertEquals("\033[32msome \033[0m\033[32m<tag>\033[0m\033[32m styled \033[0m\033[32m<p>\033[0m\033[32msingle-char tag\033[0m\033[32m</p>\033[0m", $formatter->format('<info>some <tag> styled <p>single-char tag</p></info>'));
    154+
    $this->assertEquals("\033[32msome \033[0m\033[32m<tag>\033[0m\033[32m \033[0m\033[32m<setting=value>\033[0m\033[32m styled \033[0m\033[32m<p>\033[0m\033[32msingle-char tag\033[0m\033[32m</p>\033[0m", $formatter->format('<info>some <tag> <setting=value> styled <p>single-char tag</p></info>'));
    155155
    }
    156156

    157157
    public function testFormatLongString()

    ‎src/Symfony/Component/Finder/Tests/FinderTest.php

    Lines c D287 hanged: 0 additions & 21 deletions
    Original file line numberDiff line numberDiff line change
    @@ -820,25 +820,4 @@ public function testMultipleLocationsWithSubDirectories()
    820820
    $this->assertIterator($expected, $finder);
    821821
    $this->assertIteratorInForeach($expected, $finder);
    822822
    }
    823-
    824-
    public function testNonSeekableStream()
    825-
    {
    826-
    if (!in_array('ftp', stream_get_wrappers())) {
    827-
    $this->markTestSkipped(sprintf('Unavailable stream "%s".', 'ftp'));
    828-
    }
    829-
    830-
    try {
    831-
    $i = Finder::create()->in('ftp://ftp.mozilla.org/')->depth(0)->getIterator();
    832-
    } catch (\UnexpectedValueException $e) {
    833-
    $this->markTestSkipped(sprintf('Unsupported stream "%s".', 'ftp'));
    834-
    }
    835-
    836-
    $contains = array(
    837-
    'ftp://ftp.mozilla.org'.DIRECTORY_SEPARATOR.'README',
    838-
    'ftp://ftp.mozilla.org'.DIRECTORY_SEPARATOR.'index.html',
    839-
    'ftp://ftp.mozilla.org'.DIRECTORY_SEPARATOR.'pub',
    840-
    );
    841-
    842-
    $this->assertIteratorInForeach($contains, $i);
    843-
    }
    844823
    }

    0 commit comments

    Comments
     (0)
    0