8000 Merge branch '3.4' into 4.4 · symfony/symfony@e553f42 · GitHub
[go: up one dir, main page]
Skip to content

Commit e553f42

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '3.4' into 4.4
* 3.4: Remove "branch-alias", populate "version"
2 parents b47ba23 + b715f46 commit e553f42

File tree

73 files changed

+93
-360
lines changed

Some content is hidden

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

73 files changed

+93
-360
lines changed

‎.appveyor.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ install:
5050
- git config --global user.email ""
5151
- git config --global user.name "Symfony"
5252
- php .github/build-packages.php "HEAD^" src\Symfony\Bridge\PhpUnit src\Symfony\Contracts
53-
- IF %APPVEYOR_REPO_BRANCH%==master (SET COMPOSER_ROOT_VERSION=dev-master) ELSE (SET COMPOSER_ROOT_VERSION=%APPVEYOR_REPO_BRANCH%.x-dev)
5453
- php composer.phar update --no-progress --no-suggest --ansi
5554
- php phpunit install
5655

‎.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: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ install:
209209
git fetch --depth=2 origin refs/pull/$SYMFONY_PHPUNIT_BRIDGE_PR/head
210210
git rm -rq src/Symfony/Bridge/PhpUnit
211211
git checkout -q FETCH_HEAD -- src/Symfony/Bridge/PhpUnit
212-
export SYMFONY_VERSION=$(cat src/Symfony/Bridge/PhpUnit/composer.json | grep '^ *"dev-master". *"[1-9]' | grep -o '[0-9.]*')
212+
export SYMFONY_VERSION=$(cat src/Symfony/Bridge/PhpUnit/composer.json | grep '^ *"version": *"[1-9]' | grep -o '[0-9.]*')
213213
sed -i 's/"symfony\/phpunit-bridge": ".*"/"symfony\/phpunit-bridge": "'$SYMFONY_VERSION'.x@dev"/' composer.json
214214
rm -rf .phpunit
215215
fi
@@ -236,20 +236,20 @@ install:
236236
fi
237237
238238
- |
239-
# For the master branch, when deps=high, the version before master is checked out and tested with the locally patched components
240-
if [[ $deps = high && $TRAVIS_BRANCH = master ]]; then
239+
# For the .x branch, when deps=high, the version before .x is checked out and tested with the locally patched components
240+
if [[ $deps = high && $TRAVIS_BRANCH = *.x ]]; then
241241
export FLIP='🙃'
242242
export SYMFONY_VERSION=$(git ls-remote --heads | grep -o '/[1-9].*' | tail -n 1 | sed s/.//) &&
243243
git fetch --depth=2 origin $SYMFONY_VERSION &&
244244
git checkout -m FETCH_HEAD &&
245245
export COMPONENTS=$(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -printf '%h\n' | sort)
246246
else
247-
export SYMFONY_VERSION=$(cat composer.json | grep '^ *"dev-master". *"[1-9]' | grep -o '[0-9.]*')
247+
export SYMFONY_VERSION=$(cat composer.json | grep '^ *"version". *"[1-9]' | grep -o '[0-9.]*')
248248
fi
249249
250250
- |
251-
# Skip the phpunit-bridge on not-master branches when $deps is empty
252-
if [[ ! $deps && $TRAVIS_BRANCH != master ]]; then
251+
# Skip the phpunit-bridge on bugfix-only branches when $deps is empty
252+
if [[ ! $deps && ! $TRAVIS_BRANCH = *.x ]]; then
253253
export COMPONENTS=$(find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist -not -wholename '*/Bridge/PhpUnit/*' -printf '%h\n' | sort)
254254
fi
255255
@@ -271,7 +271,7 @@ install:
271271
272272
- |
273273
# Legacy tests are skipped when deps=high and when the current branch version has not the same major version number as the next one
274-
[[ $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
274+
[[ $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
275275
276276
export COMPOSER_ROOT_VERSION=$SYMFONY_VERSION.x-dev
277277
if [[ $deps ]]; then mv composer.json.phpunit composer.json; fi
@@ -296,7 +296,7 @@ install:
296296
(cd src/Symfony/Component/HttpFoundation; mv composer.bak composer.json)
297297
COMPONENTS=$(git diff --name-only src/ | grep composer.json || true)
298298
299-
if [[ $COMPONENTS && $LEGACY && $TRAVIS_BRANCH != master && $TRAVIS_PULL_REQUEST != false ]]; then
299+
if [[ $COMPONENTS && $LEGACY && ! $TRAVIS_BRANCH = *.x && $TRAVIS_PULL_REQUEST != false ]]; then
300300
export FLIP='🙃'
301301
SYMFONY_VERSION=$(echo $SYMFONY_VERSION | awk '{print $1 - 1}')
302302
echo -e "\\n\\e[33;1mChecking out Symfony $SYMFONY_VERSION and running tests with patched components as deps\\e[0m"

‎composer.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -161,9 +161,5 @@
161161
}
162162
],
163163
"minimum-stability": "dev",
164-
"extra": {
165-
"branch-alias": {
166-
"dev-master": "4.4-dev"
167-
}
168-
}
164+
"version": "4.4-dev"
169165
}

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,5 @@
7171
]
7272
},
7373
"minimum-stability": "dev",
74-
"extra": {
75-
"branch-alias": {
76-
"dev-master": "4.4-dev"
77-
}
78-
}
74+
"version": "4.4-dev"
7975
}

