Skip to content

Commit 184be37

Browse files
matthiasnobackmatthiasnoback
committed
Fix constraints
1 parent a0959af commit 184be37

11 files changed

+75
-57
lines changed

‎PhpUnit/ContainerBuilderHasAliasConstraint.php‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,19 @@
22

33
namespace Matthias\SymfonyDependencyInjectionTest\PhpUnit;
44

5-
use SebastianBergmann\Exporter\Exporter;
5+
use PHPUnit\Framework\Constraint\Constraint;
6+
use PHPUnit\Framework\Constraint\IsEqual;
67
use Symfony\Component\DependencyInjection\ContainerBuilder;
78

8-
class ContainerBuilderHasAliasConstraint extends \PHPUnit_Framework_Constraint
9+
class ContainerBuilderHasAliasConstraint extends Constraint
910
{
1011
private $aliasId;
1112
private $expectedServiceId;
12-
protected $exporter;
1313

1414
public function __construct($aliasId, $expectedServiceId = null)
1515
{
16+
parent::__construct();
17+
1618
if (!is_string($aliasId)) {
1719
throw new \InvalidArgumentException('The $aliasId argument should be a string');
1820
}
@@ -23,7 +25,6 @@ public function __construct($aliasId, $expectedServiceId = null)
2325

2426
$this->aliasId = $aliasId;
2527
$this->expectedServiceId = $expectedServiceId;
26-
$this->exporter = new Exporter;
2728
}
2829

2930
public function toString()
@@ -79,7 +80,7 @@ private function evaluateServiceId(ContainerBuilder $containerBuilder, $returnRe
7980
*/
8081
$actualServiceId = (string) $alias;
8182

82-
$constraint = new \PHPUnit_Framework_Constraint_IsEqual(strtolower($this->expectedServiceId));
83+
$constraint = new IsEqual(strtolower($this->expectedServiceId));
8384
if (!$constraint->evaluate($actualServiceId, '', true)) {
8485
if ($returnResult) {
8586
return false;

‎PhpUnit/ContainerBuilderHasServiceDefinitionConstraint.php‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,20 @@
22

33
namespace Matthias\SymfonyDependencyInjectionTest\PhpUnit;
44

5-
use SebastianBergmann\Exporter\Exporter;
5+
use PHPUnit\Framework\Constraint\Constraint;
6+
use PHPUnit\Framework\Constraint\IsEqual;
67
use Symfony\Component\DependencyInjection\ContainerBuilder;
78

8-
class ContainerBuilderHasServiceDefinitionConstraint extends \PHPUnit_Framework_Constraint
9+
class ContainerBuilderHasServiceDefinitionConstraint extends Constraint
910
{
1011
private $serviceId;
1112
private $expectedClass;
1213
private $checkExpectedClass;
13-
protected $exporter;
1414

1515
public function __construct($serviceId, $expectedClass = null, $checkExpectedClass = true)
1616
{
17+
parent::__construct();
18+
1719
if (!is_string($serviceId)) {
1820
throw new \InvalidArgumentException('The $serviceId argument should be a string');
1921
}
@@ -25,7 +27,6 @@ public function __construct($serviceId, $expectedClass = null, $checkExpectedCla
2527
$this->serviceId = $serviceId;
2628
$this->expectedClass = $expectedClass;
2729
$this->checkExpectedClass = $checkExpectedClass;
28-
$this->exporter = new Exporter;
2930
}
3031

3132
public function toString()
@@ -81,7 +82,7 @@ private function evaluateClass(ContainerBuilder $containerBuilder, $returnResult
8182

8283
$actualClass = $containerBuilder->getParameterBag()->resolveValue($definition->getClass());
8384

84-
$constraint = new \PHPUnit_Framework_Constraint_IsEqual($this->expectedClass);
85+
$constraint = new IsEqual($this->expectedClass);
8586

8687
if (!$constraint->evaluate($actualClass, '', true)) {
8788
if ($returnResult) {

‎PhpUnit/ContainerBuilderHasSyntheticServiceConstraint.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,22 @@
22

33
namespace Matthias\SymfonyDependencyInjectionTest\PhpUnit;
44

5-
use SebastianBergmann\Exporter\Exporter;
5+
use PHPUnit\Framework\Constraint\Constraint;
66
use Symfony\Component\DependencyInjection\ContainerBuilder;
77

8-
class ContainerBuilderHasSyntheticServiceConstraint extends \PHPUnit_Framework_Constraint
8+
class ContainerBuilderHasSyntheticServiceConstraint extends Constraint
99
{
1010
private $serviceId;
11-
protected $exporter;
1211

1312
public function __construct($serviceId)
1413
{
14+
parent::__construct();
15+
1516
if (!is_string($serviceId)) {
1617
throw new \InvalidArgumentException('The $serviceId argument should be a string');
1718
}
1819

1920
$this->serviceId = $serviceId;
20-
$this->exporter = new Exporter;
2121
}
2222

2323
public function toString()

‎PhpUnit/ContainerHasParameterConstraint.php‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,23 @@
22

33
namespace Matthias\SymfonyDependencyInjectionTest\PhpUnit;
44

5-
use SebastianBergmann\Exporter\Exporter;
5+
use PHPUnit\Framework\Constraint\Constraint;
6+
use PHPUnit\Framework\Constraint\IsEqual;
67
use Symfony\Component\DependencyInjection\ContainerInterface;
78

8-
class ContainerHasParameterConstraint extends \PHPUnit_Framework_Constraint
9+
class ContainerHasParameterConstraint extends Constraint
910
{
1011
private $parameterName;
1112
private $expectedParameterValue;
1213
private $checkParameterValue;
13-
protected $exporter;
1414

1515
public function __construct($parameterName, $expectedParameterValue = null, $checkParameterValue = false)
1616
{
17+
parent::__construct();
18+
1719
$this->parameterName = $parameterName;
1820
$this->expectedParameterValue = $expectedParameterValue;
1921
$this->checkParameterValue = $checkParameterValue;
20-
$this->exporter = new Exporter;
2122
}
2223

2324
public function toString()
@@ -67,7 +68,7 @@ private function evaluateParameterValue(ContainerInterface $container, $returnRe
6768
{
6869
$actualValue = $container->getParameter($this->parameterName);
6970

70-
$constraint = new \PHPUnit_Framework_Constraint_IsEqual($this->expectedParameterValue);
71+
$constraint = new IsEqual($this->expectedParameterValue);
7172

7273
if (!$constraint->evaluate($actualValue, '', true)) {
7374
if ($returnResult) {

‎PhpUnit/DefinitionHasArgumentConstraint.php‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,24 @@
22

33
namespace Matthias\SymfonyDependencyInjectionTest\PhpUnit;
44

5-
use SebastianBergmann\Exporter\Exporter;
5+
use PHPUnit\Framework\Constraint\Constraint;
6+
use PHPUnit\Framework\Constraint\IsEqual;
67
use Symfony\Component\DependencyInjection\Definition;
78
use Symfony\Component\DependencyInjection\Exception\OutOfBoundsException;
89

9-
class DefinitionHasArgumentConstraint extends \PHPUnit_Framework_Constraint
10+
class DefinitionHasArgumentConstraint extends Constraint
1011
{
1112
private $argumentIndex;
1213
private $expectedValue;
1314
private $checkExpectedValue;
14-
protected $exporter;
1515

1616
public function __construct($argumentIndex, $expectedValue, $checkExpectedValue = true)
1717
{
18+
parent::__construct();
19+
1820
$this->argumentIndex = (integer)$argumentIndex;
1921
$this->expectedValue = $expectedValue;
2022
$this->checkExpectedValue = $checkExpectedValue;
21-
$this->exporter = new Exporter;
2223
}
2324

2425
public function toString()
@@ -80,7 +81,7 @@ private function evaluateArgumentValue(Definition $definition, $returnResult)
8081
{
8182
$actualValue = $definition->getArgument($this->argumentIndex);
8283

83-
$constraint = new \PHPUnit_Framework_Constraint_IsEqual($this->expectedValue);
84+
$constraint = new IsEqual($this->expectedValue);
8485

8586
if (!$constraint->evaluate($actualValue, '', true)) {
8687
if ($returnResult) {

‎PhpUnit/DefinitionHasMethodCallConstraint.php‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,21 @@
22

33
namespace Matthias\SymfonyDependencyInjectionTest\PhpUnit;
44

5-
use SebastianBergmann\Exporter\Exporter;
5+
use PHPUnit\Framework\Constraint\Constraint;
6+
use PHPUnit\Framework\Constraint\IsEqual;
67
use Symfony\Component\DependencyInjection\Definition;
78

8-
class DefinitionHasMethodCallConstraint extends \PHPUnit_Framework_Constraint
9+
class DefinitionHasMethodCallConstraint extends Constraint
910
{
1011
private $methodName;
1112
private $arguments;
12-
protected $exporter;
1313

1414
public function __construct($methodName, array $arguments = array())
1515
{
16+
parent::__construct();
17+
1618
$this->methodName = $methodName;
1719
$this->arguments = $arguments;
18-
$this->exporter = new Exporter;
1920
}
2021

2122
public function evaluate($other, $description = '', $returnResult = false)
@@ -62,7 +63,7 @@ public function toString()
6263

6364
private function equalArguments($expectedArguments, $actualArguments)
6465
{
65-
$constraint = new \PHPUnit_Framework_Constraint_IsEqual(
66+
$constraint = new IsEqual(
6667
$expectedArguments
6768
);
6869

‎PhpUnit/DefinitionHasTagConstraint.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22

33
namespace Matthias\SymfonyDependencyInjectionTest\PhpUnit;
44

5-
use SebastianBergmann\Exporter\Exporter;
5+
use PHPUnit\Framework\Constraint\Constraint;
6+
use PHPUnit\Framework\Constraint\IsEqual;
67
use Symfony\Component\DependencyInjection\Definition;
78

8-
class DefinitionHasTagConstraint extends \PHPUnit_Framework_Constraint
9+
class DefinitionHasTagConstraint extends Constraint
910
{
10-
protected $exporter;
1111
private $name;
1212
private $attributes;
1313

1414
public function __construct($name, array $attributes = array())
1515
{
16-
$this->exporter = new Exporter();
16+
parent::__construct();
1717
$this->name = $name;
1818
$this->attributes = $attributes;
1919
}
@@ -72,7 +72,7 @@ public function toString()
7272

7373
private function equalAttributes($expectedAttributes, $actualAttributes)
7474
{
75-
$constraint = new \PHPUnit_Framework_Constraint_IsEqual(
75+
$constraint = new IsEqual(
7676
$expectedAttributes
7777
);
7878

‎PhpUnit/DefinitionIsChildOfConstraint.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22

33
namespace Matthias\SymfonyDependencyInjectionTest\PhpUnit;
44

5-
use SebastianBergmann\Exporter\Exporter;
5+
use PHPUnit\Framework\Constraint\Constraint;
66
use Symfony\Component\DependencyInjection\Definition;
77
use Symfony\Component\DependencyInjection\DefinitionDecorator;
88

9-
class DefinitionIsChildOfConstraint extends \PHPUnit_Framework_Constraint
9+
class DefinitionIsChildOfConstraint extends Constraint
1010
{
1111
private $expectedParentServiceId;
12-
protected $exporter;
1312

1413
public function __construct($expectedParentServiceId)
1514
{
15+
parent::__construct();
16+
1617
$this->expectedParentServiceId = $expectedParentServiceId;
17-
$this->exporter = new Exporter;
1818
}
1919

2020
public function evaluate($other, $description = '', $returnResult = false)

0 commit comments

Comments
 (0)