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
-------
9d40c796c4
Remove "branch-alias", populate "version"
This commit is contained in:
commit
b715f462b3
@ -57,7 +57,6 @@ install:
|
||||
- git config --global user.email ""
|
||||
- git config --global user.name "Symfony"
|
||||
- php .github/build-packages.php "HEAD^" src\Symfony\Bridge\PhpUnit
|
||||
- IF %APPVEYOR_REPO_BRANCH%==master (SET COMPOSER_ROOT_VERSION=dev-master) ELSE (SET COMPOSER_ROOT_VERSION=%APPVEYOR_REPO_BRANCH%.x-dev)
|
||||
- php composer.phar config platform.php 5.5.9
|
||||
- php composer.phar update --no-progress --no-suggest --ansi
|
||||
- php phpunit install
|
||||
|
12
.github/build-packages.php
vendored
12
.github/build-packages.php
vendored
@ -50,22 +50,20 @@ foreach ($dirs as $k => $dir) {
|
||||
passthru("cd $dir && git init && git add . && git commit -q -m - && git archive -o package.tar HEAD && rm .git/ -Rf");
|
||||
}
|
||||
|
||||
if (!isset($package->extra->{'branch-alias'}->{'dev-master'})) {
|
||||
echo "Missing \"dev-master\" branch-alias in composer.json extra.\n";
|
||||
if (!isset($package->version)) {
|
||||
echo "Missing \"version\" in composer.json.\n";
|
||||
exit(1);
|
||||
}
|
||||
$package->version = str_replace('-dev', '.x-dev', $package->extra->{'branch-alias'}->{'dev-master'});
|
||||
$package->version = str_replace('-dev', '.x-dev', $package->version);
|
||||
$package->dist['type'] = 'tar';
|
||||
$package->dist['url'] = 'file://'.str_replace(DIRECTORY_SEPARATOR, '/', dirname(__DIR__))."/$dir/package.tar";
|
||||
|
||||
$packages[$package->name][$package->version] = $package;
|
||||
|
||||
$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'));
|
||||
$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'));
|
||||
$versions = json_decode($versions)->packages->{$package->name};
|
||||
|
||||
if (isset($versions->{'dev-master'}) && $package->version === str_replace('-dev', '.x-dev', $versions->{'dev-master'}->extra->{'branch-alias'}->{'dev-master'})) {
|
||||
unset($versions->{'dev-master'});
|
||||
}
|
||||
unset($versions->{'dev-master'});
|
||||
|
||||
foreach ($versions as $v => $package) {
|
||||
$packages[$package->name] += array($v => $package);
|
||||
|
14
.travis.yml
14
.travis.yml
@ -228,7 +228,7 @@ install:
|
||||
git fetch --depth=2 origin refs/pull/$SYMFONY_PHPUNIT_BRIDGE_PR/head
|
||||
git rm -rq src/Symfony/Bridge/PhpUnit
|
||||
git checkout -q FETCH_HEAD -- src/Symfony/Bridge/PhpUnit
|
||||
export SYMFONY_VERSION=$(cat src/Symfony/Bridge/PhpUnit/composer.json | grep '^ *"dev-master". *"[1-9]' | grep -o '[0-9.]*')
|
||||
export SYMFONY_VERSION=$(cat src/Symfony/Bridge/PhpUnit/composer.json | grep '^ *"version": *"[1-9]' | grep -o '[0-9.]*')
|
||||
sed -i 's/"symfony\/phpunit-bridge": ".*"/"symfony\/phpunit-bridge": "'$SYMFONY_VERSION'.x@dev"/' composer.json
|
||||
rm -rf .phpunit
|
||||
fi
|
||||
@ -254,20 +254,20 @@ install:
|
||||
fi
|
||||
|
||||
- |
|
||||
# For the master branch, when deps=high, the version before master is checked out and tested with the locally patched components
|
||||
if [[ $deps = high && $TRAVIS_BRANCH = master ]]; then
|
||||
# For the .x branch, when deps=high, the version before .x is checked out and tested with the locally patched components
|
||||
if [[ $deps = high && $TRAVIS_BRANCH = *.x ]]; then
|
||||
export FLIP='🙃'
|
||||
export SYMFONY_VERSION=$(git ls-remote --heads | grep -o '/[1-9].*' | tail -n 1 | sed s/.//) &&
|
||||
git fetch --depth=2 origin $SYMFONY_VERSION &&
|
||||
git checkout -m FETCH_HEAD &&
|
||||
export COMPONENTS=$(find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist -printf '%h\n' | sort)
|
||||
else
|
||||
export SYMFONY_VERSION=$(cat composer.json | grep '^ *"dev-master". *"[1-9]' | grep -o '[0-9.]*')
|
||||
export SYMFONY_VERSION=$(cat composer.json | grep '^ *"version". *"[1-9]' | grep -o '[0-9.]*')
|
||||
fi
|
||||
|
||||
- |
|
||||
# Skip the phpunit-bridge on not-master branches when $deps is empty
|
||||
if [[ ! $deps && $TRAVIS_BRANCH != master ]]; then
|
||||
# Skip the phpunit-bridge on bugfix-only branches when $deps is empty
|
||||
if [[ ! $deps && ! $TRAVIS_BRANCH = *.x ]]; then
|
||||
export COMPONENTS=$(find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist -not -wholename '*/Bridge/PhpUnit/*' -printf '%h\n' | sort)
|
||||
fi
|
||||
|
||||
@ -289,7 +289,7 @@ install:
|
||||
|
||||
- |
|
||||
# Legacy tests are skipped when deps=high and when the current branch version has not the same major version number as the next one
|
||||
[[ $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
|
||||
[[ $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
|
||||
|
||||
export COMPOSER_ROOT_VERSION=$SYMFONY_VERSION.x-dev
|
||||
if [[ $deps ]]; then mv composer.json.phpunit composer.json; fi
|
||||
|
@ -134,9 +134,5 @@
|
||||
"files": [ "src/Symfony/Component/VarDumper/Resources/functions/dump.php" ]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
}
|
||||
"version": "3.4-dev"
|
||||
}
|
||||
|
@ -57,9 +57,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
}
|
||||
"version": "3.4-dev"
|
||||
}
|
||||
|
@ -43,9 +43,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
}
|
||||
"version": "3.4-dev"
|
||||
}
|
||||
|
@ -30,9 +30,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
}
|
||||
"version": "3.4-dev"
|
||||
}
|
||||
|
@ -67,9 +67,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
}
|
||||
"version": "3.4-dev"
|
||||
}
|
||||
|
@ -41,9 +41,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
}
|
||||
"version": "3.4-dev"
|
||||
}
|
||||
|
@ -91,9 +91,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
}
|
||||
"version": "3.4-dev"
|
||||
}
|
||||
|
@ -62,9 +62,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
}
|
||||
"version": "3.4-dev"
|
||||
}
|
||||
|
@ -51,9 +51,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
}
|
||||
"version": "3.4-dev"
|
||||
}
|
||||
|
@ -45,9 +45,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
}
|
||||
"version": "3.4-dev"
|
||||
}
|
||||
|
@ -35,9 +35,5 @@
|
||||
"symfony/expression-language": "For using the filter option of the log server."
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
}
|
||||
"version": "3.4-dev"
|
||||
}
|
||||
|
@ -32,9 +32,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
}
|
||||
"version": "3.4-dev"
|
||||
}
|
||||
|
@ -33,9 +33,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
}
|
||||
"version": "3.4-dev"
|
||||
}
|
||||
|
@ -42,9 +42,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
}
|
||||
"version": "3.4-dev"
|
||||
}
|
||||
|
@ -32,9 +32,5 @@
|
||||
"/Tests/"
|
||||
]
|
||||
},
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
}
|
||||
"version": "3.4-dev"
|
||||
}
|
||||
|
@ -40,9 +40,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
}
|
||||
"version": "3.4-dev"
|
||||
}
|
||||
|
@ -48,9 +48,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
}
|
||||
"version": "3.4-dev"
|
||||
}
|
||||
|
@ -29,9 +29,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
}
|
||||
"version": "3.4-dev"
|
||||
}
|
||||
|
@ -32,9 +32,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
}
|
||||
"version": "3.4-dev"
|
||||
}
|
||||
|
@ -47,9 +47,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
}
|
||||
"version": "3.4-dev"
|
||||
}
|
||||
|
@ -33,9 +33,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
}
|
||||
"version": "3.4-dev"
|
||||
}
|
||||
|
@ -28,9 +28,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
}
|
||||
"version": "3.4-dev"
|
||||
}
|
||||
|
@ -40,9 +40,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
}
|
||||
"version": "3.4-dev"
|
||||
}
|
||||
|
@ -27,9 +27,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
}
|
||||
"version": "3.4-dev"
|
||||
}
|
||||
|
@ -26,9 +26,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
}
|
||||
"version": "3.4-dev"
|
||||
}
|
||||
|
@ -25,9 +25,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
}
|
||||
"version": "3.4-dev"
|
||||
}
|
||||
|
@ -58,9 +58,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
}
|
||||
"version": "3.4-dev"
|
||||
}
|
||||
|
@ -30,9 +30,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
}
|
||||
"version": "3.4-dev"
|
||||
}
|
||||
|
@ -66,9 +66,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
}
|
||||
"version": "3.4-dev"
|
||||
}
|
||||
|
@ -33,9 +33,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
}
|
||||
"version": "3.4-dev"
|
||||
}
|
||||
|
@ -41,9 +41,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
}
|
||||
"version": "3.4-dev"
|
||||
}
|
||||
|
@ -28,9 +28,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
}
|
||||
"version": "3.4-dev"
|
||||
}
|
||||
|
@ -30,9 +30,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
}
|
||||
"version": "3.4-dev"
|
||||
}
|
||||
|
@ -25,9 +25,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
}
|
||||
"version": "3.4-dev"
|
||||
}
|
||||
|
@ -25,9 +25,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
}
|
||||
"version": "3.4-dev"
|
||||
}
|
||||
|
@ -33,9 +33,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
}
|
||||
"version": "3.4-dev"
|
||||
}
|
||||
|
@ -51,9 +51,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
}
|
||||
"version": "3.4-dev"
|
||||
}
|
||||
|
@ -46,9 +46,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
}
|
||||
"version": "3.4-dev"
|
||||
}
|
||||
|
@ -43,9 +43,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
}
|
||||
"version": "3.4-dev"
|
||||
}
|
||||
|
@ -37,9 +37,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
}
|
||||
"version": "3.4-dev"
|
||||
}
|
||||
|
@ -30,9 +30,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
}
|
||||
"version": "3.4-dev"
|
||||
}
|
||||
|
@ -44,9 +44,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
}
|
||||
"version": "3.4-dev"
|
||||
}
|
||||
|
@ -59,9 +59,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
}
|
||||
"version": "3.4-dev"
|
||||
}
|
||||
|
@ -55,9 +55,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
}
|
||||
"version": "3.4-dev"
|
||||
}
|
||||
|
@ -25,9 +25,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
}
|
||||
"version": "3.4-dev"
|
||||
}
|
||||
|
@ -32,9 +32,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
}
|
||||
"version": "3.4-dev"
|
||||
}
|
||||
|
@ -46,9 +46,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
}
|
||||
"version": "3.4-dev"
|
||||
}
|
||||
|
@ -62,9 +62,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
}
|
||||
"version": "3.4-dev"
|
||||
}
|
||||
|
@ -39,9 +39,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
}
|
||||
"version": "3.4-dev"
|
||||
}
|
||||
|
@ -35,9 +35,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
}
|
||||
"version": "3.4-dev"
|
||||
}
|
||||
|
@ -35,9 +35,5 @@
|
||||
"psr-4": { "Symfony\\Component\\Workflow\\": "" }
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
}
|
||||
"version": "3.4-dev"
|
||||
}
|
||||
|
@ -35,9 +35,5 @@
|
||||
]
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "3.4-dev"
|
||||
}
|
||||
}
|
||||
"version": "3.4-dev"
|
||||
}
|
||||
|
Reference in New Issue
Block a user