Skip to content

Commit 72ea680

Browse files
webmozartwebmozart
committed
Updated webmozart/expression
1 parent 1b93bfb commit 72ea680

8 files changed

Lines changed: 29 additions & 30 deletions

‎src/Handler/BindingCommandHandler.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ public function handleList(Args $args, IO $io)
8282
$bindingStatePrinted = !$printBindingState;
8383

8484
foreach ($packageNames as $packageName) {
85-
$expr = Expr::same(BindingDescriptor::CONTAINING_PACKAGE, $packageName)
86-
->andSame(BindingDescriptor::STATE, $bindingState);
85+
$expr = Expr::same($packageName, BindingDescriptor::CONTAINING_PACKAGE)
86+
->andSame($bindingState, BindingDescriptor::STATE);
8787

8888
$bindings = $this->discoveryManager->findBindings($expr);
8989

@@ -430,7 +430,7 @@ private function unsetParams(Args $args, array &$bindingParams)
430430
*/
431431
private function getBindingByUuidPrefix($uuidPrefix)
432432
{
433-
$expr = Expr::startsWith(BindingDescriptor::UUID, $uuidPrefix);
433+
$expr = Expr::startsWith($uuidPrefix, BindingDescriptor::UUID);
434434
$bindings = $this->discoveryManager->findBindings($expr);
435435

436436
if (0 === count($bindings)) {

‎src/Handler/PackageCommandHandler.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@ public function handleList(Args $args, IO $io)
6464
$printStates = count($states) > 1;
6565

6666
foreach ($states as $state) {
67-
$expr = Expr::same(Package::STATE, $state);
67+
$expr = Expr::same($state, Package::STATE);
6868

6969
if ($installer) {
70-
$expr = $expr->andSame(Package::INSTALLER, $installer);
70+
$expr = $expr->andSame($installer, Package::INSTALLER);
7171
}
7272

7373
$packages = $this->packageManager->findPackages($expr);
@@ -147,7 +147,7 @@ public function handleRemove(Args $args)
147147
*/
148148
public function handleClean(Args $args, IO $io)
149149
{
150-
$expr = Expr::same(Package::STATE, PackageState::NOT_FOUND);
150+
$expr = Expr::same(PackageState::NOT_FOUND, Package::STATE);
151151

152152
foreach ($this->packageManager->findPackages($expr) as $package) {
153153
$io->writeLine('Removing '.$package->getName());

‎src/Handler/PathCommandHandler.php‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ public function handleList(Args $args, IO $io)
103103
$statePrinted = !$printState;
104104

105105
if (PathMappingState::CONFLICT === $state) {
106-
$expr = Expr::oneOf(PathMapping::CONTAINING_PACKAGE, $packageNames)
107-
->andSame(PathMapping::STATE, $state);
106+
$expr = Expr::in($packageNames, PathMapping::CONTAINING_PACKAGE)
107+
->andSame($state, PathMapping::STATE);
108108

109109
$mappings = $this->repoManager->findPathMappings($expr);
110110

@@ -128,9 +128,8 @@ public function handleList(Args $args, IO $io)
128128
}
129129

130130
foreach ($packageNames as $packageName) {
131-
$expr = Expr::same(PathMapping::CONTAINING_PACKAGE,
132-
$packageName)
133-
->andSame(PathMapping::STATE, $state);
131+
$expr = Expr::same($packageName, PathMapping::CONTAINING_PACKAGE)
132+
->andSame($state, PathMapping::STATE);
134133

135134
$mappings = $this->repoManager->findPathMappings($expr);
136135

‎src/Handler/TypeCommandHandler.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ public function handleList(Args $args, IO $io)
7777
$statePrinted = !$printStates;
7878

7979
foreach ($packageNames as $packageName) {
80-
$expr = Expr::same(BindingTypeDescriptor::CONTAINING_PACKAGE, $packageName)
81-
->andSame(BindingTypeDescriptor::STATE, $state);
80+
$expr = Expr::same($packageName, BindingTypeDescriptor::CONTAINING_PACKAGE)
81+
->andSame($state, BindingTypeDescriptor::STATE);
8282

8383
$bindingTypes = $this->discoveryManager->findBindingTypes($expr);
8484

‎tests/Handler/BindingCommandHandlerTest.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1290,13 +1290,13 @@ private function initDefaultBindings()
12901290

12911291
private function packageAndState($packageName, $state)
12921292
{
1293-
return Expr::same(BindingDescriptor::CONTAINING_PACKAGE, $packageName)
1294-
->andSame(BindingDescriptor::STATE, $state);
1293+
return Expr::same($packageName, BindingDescriptor::CONTAINING_PACKAGE)
1294+
->andSame($state, BindingDescriptor::STATE);
12951295
}
12961296

12971297
private function uuid($uuid)
12981298
{
1299-
return Expr::startsWith(BindingDescriptor::UUID, $uuid);
1299+
return Expr::startsWith($uuid, BindingDescriptor::UUID);
13001300
}
13011301

13021302
private function returnForExpr(Expression $expr, $result)
@@ -1307,7 +1307,7 @@ private function returnForExpr(Expression $expr, $result)
13071307
// that object in between, PHPUnit fails since the state of the object
13081308
// *after* the test does not match the first assertion anymore
13091309
return function (Expression $actualExpr) use ($expr, $result) {
1310-
PHPUnit_Framework_Assert::assertTrue($actualExpr->equals($expr));
1310+
PHPUnit_Framework_Assert::assertTrue($actualExpr->equivalentTo($expr));
13111311

13121312
return $result;
13131313
};
@@ -1318,7 +1318,7 @@ private function returnFromMap(array $map)
13181318
return function (Expression $expr) use ($map) {
13191319
foreach ($map as $arguments) {
13201320
// Cannot use willReturnMap(), which uses ===
1321-
if ($expr->equals($arguments[0])) {
1321+
if ($expr->equivalentTo($arguments[0])) {
13221322
return $arguments[1];
13231323
}
13241324
}

‎tests/Handler/PackageCommandHandlerTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -393,21 +393,21 @@ public function testCleanPackages()
393393

394394
private function state($state)
395395
{
396-
return Expr::same(Package::STATE, $state);
396+
return Expr::same($state, Package::STATE);
397397
}
398398

399399
private function installerAndState($installer, $state)
400400
{
401-
return Expr::same(Package::INSTALLER, $installer)
402-
->andSame(Package::STATE, $state);
401+
return Expr::same($installer, Package::INSTALLER)
402+
->andSame($state, Package::STATE);
403403
}
404404

405405
private function returnFromMap(array $map)
406406
{
407407
return function (Expression $expr) use ($map) {
408408
foreach ($map as $arguments) {
409409
// Cannot use willReturnMap(), which uses ===
410-
if ($expr->equals($arguments[0])) {
410+
if ($expr->equivalentTo($arguments[0])) {
411411
return $arguments[1];
412412
}
413413
}

‎tests/Handler/PathCommandHandlerTest.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -785,22 +785,22 @@ private function initDefaultManager()
785785

786786
private function packageAndState($packageName, $state)
787787
{
788-
return Expr::same(PathMapping::CONTAINING_PACKAGE, $packageName)
789-
->andSame(PathMapping::STATE, $state);
788+
return Expr::same($packageName, PathMapping::CONTAINING_PACKAGE)
789+
->andSame($state, PathMapping::STATE);
790790
}
791791

792792
private function packagesAndState(array $packageNames, $state)
793793
{
794-
return Expr::oneOf(PathMapping::CONTAINING_PACKAGE, $packageNames)
795-
->andSame(PathMapping::STATE, $state);
794+
return Expr::in($packageNames, PathMapping::CONTAINING_PACKAGE)
795+
->andSame($state, PathMapping::STATE);
796796
}
797797

798798
private function returnFromMap(array $map)
799799
{
800800
return function (Expression $expr) use ($map) {
801801
foreach ($map as $arguments) {
802802
// Cannot use willReturnMap(), which uses ===
803-
if ($expr->equals($arguments[0])) {
803+
if ($expr->equivalentTo($arguments[0])) {
804804
return $arguments[1];
805805
}
806806
}

‎tests/Handler/TypeCommandHandlerTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -614,16 +614,16 @@ public function testRemoveTypeFailsIfNotFound()
614614

615615
private function packageAndState($packageName, $state)
616616
{
617-
return Expr::same(BindingTypeDescriptor::CONTAINING_PACKAGE, $packageName)
618-
->andSame(BindingTypeDescriptor::STATE, $state);
617+
return Expr::same($packageName, BindingTypeDescriptor::CONTAINING_PACKAGE)
618+
->andSame($state, BindingTypeDescriptor::STATE);
619619
}
620620

621621
private function returnFromMap(array $map)
622622
{
623623
return function (Expression $expr) use ($map) {
624624
foreach ($map as $arguments) {
625625
// Cannot use willReturnMap(), which uses ===
626-
if ($expr->equals($arguments[0])) {
626+
if ($expr->equivalentTo($arguments[0])) {
627627
return $arguments[1];
628628
}
629629
}

0 commit comments

Comments
 (0)