Skip to content

Commit cb07f63

Browse files
Merge branch '2.7' into 2.8
* 2.7: [tests] Use @requires annotation when possible [tests] Use @requires annotation when possible [ci] Enable collecting and replaying skipped tests [Process] Workaround buggy PHP warning [Console] Add additional ways to detect OS400 platform [Yaml] Allow tabs before comments at the end of a line Added more tests for PropertyAccess Conflicts: .travis.yml src/Symfony/Bridge/Doctrine/composer.json src/Symfony/Bridge/Monolog/composer.json src/Symfony/Bridge/ProxyManager/composer.json src/Symfony/Bridge/Swiftmailer/composer.json src/Symfony/Bridge/Twig/composer.json src/Symfony/Bundle/DebugBundle/composer.json src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Bundle/SecurityBundle/composer.json src/Symfony/Bundle/TwigBundle/composer.json src/Symfony/Bundle/WebProfilerBundle/composer.json src/Symfony/Component/Asset/composer.json src/Symfony/Component/BrowserKit/composer.json src/Symfony/Component/ClassLoader/composer.json src/Symfony/Component/Config/composer.json src/Symfony/Component/Console/composer.json src/Symfony/Component/CssSelector/composer.json src/Symfony/Component/Debug/composer.json src/Symfony/Component/DependencyInjection/composer.json src/Symfony/Component/DomCrawler/composer.json src/Symfony/Component/EventDispatcher/composer.json src/Symfony/Component/ExpressionLanguage/composer.json src/Symfony/Component/Filesystem/composer.json src/Symfony/Component/Finder/composer.json src/Symfony/Component/Form/composer.json src/Symfony/Component/HttpFoundation/composer.json src/Symfony/Component/HttpKernel/composer.json src/Symfony/Component/Intl/composer.json src/Symfony/Component/Locale/composer.json src/Symfony/Component/OptionsResolver/composer.json src/Symfony/Component/Process/composer.json src/Symfony/Component/PropertyAccess/composer.json src/Symfony/Component/Routing/composer.json src/Symfony/Component/Security/Acl/composer.json src/Symfony/Component/Security/Core/composer.json src/Symfony/Component/Security/Csrf/composer.json src/Symfony/Component/Security/Http/composer.json src/Symfony/Component/Security/composer.json src/Symfony/Component/Serializer/composer.json src/Symfony/Component/Stopwatch/composer.json src/Symfony/Component/Templating/composer.json src/Symfony/Component/Translation/Tests/Dumper/IcuResFileDumperTest.php src/Symfony/Component/Translation/composer.json src/Symfony/Component/Validator/composer.json src/Symfony/Component/VarDumper/composer.json src/Symfony/Component/Yaml/composer.json
2 parents 14d3093 + d1180b6 commit cb07f63

File tree

4 files changed

+14
-7
lines changed

4 files changed

+14
-7
lines changed

Tests/Normalizer/GetSetMethodNormalizerTest.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -207,11 +207,13 @@ public function testConstructorDenormalizeWithMissingOptionalArgument()
207207
$this->assertEquals(array(1, 2, 3), $obj->getBaz());
208208
}
209209

210+
/**
211+
* @see https://bugs.php.net/62715
212+
*
213+
* @requires PHP 5.3.17
214+
*/
210215
public function testConstructorDenormalizeWithOptionalDefaultArgument()
211216
{
212-
if (PHP_VERSION_ID <= 50316) {
213-
$this->markTestSkipped('See https://bugs.php.net/62715');
214-
}
215217
$obj = $this->normalizer->denormalize(
216218
array('bar' => 'test'),
217219
__NAMESPACE__.'\GetConstructorArgsWithDefaultValueDummy', 'any');

Tests/Normalizer/ObjectNormalizerTest.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,11 +155,13 @@ public function testConstructorDenormalizeWithMissingOptionalArgument()
155155
$this->assertEquals(array(1, 2, 3), $obj->getBaz());
156156
}
157157

158+
/**
159+
* @see https://bugs.php.net/62715
160+
*
161+
* @requires PHP 5.3.17
162+
*/
158163
public function testConstructorDenormalizeWithOptionalDefaultArgument()
159164
{
160-
if (PHP_VERSION_ID <= 50316) {
161-
$this->markTestSkipped('See https://bugs.php.net/62715');
162-
}
163165
$obj = $this->normalizer->denormalize(
164166
array('bar' => 'test'),
165167
__NAMESPACE__.'\ObjectConstructorArgsWithDefaultValueDummy', 'any');

composer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
"php": ">=5.3.9"
2020
},
2121
"require-dev": {
22-
"symfony/phpunit-bridge": "~2.7|~3.0.0",
2322
"symfony/yaml": "~2.0,>=2.0.5|~3.0.0",
2423
"symfony/config": "~2.2|~3.0.0",
2524
"symfony/property-access": "~2.3|~3.0.0",

phpunit.xml.dist

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,8 @@
2525
</exclude>
2626
</whitelist>
2727
</filter>
28+
29+
<listeners>
30+
<listener class="Symfony\Bridge\PhpUnit\SkippedTestsListener" />
31+
</listeners>
2832
</phpunit>

0 commit comments

Comments
 (0)