Skip to content

Commit

Permalink
Merge branch '5.3' into 5.4
Browse files Browse the repository at this point in the history
* 5.3:
  Fix skip condition for INTL
  [Messenger] Fix `ErrorDetailsStamp` denormalization
  [Translation] Extract translatable content on twig set
  Simplify code
  Fix composer.json versions
  Fix composer.json versions
  Remove redundant license info
  [HttpFoundation] Fix isNotModified determination logic
  Fix Url Validator false positives
  [Translation] Reverse fallback locales
  [FrameworkBundle] Fall back to default configuration in debug:config and consistently resolve parameter values
  notifier smsapi - fixed checking whether message is sent
  allow null for framework.translator.default_path
  improve failure messages of the CrawlerSelectorTextContains constraint
  • Loading branch information
nicolas-grekas committed Aug 26, 2021
2 parents 2342deb + 8d22439 commit fa2c5cc
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 6 deletions.
12 changes: 8 additions & 4 deletions Tests/AbstractAsciiTestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,13 @@ public function testCreateFromEmptyString()

/**
* @dataProvider provideBytesAt
*
* @requires extension intl 66.2
*/
public function testBytesAt(array $expected, string $string, int $offset, int $form = null)
{
if (2 !== grapheme_strlen('च्छे') && 'नमस्ते' === $string) {
$this->markTestSkipped('Skipping due to issue ICU-21661.');
}

$instance = static::createFromString($string);
$instance = $form ? $instance->normalize($form) : $instance;

Expand Down Expand Up @@ -159,11 +161,13 @@ public static function provideWrap(): array

/**
* @dataProvider provideLength
*
* @requires extension intl 66.2
*/
public function testLength(int $length, string $string)
{
if (2 !== grapheme_strlen('च्छे') && 'अनुच्छेद' === $string) {
$this->markTestSkipped('Skipping due to issue ICU-21661.');
}

$instance = static::createFromString($string);

$this->assertSame($length, $instance->length());
Expand Down
6 changes: 4 additions & 2 deletions Tests/AbstractUnicodeTestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,13 @@ public static function provideBytesAt(): array

/**
* @dataProvider provideCodePointsAt
*
* @requires extension intl 66.2
*/
public function testCodePointsAt(array $expected, string $string, int $offset, int $form = null)
{
if (2 !== grapheme_strlen('च्छे') && 'नमस्ते' === $string) {
$this->markTestSkipped('Skipping due to issue ICU-21661.');
}

$instance = static::createFromString($string);
$instance = $form ? $instance->normalize($form) : $instance;

Expand Down

0 comments on commit fa2c5cc

Please sign in to comment.