Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit b715f46

Browse files
nicolas-grekasnicolas-grekas
committed
minor #38431 Remove "branch-alias", populate "version" (nicolas-grekas)
This PR was merged into the 3.4 branch. Discussion ---------- Remove "branch-alias", populate "version" | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Commits ------- 9d40c79 Remove "branch-alias", populate "version"
2 parents 40dc7e6 + 9d40c79 commit b715f46

File tree

55 files changed

+64
-275
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+64
-275
lines changed

‎.appveyor.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ install:
5757
- git config --global user.email ""
5858
- git config --global user.name "Symfony"
5959
- php .github/build-packages.php "HEAD^" src\Symfony\Bridge\PhpUnit
60-
- IF %APPVEYOR_REPO_BRANCH%==master (SET COMPOSER_ROOT_VERSION=dev-master) ELSE (SET COMPOSER_ROOT_VERSION=%APPVEYOR_REPO_BRANCH%.x-dev)
6160
- php composer.phar config platform.php 5.5.9
6261
- php composer.phar update --no-progress --no-suggest --ansi
6362
- php phpunit install

‎.github/build-packages.php

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,22 +50,20 @@
5050
passthru("cd $dir && git init && git add . && git commit -q -m - && git archive -o package.tar HEAD && rm .git/ -Rf");
5151
}
5252

