Skip to content
Permalink
Browse files

Merge branch '4.4' into 5.0

* 4.4:
  Skip deprecations from doctrine/orm
  Ignore deprecations about doctrine/persistence coming from doctrine/orm
  skip not applicable tests
  • Loading branch information
nicolas-grekas committed Dec 16, 2019
2 parents 4eadeb7 + 0dea24f commit 2e878378ef373931edfe630af43868ca0cad81b4
@@ -9,7 +9,7 @@ cache:
init:
- SET PATH=c:\php;%PATH%
- SET COMPOSER_NO_INTERACTION=1
- SET SYMFONY_DEPRECATIONS_HELPER=strict
- SET SYMFONY_DEPRECATIONS_HELPER=max[indirect]=7
- SET "SYMFONY_REQUIRE=>=4.4"
- SET ANSICON=121x90 (121x90)
- SET SYMFONY_PHPUNIT_DISABLE_RESULT_CACHE=1
@@ -319,7 +319,8 @@ install:
echo "$COMPONENTS" | parallel --gnu "tfold {} $PHPUNIT_X {}"
tfold src/Symfony/Component/Console.tty $PHPUNIT --group tty
tfold src/Symfony/Component/Console.tty $PHPUNIT src/Symfony/Component/Console --group tty
tfold src/Symfony/Bridge/Twig.tty $PHPUNIT src/Symfony/Bridge/Twig --group tty
if [[ $PHP = ${MIN_PHP%.*} ]]; then
export PHP=$MIN_PHP
10 phpunit
@@ -21,4 +21,14 @@ if (!getenv('SYMFONY_PATCH_TYPE_DECLARATIONS')) {
putenv('SYMFONY_PATCH_TYPE_DECLARATIONS=deprecations=1');
}
putenv('SYMFONY_PHPUNIT_DIR='.__DIR__.'/.phpunit');

if (!getenv('SYMFONY_DEPRECATIONS_HELPER')) {
foreach ($_SERVER['argv'] as $v) {
if (false !== strpos($v, 'Bridge/Doctrine')) {
putenv('SYMFONY_DEPRECATIONS_HELPER=max[indirect]=7');
break;
}
}
}

require __DIR__.'/vendor/symfony/phpunit-bridge/bin/simple-phpunit';
@@ -110,6 +110,14 @@ public function testThrowsOnInvalidStringDates(AbstractComparison $constraint, $
$this->markTestSkipped('The compared value cannot be an invalid string date because it is hardcoded to 0.');
}

/**
* @dataProvider provideComparisonsToNullValueAtPropertyPath
*/
public function testCompareWithNullValueAtPropertyAt($dirtyValue, $dirtyValueAsString, $isValid)
{
$this->markTestSkipped('PropertyPath option is not used in NegativeOrZero constraint');
}

public function testInvalidComparisonToPropertyPathAddsPathAsParameter()
{
$this->markTestSkipped('PropertyPath option is not used in NegativeOrZero constraint');
@@ -110,6 +110,14 @@ public function testThrowsOnInvalidStringDates(AbstractComparison $constraint, $
$this->markTestSkipped('The compared value cannot be an invalid string date because it is hardcoded to 0.');
}

/**
* @dataProvider provideComparisonsToNullValueAtPropertyPath
*/
public function testCompareWithNullValueAtPropertyAt($dirtyValue, $dirtyValueAsString, $isValid)
{
$this->markTestSkipped('PropertyPath option is not used in Negative constraint');
}

public function testInvalidComparisonToPropertyPathAddsPathAsParameter()
{
$this->markTestSkipped('PropertyPath option is not used in Negative constraint');

0 comments on commit 2e87837

Please sign in to comment.
You can’t perform that action at this time.