8000 minor #17639 [appveyor] Fix failure reporting (nicolas-grekas) · symfony/symfony@de6e3c8 · GitHub
[go: up one dir, main page]
Skip to content

Commit de6e3c8

Browse files
nicolas-grekasnicolas-grekas
committed
minor #17639 [appveyor] Fix failure reporting (nicolas-grekas)
This PR was merged into the 2.3 branch. Discussion ---------- [appveyor] Fix failure reporting | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #17464 | License | MIT | Doc PR | - Status: needs work Commits ------- b58f483 [appveyor] Fix failure reporting
2 parents 445eb03 + b58f483 commit de6e3c8

File tree

5 files changed

+18
-5
lines changed

5 files changed

+18
-5
lines changed

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ install:
5252
- if [[ $deps != skip ]]; then COMPONENTS=$(find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist -printf '%h\n'); fi;
5353
- if [[ $deps != skip && $deps ]]; then php .travis.php $TRAVIS_COMMIT_RANGE $TRAVIS_BRANCH $COMPONENTS; fi;
5454
- if [[ $deps = high && $TRAVIS_BRANCH = master ]]; then SYMFONY_VERSION=$(git ls-remote --heads | grep -o '/[1-9].*' | tail -n 1 | sed s/.//); else SYMFONY_VERSION=$(cat composer.json | grep '^ *"dev-master". *"[1-9]' | grep -o '[0-9.]*'); fi;
55-
- if [[ $deps = high && $TRAVIS_BRANCH = master ]]; then git fetch origin $SYMFONY_VERSION; git checkout -m FETCH_HEAD; fi;
55+
- if [[ $deps = high && $TRAVIS_BRANCH = master ]]; then git fetch origin $SYMFONY_VERSION; git checkout -m FETCH_HEAD; COMPONENTS=$(find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist -printf '%h\n'); fi;
5656
- if [[ $deps = high && ${SYMFONY_VERSION%.*} != $(git show $(git ls-remote --heads | grep -FA1 /$SYMFONY_VERSION | tail -n 1):composer.json | grep '^ *"dev-master". *"[1-9]' | grep -o '[0-9]*' | head -n 1) ]]; then LEGACY=,legacy; fi;
5757
- export COMPOSER_ROOT_VERSION=$SYMFONY_VERSION.x-dev;
5858
- if [[ ! $deps ]]; then composer update --prefer-dist; else export SYMFONY_DEPRECATIONS_HELPER=weak; fi;

‎appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ init:
1414
- SET PHP=1
1515
- SET ANSICON=121x90 (121x90)
1616
- SET SYMFONY_PHPUNIT_SKIPPED_TESTS=phpunit.skipped
17+
- REG ADD "HKEY_CURRENT_USER\Software\Microsoft\Command Processor" /v DelayedExpansion /t REG_DWORD /d 1 /f
1718

1819
install:
1920
- IF EXIST c:\php (SET PHP=0) ELSE (mkdir c:\php)
@@ -57,7 +58,6 @@ install:
5758

5859
test_script:
5960
- cd c:\projects\symfony
60-
- Setlocal EnableDelayedExpansion
6161
- SET X=0
6262
- copy /Y c:\php\php.ini-min c:\php\php.ini
6363
- php phpunit symfony --exclude-group benchmark,intl-data || SET X=!errorlevel!

‎src/Symfony/Component/Security/Tests/Http/RememberMe/PersistentTokenBasedRememberMeServicesTest.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,15 @@
2424

2525
class PersistentTokenBasedRememberMeServicesTest extends \PHPUnit_Framework_TestCase
2626
{
27+
public static function setUpBeforeClass()
28+
{
29+
try {
30+
random_bytes(1);
31+
} catch (\Exception $e) {
32+
throw new \PHPUnit_Framework_SkippedTestError($e->getMessage());
33+
}
34+
}
35+
2736
public function testAutoLoginReturnsNullWhenNoCookie()
2837
{
2938
$service = $this->getService(null, array('name' => 'foo'));

‎src/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@ public function supportsNormalization($data, $format = null)
5959
*/
6060
public function supportsDenormalization($data, $type, $format = null)
6161
{
62+
if (PHP_VERSION_ID < 50307) {
63+
return class_exists($type) && in_array('Symfony\Component\Serializer\Normalizer\DenormalizableInterface', class_implements($type), true);
64+
}
65+
6266
return is_subclass_of($type, 'Symfony\Component\Serializer\Normalizer\DenormalizableInterface');
6367
}
6468
}

‎src/Symfony/Component/Translation/Tests/TranslatorTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -255,12 +255,12 @@ public function testFallbackCatalogueResources()
255255

256256
$resources = $catalogues['en']->getResources();
257257
$this->assertCount(1, $resources);
258-
$this->assertContains( __DIR__.'/fixtures/resources.yml', $resources);
258+
$this->assertContains( __DIR__.DIRECTORY_SEPARATOR.'fixtures'.DIRECTORY_SEPARATOR.'resources.yml', $resources);
259259

260260
$resources = $catalogues['en_GB']->getResources();
261261
$this->assertCount(2, $resources);
262-
$this->assertContains( __DIR__.'/fixtures/empty.yml', $resources);
263-
$this->assertContains( __DIR__.'/fixtures/resources.yml', $resources);
262+
$this->assertContains( __DIR__.DIRECTORY_SEPARATOR.'fixtures'.DIRECTORY_SEPARATOR.'empty.yml', $resources);
263+
$this->assertContains( __DIR__.DIRECTORY_SEPARATOR.'fixtures'.DIRECTORY_SEPARATOR.'resources.yml', $resources);
264264
}
265265

266266
/**

0 commit comments

Comments
 (0)
0