Skip to content

Commit be74acb

Browse files
trakostrakos
committed
Don't ignore ref changes in packages with dev-branch versions
1 parent a968372 commit be74acb

File tree

7 files changed

+783
-41
lines changed

7 files changed

+783
-41
lines changed

‎src/PackageDiff.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public function getPackageDiff($from, $to, $dev, $withPlatform)
3333

3434
foreach ($targetPackages->getPackages() as $newPackage) {
3535
if ($oldPackage = $oldPackages->findPackage($newPackage->getName(), '*')) {
36-
if ($oldPackage->getUniqueName() !== $newPackage->getUniqueName()) {
36+
if ($oldPackage->getFullPrettyVersion() !== $newPackage->getFullPrettyVersion()) {
3737
$operations[] = new UpdateOperation($oldPackage, $newPackage);
3838
}
3939

‎tests/Integration/DiffCommandTest.php‎

Lines changed: 34 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,15 @@ public function commandArgumentsDataProvider()
5959
return array(
6060
'with platform' => array(
6161
<<<OUTPUT
62-
| Prod Packages | Operation | Base | Target |
63-
|------------------------------------|-----------|---------|---------|
64-
| psr/event-dispatcher | New | - | 1.0.0 |
65-
| symfony/deprecation-contracts | New | - | v2.1.2 |
66-
| symfony/event-dispatcher | Upgraded | v2.8.52 | v5.1.2 |
67-
| symfony/event-dispatcher-contracts | New | - | v2.1.2 |
68-
| symfony/polyfill-php80 | New | - | v1.17.1 |
69-
| php | New | - | >=5.3 |
62+
| Prod Packages | Operation | Base | Target |
63+
|------------------------------------|-----------|--------------------|--------------------|
64+
| psr/event-dispatcher | New | - | 1.0.0 |
65+
| roave/security-advisories | Changed | dev-master 3c97c13 | dev-master ac36586 |
66+
| symfony/deprecation-contracts | New | - | v2.1.2 |
67+
| symfony/event-dispatcher | Upgraded | v2.8.52 | v5.1.2 |
68+
| symfony/event-dispatcher-contracts | New | - | v2.1.2 |
69+
| symfony/polyfill-php80 | New | - | v1.17.1 |
70+
| php | New | - | >=5.3 |
7071
7172
| Dev Packages | Operation | Base | Target |
7273
|------------------------------------|------------|-------|--------|
@@ -102,13 +103,14 @@ public function commandArgumentsDataProvider()
102103
),
103104
'no-dev' => array(
104105
<<<OUTPUT
105-
| Prod Packages | Operation | Base | Target |
106-
|------------------------------------|-----------|---------|---------|
107-
| psr/event-dispatcher | New | - | 1.0.0 |
108-
| symfony/deprecation-contracts | New | - | v2.1.2 |
109-
| symfony/event-dispatcher | Upgraded | v2.8.52 | v5.1.2 |
110-
| symfony/event-dispatcher-contracts | New | - | v2.1.2 |
111-
| symfony/polyfill-php80 | New | - | v1.17.1 |
106+
| Prod Packages | Operation | Base | Target |
107+
|------------------------------------|-----------|--------------------|--------------------|
108+
| psr/event-dispatcher | New | - | 1.0.0 |
109+
| roave/security-advisories | Changed | dev-master 3c97c13 | dev-master ac36586 |
110+
| symfony/deprecation-contracts | New | - | v2.1.2 |
111+
| symfony/event-dispatcher | Upgraded | v2.8.52 | v5.1.2 |
112+
| symfony/event-dispatcher-contracts | New | - | v2.1.2 |
113+
| symfony/polyfill-php80 | New | - | v1.17.1 |
112114
113115
114116
OUTPUT
@@ -121,13 +123,14 @@ public function commandArgumentsDataProvider()
121123
),
122124
'no-dev with arguments' => array(
123125
<<<OUTPUT
124-
| Prod Packages | Operation | Base | Target |
125-
|------------------------------------|-----------|---------|---------|
126-
| psr/event-dispatcher | New | - | 1.0.0 |
127-
| symfony/deprecation-contracts | New | - | v2.1.2 |
128-
| symfony/event-dispatcher | Upgraded | v2.8.52 | v5.1.2 |
129-
| symfony/event-dispatcher-contracts | New | - | v2.1.2 |
130-
| symfony/polyfill-php80 | New | - | v1.17.1 |
126+
| Prod Packages | Operation | Base | Target |
127+
|------------------------------------|-----------|--------------------|--------------------|
128+
| psr/event-dispatcher | New | - | 1.0.0 |
129+
| roave/security-advisories | Changed | dev-master 3c97c13 | dev-master ac36586 |
130+
| symfony/deprecation-contracts | New | - | v2.1.2 |
131+
| symfony/event-dispatcher | Upgraded | v2.8.52 | v5.1.2 |
132+
| symfony/event-dispatcher-contracts | New | - | v2.1.2 |
133+
| symfony/polyfill-php80 | New | - | v1.17.1 |
131134
132135
133136
OUTPUT
@@ -174,14 +177,15 @@ public function commandArgumentsDataProvider()
174177
),
175178
'reversed, with platform' => array(
176179
<<<OUTPUT
177-
| Prod Packages | Operation | Base | Target |
178-
|------------------------------------|------------|---------|---------|
179-
| symfony/event-dispatcher | Downgraded | v5.1.2 | v2.8.52 |
180-
| psr/event-dispatcher | Removed | 1.0.0 | - |
181-
| symfony/deprecation-contracts | Removed | v2.1.2 | - |
182-
| symfony/event-dispatcher-contracts | Removed | v2.1.2 | - |
183-
| symfony/polyfill-php80 | Removed | v1.17.1 | - |
184-
| php | Removed | >=5.3 | - |
180+
| Prod Packages | Operation | Base | Target |
181+
|------------------------------------|------------|--------------------|--------------------|
182+
| roave/security-advisories | Changed | dev-master ac36586 | dev-master 3c97c13 |
183+
| symfony/event-dispatcher | Downgraded | v5.1.2 | v2.8.52 |
184+
| psr/event-dispatcher | Removed | 1.0.0 | - |
185+
| symfony/deprecation-contracts | Removed | v2.1.2 | - |
186+
| symfony/event-dispatcher-contracts | Removed | v2.1.2 | - |
187+
| symfony/polyfill-php80 | Removed | v1.17.1 | - |
188+
| php | Removed | >=5.3 | - |
185189
186190
| Dev Packages | Operation | Base | Target |
187191
|------------------------------------|-----------|--------|--------|

‎tests/PackageDiffTest.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ public function operationsProvider()
7373
'prod, with platform' => array(
7474
array(
7575
'install psr/event-dispatcher 1.0.0',
76+
'update roave/security-advisories from dev-master to dev-master',
7677
'install symfony/deprecation-contracts v2.1.2',
7778
'update symfony/event-dispatcher from v2.8.52 to v5.1.2',
7879
'install symfony/event-dispatcher-contracts v2.1.2',
@@ -85,6 +86,7 @@ public function operationsProvider()
8586
'prod, no platform' => array(
8687
array(
8788
'install psr/event-dispatcher 1.0.0',
89+
'update roave/security-advisories from dev-master to dev-master',
8890
'install symfony/deprecation-contracts v2.1.2',
8991
'update symfony/event-dispatcher from v2.8.52 to v5.1.2',
9092
'install symfony/event-dispatcher-contracts v2.1.2',

‎tests/fixtures/base/composer.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
"name": "test/test",
33
"require": {
44
"symfony/event-dispatcher": "^2.8",
5-
"doctrine/dbal": "^2.10"
5+
"doctrine/dbal": "^2.10",
6+
"roave/security-advisories": "dev-master#3c97c13"
67
},
78
"require-dev": {
89
"phpunit/phpunit": "^9.2"

0 commit comments

Comments
 (0)