Skip to content

Commit 3af827c

Browse files
committed
Flip Symfony logic
1 parent 8895ea9 commit 3af827c

File tree

1 file changed

+10
-16
lines changed

1 file changed

+10
-16
lines changed

utils/make-phar.php

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,15 @@ function add_file( $phar, $path ) {
6969
'\/nb\/oxymel\/',
7070
'-command\/src\/',
7171
'\/wp-cli\/[^\n]+?-command\/',
72-
'\/symfony\/(?!deprecation-contracts|finder|polyfill-intl-normalizer|polyfill-mbstring|polyfill-php80|process)\'',
72+
'\/symfony\/(?:config|console|debug|dependency-injection|event-dispatcher|filesystem|translation|yaml)\'',
7373
'\/(?:dealerdirect|squizlabs|wimg)\/',
7474
'\/yoast\/',
7575
];
7676
} else {
7777
$strips = [
7878
'\/(?:behat|gherkin)\/src\/',
7979
'\/phpunit\/',
80-
'\/symfony\/(?!console|deprecation-contracts|filesystem|finder|polyfill-intl-normalizer|polyfill-mbstring|polyfill-php80|process)\'',
80+
'\/symfony\/(?:config|debug|dependency-injection|event-dispatcher|translation|yaml)\'',
8181
'\/composer\/spdx-licenses\/',
8282
'\/Composer\/(?:Command\/|Compiler\.php|Console\/|Downloader\/Pear|Installer\/Pear|Question\/|Repository\/Pear|SelfUpdate\/)',
8383
'\/(?:dealerdirect|squizlabs|wimg)\/',
@@ -190,6 +190,12 @@ function get_composer_versions( $current_version ) {
190190
->in( WP_CLI_VENDOR_DIR . '/myclabs/deep-copy' )
191191
->notName( 'behat-tags.php' )
192192
->notPath( '#(?:[^/]+-command|php-cli-tools)/vendor/#' ) // For running locally, in case have composer installed or symlinked them.
193+
->exclude( 'symfony/config' )
194+
->exclude( 'symfony/debug' )
195+
->exclude( 'symfony/dependency-injection' )
196+
->exclude( 'symfony/event-dispatcher' )
197+
->exclude( 'symfony/translation' )
198+
->exclude( 'symfony/yaml' )
193199
->exclude( 'examples' )
194200
->exclude( 'features' )
195201
->exclude( 'test' )
@@ -200,23 +206,13 @@ function get_composer_versions( $current_version ) {
200206
$finder
201207
->in( WP_CLI_VENDOR_DIR . '/react' );
202208
}
203-
if ( is_dir( WP_CLI_VENDOR_DIR . '/symfony/deprecation-contracts' ) ) {
204-
$finder
205-
->in( WP_CLI_VENDOR_DIR . '/symfony/deprecation-contracts' );
206-
}
207-
if ( is_dir( WP_CLI_VENDOR_DIR . '/symfony/polyfill-intl-normalizer' ) ) {
208-
$finder
209-
->in( WP_CLI_VENDOR_DIR . '/symfony/polyfill-intl-normalizer' );
210-
}
211-
if ( is_dir( WP_CLI_VENDOR_DIR . '/symfony/polyfill-php80' ) ) {
212-
$finder
213-
->in( WP_CLI_VENDOR_DIR . '/symfony/polyfill-php80' );
214-
}
215209
if ( 'cli' === BUILD ) {
216210
$finder
217211
->in( WP_CLI_VENDOR_DIR . '/wp-cli/mustangostang-spyc' )
218212
->in( WP_CLI_VENDOR_DIR . '/wp-cli/php-cli-tools' )
219213
->in( WP_CLI_VENDOR_DIR . '/seld/cli-prompt' )
214+
->exclude( 'symfony/console' )
215+
->exclude( 'symfony/filesystem' )
220216
->exclude( 'composer/ca-bundle' )
221217
->exclude( 'composer/semver' )
222218
->exclude( 'composer/src' )
@@ -227,8 +223,6 @@ function get_composer_versions( $current_version ) {
227223
->in( WP_CLI_VENDOR_DIR . '/nb/oxymel' )
228224
->in( WP_CLI_VENDOR_DIR . '/psr' )
229225
->in( WP_CLI_VENDOR_DIR . '/seld' )
230-
->in( WP_CLI_VENDOR_DIR . '/symfony/console' )
231-
->in( WP_CLI_VENDOR_DIR . '/symfony/filesystem' )
232226
->in( WP_CLI_VENDOR_DIR . '/justinrainbow/json-schema' )
233227
->in( WP_CLI_VENDOR_DIR . '/gettext' )
234228
->in( WP_CLI_VENDOR_DIR . '/mck89' )

0 commit comments

Comments
 (0)