‎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": "4.4-dev"
49-
}
50-
}
46+
"version": "4.4-dev"
5147
}

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,10 @@
3838
],
3939
"minimum-stability": "dev",
4040
"extra": {
41-
"branch-alias": {
42-
"dev-master": "4.4-dev"
43-
},
4441
"thanks": {
4542
"name": "phpunit/phpunit",
4643
"url": "https://github.com/sebastianbergmann/phpunit"
4744
}
48-
}
45+
},
46+
"version": "4.4-dev"
4947
}

‎src/Symfony/Bridge/ProxyManager/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": "4.4-dev"
39-
}
40-
}
36+
"version": "4.4-dev"
4137
}

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,5 @@
7979
]
8080
},
8181
"minimum-stability": "dev",
82-
"extra": {
83-
"branch-alias": {
84-
"dev-master": "4.4-dev"
85-
}
86-
}
82+
"version": "4.4-dev"
8783
}

‎src/Symfony/Bundle/DebugBundle/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": "4.4-dev"
48-
}
49-
}
45+
"version": "4.4-dev"
5046
}

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,5 @@
107107
]
108108
},
1091 F438 09
"minimum-stability": "dev",
110-
"extra": {
111-
"branch-alias": {
112-
"dev-master": "4.4-dev"
113-
}
114-
}
110+
"version": "4.4-dev"
115111
}

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,5 @@
5959
]
6060
},
6161
"minimum-stability": "dev",
62-
"extra": {
63-
"branch-alias": {
64-
"dev-master": "4.4-dev"
65-
}
66-
}
62+
"version": "4.4-dev"
6763
}

‎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": "4.4-dev"
57-
}
58-
}
54+
"version": "4.4-dev"
5955
}

‎src/Symfony/Bundle/WebProfilerBundle/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": "4.4-dev"
48-
}
49-
}
45+
"version": "4.4-dev"
5046
}

‎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": "4.4-dev"
41-
}
42-
}
38+
"version": "4.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": "4.4-dev"
38-
}
39-
}
35+
"version": "4.4-dev"
4036
}

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,5 @@
3535
]
3636
},
3737
"minimum-stability": "dev",
38-
"extra": {
39-
"branch-alias": {
40-
"dev-master": "4.4-dev"
41-
}
42-
}
38+
"version": "4.4-dev"
4339
}

‎src/Symfony/Component/Cache/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": "4.4-dev"
57-
}
58-
}
54+
"version": "4.4-dev"
5955
}

‎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": "4.4-dev"
46-
}
47-
}
43+
"version": "4.4-dev"
4844
}

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,5 @@
5353
]
5454
},
5555
"minimum-stability": "dev",
56-
"extra": {
57-
"branch-alias": {
58-
"dev-master": "4.4-dev"
59-
}
60-
}
56+
"version": "4.4-dev"
6157
}

‎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": "4.4-dev"
35-
}
36-
}
32+
"version": "4.4-dev"
3733
}

‎src/Symfony/Component/Debug/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": "4.4-dev"
39-
}
40-
}
36+
"version": "4.4-dev"
4137
}

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,5 @@
4949
]
5050
},
5151
"minimum-stability": "dev",
52-
"extra": {
53-
"branch-alias": {
54-
"dev-master": "4.4-dev"
55-
}
56-
}
52+
"version": "4.4-dev"
5753
}

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,5 @@
3737
]
3838
},
3939
"minimum-stability": "dev",
40-
"extra": {
41-
"branch-alias": {
42-
"dev-master": "4.4-dev"
43-
}
44-
}
40+
"version": "4.4-dev"
4541
}

‎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": "4.4-dev"
34-
}
35-
}
31+
"version": "4.4-dev"
3632
}

‎src/Symfony/Component/ErrorHandler/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": "4.4-dev"
39-
}
40-
}
36+
"version": "4.4-dev"
4137
}

‎src/Symfony/Component/EventDispatcher/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": "4.4-dev"
53-
}
54-
}
50+
"version": "4.4-dev"
5551
}

‎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": "4.4-dev"
33-
}
34-
}
30+
"version": "4.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": "4.4-dev"
32-
}
33-
}
29+
"version": "4.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": "4.4-dev"
31-
}
32-
}
28+
"version": "4.4-dev"
3329
}

0 commit comments

Comments
 (0)
0