Skip to content

Commit 5271595

Browse files
minor symfony#48948 [Notifier] Revert "minor symfony#47721 Use local copy of stella-maris/clock when testing" (nicolas-grekas)
This PR was merged into the 5.4 branch. Discussion ---------- [Notifier] Revert "minor symfony#47721 Use local copy of stella-maris/clock when testing" | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - This reverts commit fcc2174, reversing changes made to a5f8bb2. Not needed anymore since the project moved from gitlab to github. Commits ------- b6d4244 Revert "minor symfony#47721 [Notifier] Use local copy of stella-maris/clock when testing (nicolas-grekas)"
2 parents a338736 + b6d4244 commit 5271595

File tree

6 files changed

+2
-62
lines changed

6 files changed

+2
-62
lines changed

.github/workflows/package-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121

2222
- name: Find packages
2323
id: find-packages
24-
run: echo "packages=$(php .github/get-modified-packages.php $(find src/Symfony -mindepth 2 -maxdepth 6 -type f -name composer.json -printf '%h\n' | jq -R -s -c 'split("\n")[:-1]') $(git diff --name-only origin/${{ github.base_ref }} HEAD | grep src/ | jq -R -s -c 'split("\n")[:-1]'))" >> $GITHUB_OUTPUT
24+
run: echo "packages=$(php .github/get-modified-packages.php $(find src/Symfony -mindepth 2 -type f -name composer.json -printf '%h\n' | jq -R -s -c 'split("\n")[:-1]') $(git diff --name-only origin/${{ github.base_ref }} HEAD | grep src/ | jq -R -s -c 'split("\n")[:-1]'))" >> $GITHUB_OUTPUT
2525

2626
- name: Verify meta files are correct
2727
run: |

.github/workflows/unit-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494
echo SYMFONY_DEPRECATIONS_HELPER=weak >> $GITHUB_ENV
9595
cp composer.json composer.json.orig
9696
echo -e '{\n"require":{'"$(grep phpunit-bridge composer.json)"'"php":"*"},"minimum-stability":"dev"}' > composer.json
97-
php .github/build-packages.php HEAD^ $SYMFONY_VERSION $(find src/Symfony -mindepth 2 -maxdepth 6 -type f -name composer.json -printf '%h\n')
97+
php .github/build-packages.php HEAD^ $SYMFONY_VERSION $(find src/Symfony -mindepth 2 -type f -name composer.json -printf '%h\n')
9898
mv composer.json composer.json.phpunit
9999
mv composer.json.orig composer.json
100100
fi

composer.json

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -204,15 +204,6 @@
204204
{
205205
"type": "path",
206206
"url": "src/Symfony/Component/Runtime"
207-
},
208-
{
209-
"type": "path",
210-
"url": "src/Symfony/Component/Notifier/Bridge/Mercure/Tests/stella-maris-clock",
211-
"options": {
212-
"versions": {
213-
"stella-maris/clock": "0.1.x-dev"
214-
}
215-
}
216207
}
217208
],
218209
"minimum-stability": "dev"

src/Symfony/Component/Notifier/Bridge/Mercure/Tests/stella-maris-clock/ClockInterface.php

Lines changed: 0 additions & 23 deletions
This file was deleted.

src/Symfony/Component/Notifier/Bridge/Mercure/Tests/stella-maris-clock/composer.json

Lines changed: 0 additions & 17 deletions
This file was deleted.

src/Symfony/Component/Notifier/Bridge/Mercure/composer.json

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,5 @@
2828
"/Tests/"
2929
]
3030
},
31-
"repositories": [
32-
{
33-
"type": "path",
34-
"url": "Tests/stella-maris-clock",
35-
"options": {
36-
"versions": {
37-
"stella-maris/clock": "0.1.x-dev"
38-
}
39-
}
40-
}
41-
],
4231
"minimum-stability": "dev"
4332
}

0 commit comments

Comments
 (0)