53-
if (!isset($package->extra->{'branch-alias'}->{'dev-master'})) {
54-
echo "Missing \"dev-master\" branch-alias in composer.json extra.\n";
53+
if (!isset($package->version)) {
54+
echo "Missing \"version\" in composer.json.\n";
5555
exit(1);
5656
}
57-
$package->version = str_replace('-dev', '.x-dev', $package->extra->{'branch-alias'}->{'dev-master'});
57+
$package->version = str_replace('-dev', '.x-dev', $package->version);
5858
$package->dist['type'] = 'tar';
5959
$package->dist['url'] = 'file://'.str_replace(DIRECTORY_SEPARATOR, '/', dirname(__DIR__))."/$dir/package.tar";
6060

6161
$packages[$package->name][$package->version] = $package;
6262

63-
$versions = @file_get_contents('https://repo.packagist.org/p/'.$package->name.'.json') ?: sprintf('{"packages":{"%s":{"dev-master":%s}}}', $package->name, file_get_contents($dir.'/composer.json'));
63+
$versions = @file_get_contents('https://repo.packagist.org/p/'.$package->name.'.json') ?: sprintf('{"packages":{"%s":{"%s":%s}}}', $package->name, $package->version, file_get_contents($dir.'/composer.json'));
6464
$versions = json_decode($versions)->packages->{$package->name};
6565

66-
if (isset($versions->{'dev-master'}) && $package->version === str_replace('-dev', '.x-dev', $versions->{'dev-master'}->extra->{'branch-alias'}->{'dev-master'})) {
67-
unset($versions->{'dev-master'});
68-
}
66+
unset($versions->{'dev-master'});
6967

7068
foreach ($versions as $v => $package) {
7169
$packages[$package->name] += array($v => $package);

‎.travis.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ install:
228228
git fetch --depth=2 origin refs/pull/$SYMFONY_PHPUNIT_BRIDGE_PR/head
229229
git rm -rq src/Symfony/Bridge/PhpUnit
230230
git checkout -q FETCH_HEAD -- src/Symfony/Bridge/PhpUnit
231-
export SYMFONY_VERSION=$(cat src/Symfony/Bridge/PhpUnit/composer.json | grep '^ *"dev-master". *"[1-9]' | grep -o '[0-9.]*')
231+
export SYMFONY_VERSION=$(cat src/Symfony/Bridge/PhpUnit/composer.json | grep '^ *"version": *"[1-9]' | grep -o '[0-9.]*')
232232
sed -i 's/"symfony\/phpunit-bridge": ".*"/"symfony\/phpunit-bridge": "'$SYMFONY_VERSION'.x@dev"/' composer.json
233233
rm -rf .phpunit
234234
fi
@@ -254,20 +254,20 @@ install:
254254
fi
255255
256256
- |
257-
# For the master branch, when deps=high, the version before master is checked out and tested with the locally patched components
258-
if [[ $deps = high && $TRAVIS_BRANCH = master ]]; then
257+
# For the .x branch, when deps=high, the version before .x is checked out and tested with the locally patched components
258+
if [[ $deps = high && $TRAVIS_BRANCH = *.x ]]; then
259259
export FLIP='🙃'
260260
export SYMFONY_VERSION=$(git ls-remote --heads | grep -o '/[1-9].*' | tail -n 1 | sed s/.//) &&
261261
git fetch --depth=2 origin $SYMFONY_VERSION &&
262262
git checkout -m FETCH_HEAD &&
263263
export COMPONENTS=$(find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist -printf '%h\n' | sort)
264264
else
265-
export SYMFONY_VERSION=$(cat composer.json | grep '^ *"dev-master". *"[1-9]' | grep -o '[0-9.]*')
265+
export SYMFONY_VERSION=$(cat composer.json | grep '^ *"version". *"[1-9]' | grep -o '[0-9.]*')
266266
fi
267267
268268
- |
269-
# Skip the phpunit-bridge on not-master branches when $deps is empty
270-
if [[ ! $deps && $TRAVIS_BRANCH != master ]]; then
269+
# Skip the phpunit-bridge on bugfix-only branches when $deps is empty
270+
if [[ ! $deps && ! $TRAVIS_BRANCH = *.x ]]; then
271271
export COMPONENTS=$(find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist -not -wholename '*/Bridge/PhpUnit/*' -printf '%h\n' | sort)
272272
fi
273273
@@ -289,7 +289,7 @@ install:
289289
290290
- |
291291
# Legacy tests are skipped when deps=high and when the current branch version has not the same major version number as the next one
292-
[[ $deps = high && ${SYMFONY_VERSION%.*} != $(git show $(git ls-remote --heads | grep -FA1 /$SYMFONY_VERSION | tail -n 1):composer.json | grep '^ *"dev-master". *"[1-9]' | grep -o '[0-9]*' | head -n 1) ]] && export LEGACY=,legacy
292+
[[ $deps = high && ${SYMFONY_VERSION%.*} != $(git show $(git ls-remote --heads | grep -FA1 /$SYMFONY_VERSION | tail -n 1):composer.json | grep '^ *"version". *"[1-9]' | grep -o '[0-9]*' | head -n 1) ]] && export LEGACY=,legacy
293293
294294
export COMPOSER_ROOT_VERSION=$SYMFONY_VERSION.x-dev
295295
if [[ $deps ]]; then mv composer.json.phpunit composer.json; fi

‎composer.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,5 @@
134134
"files": [ "src/Symfony/Component/VarDumper/Resources/functions/dump.php" ]
135135
},
136136
"minimum-stability": "dev",
137-
"extra": {
138-
"branch-alias": {
139-
"dev-master": "3.4-dev"
140-
}
141-
}
137+
"version": "3.4-dev"
142138
}

‎src/Symfony/Bridge/Doctrine/composer.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,5 @@
5757
]
5858
},
5959
"minimum-stability": "dev",
60-
"extra": {
61-
"branch-alias": {
62-
"dev-master": "3.4-dev"
63-
}
64-
}
60+
"version": "3.4-dev"
6561
}

‎src/Symfony/Bridge/Monolog/composer.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,5 @@
4343
]
4444
},
4545
"minimum-stability": "dev",
46-
"extra": {
47-
"branch-alias": {
48-
"dev-master": "3.4-dev"
49-
}
50-
}
46+
"version": "3.4-dev"
5147
}

‎src/Symfony/Bridge/ProxyManager/composer.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,5 @@
3030
]
3131
},
3232
"minimum-stability": "dev",
33-
"extra": {
34-
"branch-alias": {
35-
"dev-master": "3.4-dev"
36-
}
37-
}
33+
"version": "3.4-dev"
3834
}

