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

Commit e953dd3

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '3.4' into 4.4
* 3.4: Remove "version" from composer.json files, use "branch-version" instead
2 parents d79912d + 56a7571 commit e953dd3

File tree

73 files changed

+221
-83
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

+221
-83
lines changed

‎.appveyor.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,11 @@ install:
4646
- IF NOT EXIST composer.phar (appveyor DownloadFile https://github.com/composer/composer/releases/download/1.9.0/composer.phar)
4747
- php composer.phar self-update
4848
- copy /Y .github\composer-config.json %APPDATA%\Composer\config.json
49-
- php composer.phar global require --no-progress --no-scripts --no-plugins symfony/flex dev-master
49+
- php composer.phar global require --no-progress --no-scripts --no-plugins symfony/flex
5050
- git config --global user.email ""
5151
- git config --global user.name "Symfony"
52-
- php .github/build-packages.php "HEAD^" src\Symfony\Bridge\PhpUnit src\Symfony\Contracts
52+
- php .github/build-packages.php "HEAD^" src\Symfony\Bridge\PhpUnit
53+
- SET COMPOSER_ROOT_VERSION=%APPVEYOR_REPO_BRANCH%.x-dev
5354
- php composer.phar update --no-progress --no-suggest --ansi
5455
- php phpunit install
5556

‎.github/build-packages.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,11 @@
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->version)) {
54-
echo "Missing \"version\" in composer.json.\n";
53+
if (!isset($package->extra->{'branch-version'})) {
54+
echo "Missing \"branch-version\" in composer.json's \"extra\".\n";
5555
exit(1);
5656
}
57+
$package->version = substr_replace($package->extra->{'branch-version'}, '.x-dev', -4);
5758
$package->dist['type'] = 'tar';
5859
$package->dist['url'] = 'file://'.str_replace(DIRECTORY_SEPARATOR, '/', dirname(__DIR__))."/$dir/package.tar";
5960

@@ -62,8 +63,6 @@
6263
$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'));
6364
$versions = json_decode($versions)->packages->{$package->name};
6465

65-
unset($versions->{'dev-master'});
66-
6766
foreach ($versions as $v => $package) {
6867
$packages[$package->name] += array($v => $package);
6968
}

‎.travis.yml

Lines changed: 6 additions & 6 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 '^ *"version": *"[1-9]' | grep -o '[0-9.]*[0-9]')
212+
export SYMFONY_VERSION=$(cat src/Symfony/Bridge/PhpUnit/composer.json | grep '^ *"branch-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,19 +236,19 @@ install:
236236
fi
237237
238238
- |
239-
# For the .x branch, when deps=high, the version before .x is checked out and tested with the locally patched components
239+
# For the feature-branch, when deps=high, the version before it is checked out and tested with the locally patched components
240240
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 '^ *"version". *"[1-9]' | grep -o '[0-9.]*[0-9]')
247+
export SYMFONY_VERSION=$(cat composer.json | grep '^ *"branch-version": *"[1-9]' | grep -o '[0-9.]*')
248248
fi
249249
250250
- |
251-
# Skip the phpunit-bridge on bugfix-only branches when $deps is empty
251+
# Skip the phpunit-bridge on bugfix-branches when $deps is empty
252252
if [[ ! $deps && ! $TRAVIS_BRANCH = *.x ]]; then
253253
export COMPONENTS=$(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -not -wholename '*/Bridge/PhpUnit/*' -printf '%h\n' | sort)
254254
fi
@@ -267,11 +267,11 @@ install:
267267
else
268268
export SYMFONY_REQUIRE=">=$SYMFONY_VERSION"
269269
fi
270-
composer global require --no-progress --no-scripts --no-plugins symfony/flex dev-master
270+
composer global require --no-progress --no-scripts --no-plugins symfony/flex
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 '^ *"version". *"[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 '^ *"branch-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