‎src/Symfony/Bridge/Twig/composer.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,5 @@
6767
]
6868
},
6969
"minimum-stability": "dev",
70-
"extra": {
71-
"branch-alias": {
72-
"dev-master": "3.4-dev"
73-
}
74-
}
70+
"version": "3.4-dev"
7571
}

‎src/Symfony/Bundle/DebugBundle/composer.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,5 @@
4141
]
4242
},
4343
"minimum-stability": "dev",
44-
"extra": {
45-
"branch-alias": {
46-
"dev-master": "3.4-dev"
47-
}
48-
}
44+
"version": "3.4-dev"
4945
}

‎src/Symfony/Bundle/FrameworkBundle/composer.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,5 @@
9191
]
9292
},
9393
"minimum-stability": "dev",
94-
"extra": {
95-
"branch-alias": {
96-
"dev-master": "3.4-dev"
97-
}
98-
}
94+
"version": "3.4-dev"
9995
}

‎src/Symfony/Bundle/SecurityBundle/composer.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,5 @@
6262
]
6363
},
6464
"minimum-stability": "dev",
65-
"extra": {
66-
"branch-alias": {
67-
"dev-master": "3.4-dev"
68-
}
69-
}
65+
"version": "3.4-dev"
7066
}

‎src/Symfony/Bundle/TwigBundle/composer.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,5 @@
5151
]
5252
},
5353
"minimum-stability": "dev",
54-
"extra": {
55-
"branch-alias": {
56-
"dev-master": "3.4-dev"
57-
}
58-
}
54+
"version": "3.4-dev"
5955
}

‎src/Symfony/Bundle/WebProfilerBundle/composer.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,5 @@
4545
]
4646
},
4747
"minimum-stability": "dev",
48-
"extra": {
49-
"branch-alias": {
50-
"dev-master": "3.4-dev"
51-
}
52-
}
48+
"version": "3.4-dev"
5349
}

‎src/Symfony/Bundle/WebServerBundle/composer.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,5 @@
3535
"symfony/expression-language": "For using the filter option of the log server."
3636
},
3737
"minimum-stability": "dev",
38-
"extra": {
39-
"branch-alias": {
40-
"dev-master": "3.4-dev"
41-
}
42-
}
38+
"version": "3.4-dev"
4339
}

‎src/Symfony/Component/Asset/composer.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,5 @@
3232
]
3333
},
3434
"minimum-stability": "dev",
35-
"extra": {
36-
"branch-alias": {
37-
"dev-master": "3.4-dev"
38-
}
39-
}
35+
"version": "3.4-dev"
4036
}

‎src/Symfony/Component/BrowserKit/composer.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,5 @@
3333
]
3434
},
3535
"minimum-stability": "dev",
36-
"extra": {
37-
"branch-alias": {
38-
"dev-master": "3.4-dev"
39-
}
40-
}
36+
"version": "3.4-dev"
4137
}

‎src/Symfony/Component/Cache/composer.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,5 @@
4242
]
4343
},
4444
"minimum-stability": "dev",
45-
"extra": {
46-
"branch-alias": {
47-
"dev-master": "3.4-dev"
48-
}
49-
}
45+
"version": "3.4-dev"
5046
}

‎src/Symfony/Component/ClassLoader/composer.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,5 @@
3232
"/Tests/"
3333
]
3434
},
35-
"extra": {
36-
"branch-alias": {
37-
"dev-master": "3.4-dev"
38-
}
39-
}
35+
"version": "3.4-dev"
4036
}

‎src/Symfony/Component/Config/composer.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,5 @@
4040
]
4141
},
4242
"minimum-stability": "dev",
43-
"extra": {
44-
"branch-alias": {
45-
"dev-master": "3.4-dev"
46-
}
47-
}
43+
"version": "3.4-dev"
4844
}

‎src/Symfony/Component/Console/composer.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,5 @@
4848
]
4949
},
5050
"minimum-stability": "dev",
51-
"extra": {
52-
"branch-alias": {
53-
"dev-master": "3.4-dev"
54-
}
55-
}
51+
"version": "3.4-dev"
5652
}

‎src/Symfony/Component/CssSelector/composer.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,5 @@
2929
]
3030
},
3131
"minimum-stability": "dev",
32-
"extra": {
33-
"branch-alias": {
34-
"dev-master": "3.4-dev"
35-
}
36-
}
32+
"version": "3.4-dev"
3733
}

‎src/Symfony/Component/Debug/composer.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,5 @@
3232
]
3333
},
3434
"minimum-stability": "dev",
35-
"extra": {
36-
"branch-alias": {
37-
"dev-master": "3.4-dev"
38-
}
39-
}
35+
"version": "3.4-dev"
4036
}

‎src/Symfony/Component/DependencyInjection/composer.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,5 @@
4747
]
4848
},
4949
"minimum-stability": "dev",
50-
"extra": {
51-
"branch-alias": {
52-
"dev-master": "3.4-dev"
53-
}
54-
}
50+
"version": "3.4-dev"
5551
}

‎src/Symfony/Component/DomCrawler/composer.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,5 @@
3333
]
3434
},
3535
"minimum-stability": "dev",
36-
"extra": {
37-
"branch-alias": {
38-
"dev-master": "3.4-dev"
39-
}
40-
}
36+
"version": "3.4-dev"
4137
}

‎src/Symfony/Component/Dotenv/composer.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,5 @@
2828
]
2929
},
3030
"minimum-stability": "dev",
31-
"extra": {
32-
"branch-alias": {
33-
"dev-master": "3.4-dev"
34-
}
35-
}
31+
"version": "3.4-dev"
3632
}

‎src/Symfony/Component/EventDispatcher/composer.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,5 @@
4040
]
4141
},
4242
"minimum-stability": "dev",
43-
"extra": {
44-
"branch-alias": {
45-
"dev-master": "3.4-dev"
46-
}
47-
}
43+
"version": "3.4-dev"
4844
}

‎src/Symfony/Component/ExpressionLanguage/composer.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,5 @@
2727
]
2828
},
2929
"minimum-stability": "dev",
30-
"extra": {
31-
"branch-alias": {
32-
"dev-master": "3.4-dev"
33-
}
34-
}
30+
"version": "3.4-dev"
3531
}

‎src/Symfony/Component/Filesystem/composer.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,5 @@
2626
]
2727
},
2828
"minimum-stability": "dev",
29-
"extra": {
30-
"branch-alias": {
31-
"dev-master": "3.4-dev"
32-
}
33-
}
29+
"version": "3.4-dev"
3430
}

‎src/Symfony/Component/Finder/composer.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,5 @@
2525
]
2626
},
2727
"minimum-stability": "dev",
28-
"extra": {
29-
"branch-alias": {
30-
"dev-master": "3.4-dev"
31-
}
32-
}
28+
"version": "3.4-dev"
3329
}

‎src/Symfony/Component/Form/composer.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,5 @@
5858
]
5959
},
6060
"minimum-stability": "dev",
61-
"extra": {
62-
"branch-alias": {
63-
"dev-master": "3.4-dev"
64-
}
65-
}
61+
"version": "3.4-dev"
6662
}

‎src/Symfony/Component/HttpFoundation/composer.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,5 @@
3030
]
3131
},
3232
"minimum-stability": "dev",
33-
"extra": {
34-
"branch-alias": {
35-
"dev-master": "3.4-dev"
36-
}
37-
}
33+
"version": "3.4-dev"
3834
}

‎src/Symfony/Component/HttpKernel/composer.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,5 @@
6666
]
6767
},
6868
"minimum-stability": "dev",
69-
"extra": {
70-
"branch-alias": {
71-
"dev-master": "3.4-dev"
72-
}
73-
}
69+
"version": "3.4-dev"
7470
}

0 commit comments

Comments
 (0)