‎composer.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,5 +161,7 @@
161161
}
162162
],
163163
"minimum-stability": "dev",
164-
"version": "4.4.x-dev"
164+
"extra": {
165+
"branch-version": "4.4-dev"
166+
}
165167
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,5 +71,7 @@
7171
]
7272
},
7373
"minimum-stability": "dev",
74-
"version": "4.4.x-dev"
74+
"extra": {
75+
"branch-version": "4.4-dev"
76+
}
7577
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,7 @@
4343
]
4444
},
4545
"minimum-stability": "dev",
46-
"version": "4.4.x-dev"
46+
"extra": {
47+
"branch-version": "4.4-dev"
48+
}
4749
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@
3838
],
3939
"minimum-stability": "dev",
4040
"extra": {
41+
"branch-version": "4.4-dev",
4142
"thanks": {
4243
"name": "phpunit/phpunit",
4344
"url": "https://github.com/sebastianbergmann/phpunit"
4445
}
45-
},
46-
"version": "4.4.x-dev"
46+
}
4747
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,7 @@
3333
]
3434
},
3535
"minimum-stability": "dev",
36-
"version": "4.4.x-dev"
36+
"extra": {
37+
"branch-version": "4.4-dev"
38+
}
3739
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,5 +79,7 @@
7979
]
8080
},
8181
"minimum-stability": "dev",
82-
"version": "4.4.x-dev"
82+
"extra": {
83+
"branch-version": "4.4-dev"
84+
}
8385
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,7 @@
4242
]
4343
},
4444
"minimum-stability": "dev",
45-
"version": "4.4.x-dev"
45+
"extra": {
46+
"branch-version": "4.4-dev"
47+
}
4648
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,5 +107,7 @@
107107
]
108108
},
109109
"minimum-stability": "dev",
110-
"version": "4.4.x-dev"
110+
"extra": {
111+
"branch-version": "4.4-dev"
112+
}
111113
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,5 +59,7 @@
5959
]
6060
},
6161
"minimum-stability": "dev",
62-
"version": "4.4.x-dev"
62+
"extra": {
63+
"branch-version": "4.4-dev"
64+
}
6365
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,7 @@
5151
]
5252
},
5353
"minimum-stability": "dev",
54-
"version": "4.4.x-dev"
54+
"extra": {
55+
"branch-version": "4.4-dev"
56+
}
5557
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,7 @@
4242
]
4343
},
4444
"minimum-stability": "dev",
45-
"version": "4.4.x-dev"
45+
"extra": {
46+
"branch-version": "4.4-dev"
47+
}
4648
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,7 @@
3535
"symfony/expression-language": "For using the filter option of the log server."
3636
},
3737
"minimum-stability": "dev",
38-
"version": "4.4.x-dev"
38+
"extra": {
39+
"branch-version": "4.4-dev"
40+
}
3941
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,7 @@
3232
]
3333
},
3434
"minimum-stability": "dev",
35-
"version": "4.4.x-dev"
35+
"extra": {
36+
"branch-version": "4.4-dev"
37+
}
3638
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,7 @@
3535
]
3636
},
3737
"minimum-stability": "dev",
38-
"version": "4.4.x-dev"
38+
"extra": {
39+
"branch-version": "4.4-dev"
40+
}
3941
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,7 @@
5151
]
5252
},
5353
"minimum-stability": "dev",
54-
"version": "4.4.x-dev"
54+
"extra": {
55+
"branch-version": "4.4-dev"
56+
}
5557
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,7 @@
4040
]
4141
},
4242
"minimum-stability": "dev",
43-
"version": "4.4.x-dev"
43+
"extra": {
44+
"branch-version": "4.4-dev"
45+
}
4446
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,5 +53,7 @@
5353
]
5454
},
5555
"minimum-stability": "dev",
56-
"version": "4.4.x-dev"
56+
"extra": {
57+
"branch-version": "4.4-dev"
58+
}
5759
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,7 @@
2929
]
3030
},
3131
"minimum-stability": "dev",
32-
"version": "4.4.x-dev"
32+
"extra": {
33+
"branch-version": "4.4-dev"
34+
}
3335
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,7 @@
3333
]
3434
},
3535
"minimum-stability": "dev",
36-
"version": "4.4.x-dev"
36+
"extra": {
37+
"branch-version": "4.4-dev"
38+
}
3739
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,7 @@
4949
]
5050
},
5151
"minimum-stability": "dev",
52-
"version": "4.4.x-dev"
52+
"extra": {
53+
"branch-version": "4.4-dev"
54+
}
5355
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,7 @@
3737
]
3838
},
3939
"minimum-stability": "dev",
40-
"version": "4.4.x-dev"
40+
"extra": {
41+
"branch-version": "4.4-dev"
42+
}
4143
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,7 @@
2828
]
2929
},
3030
"minimum-stability": "dev",
31-
"version": "4.4.x-dev"
31+
"extra": {
32+
"branch-version": "4.4-dev"
33+
}
3234
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,7 @@
3333
]
3434
},
3535
"minimum-stability": "dev",
36-
"version": "4.4.x-dev"
36+
"extra": {
37+
"branch-version": "4.4-dev"
38+
}
3739
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,5 +47,7 @@
4747
]
4848
},
4949
"minimum-stability": "dev",
50-
"version": "4.4.x-dev"
50+
"extra": {
51+
"branch-version": "4.4-dev"
52+
}
5153
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,7 @@
2727
]
2828
},
2929
"minimum-stability": "dev",
30-
"version": "4.4.x-dev"
30+
"extra": {
31+
"branch-version": "4.4-dev"
32+
}
3133
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,7 @@
2626
]
2727
},
2828
"minimum-stability": "dev",
29-
"version": "4.4.x-dev"
29+
"extra": {
30+
"branch-version": "4.4-dev"
31+
}
3032
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,7 @@
2525
]
2626
},
2727
"minimum-stability": "dev",
28-
"version": "4.4.x-dev"
28+
"extra": {
29+
"branch-version": "4.4-dev"
30+
}
2931
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,5 +61,7 @@
6161
]
6262
},
6363
"minimum-stability": "dev",
64-
"version": "4.4.x-dev"
64+
"extra": {
65+
"branch-version": "4.4-dev"
66+
}
6567
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,7 @@
4343
]
4444
},
4545
"minimum-stability": "dev",
46-
"version": "4.4.x-dev"
46+
"extra": {
47+
"branch-version": "4.4-dev"
48+
}
4749
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,7 @@
3131
]
3232
},
3333
"minimum-stability": "dev",
34-
"version": "4.4.x-dev"
34+
"extra": {
35+
"branch-version": "4.4-dev"
36+
}
3537
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,5 +68,7 @@
6868
]
6969
},
7070
"minimum-stability": "dev",
71-
"version": "4.4.x-dev"
71+
"extra": {
72+
"branch-version": "4.4-dev"
73+
}
7274
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,7 @@
3333
]
3434
},
3535
"minimum-stability": "dev",
36-
"version": "4.4.x-dev"
36+
"extra": {
37+
"branch-version": "4.4-dev"
38+
}
3739
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,7 @@
4141
]
4242
},
4343
"minimum-stability": "dev",
44-
"version": "4.4.x-dev"
44+
"extra": {
45+
"branch-version": "4.4-dev"
46+
}
4547
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,7 @@
3333
]
3434
},
3535
"minimum-stability": "dev",
36-
"version": "4.4.x-dev"
36+
"extra": {
37+
"branch-version": "4.4-dev"
38+
}
3739
}

0 commit comments

Comments
 (0)
0