diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '3.4' into 4.4 

* 3.4:
  Remove "version" from composer.json files, use "branch-version" instead
This commit is contained in:
Nicolas Grekas 2020-10-13 14:30:56 +02:00
parent d79912d3d2 56a7571bab
commit e953dd3e0d
73 changed files with 221 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.appveyor.yml
View File

@ -46,10 +46,11 @@ install:
- IF NOT EXIST composer.phar (appveyor DownloadFile https://github.com/composer/composer/releases/download/1.9.0/composer.phar)
- php composer.phar self-update
- copy /Y .github\composer-config.json %APPDATA%\Composer\config.json
- php composer.phar global require --no-progress --no-scripts --no-plugins symfony/flex dev-master
- php composer.phar global require --no-progress --no-scripts --no-plugins symfony/flex
- git config --global user.email ""
- git config --global user.name "Symfony"
- php .github/build-packages.php "HEAD^" src\Symfony\Bridge\PhpUnit src\Symfony\Contracts
- php .github/build-packages.php "HEAD^" src\Symfony\Bridge\PhpUnit
- SET COMPOSER_ROOT_VERSION=%APPVEYOR_REPO_BRANCH%.x-dev
- php composer.phar update --no-progress --no-suggest --ansi
- php phpunit install

7
.github/build-packages.php vendored
View File

@ -50,10 +50,11 @@ 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->version)) {
echo "Missing \"version\" in composer.json.\n";
if (!isset($package->extra->{'branch-version'})) {
echo "Missing \"branch-version\" in composer.json's \"extra\".\n";
exit(1);
}
$package->version = substr_replace($package->extra->{'branch-version'}, '.x-dev', -4);
$package->dist['type'] = 'tar';
$package->dist['url'] = 'file://'.str_replace(DIRECTORY_SEPARATOR, '/', dirname(__DIR__))."/$dir/package.tar";
@ -62,8 +63,6 @@ foreach ($dirs as $k => $dir) {
$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};
unset($versions->{'dev-master'});
foreach ($versions as $v => $package) {
$packages[$package->name] += array($v => $package);
}

12
.travis.yml
View File

@ -209,7 +209,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 '^ *"version": *"[1-9]' | grep -o '[0-9.]*[0-9]')
export SYMFONY_VERSION=$(cat src/Symfony/Bridge/PhpUnit/composer.json | grep '^ *"branch-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
@ -236,7 +236,7 @@ install:
fi
- |
# For the .x branch, when deps=high, the version before .x is checked out and tested with the locally patched components
# For the feature-branch, when deps=high, the version before it 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/.//) &&
@ -244,11 +244,11 @@ install:
git checkout -m FETCH_HEAD &&
export COMPONENTS=$(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -printf '%h\n' | sort)
else
export SYMFONY_VERSION=$(cat composer.json | grep '^ *"version". *"[1-9]' | grep -o '[0-9.]*[0-9]')
export SYMFONY_VERSION=$(cat composer.json | grep '^ *"branch-version": *"[1-9]' | grep -o '[0-9.]*')
fi
- |
# Skip the phpunit-bridge on bugfix-only branches when $deps is empty
# Skip the phpunit-bridge on bugfix-branches when $deps is empty
if [[ ! $deps && ! $TRAVIS_BRANCH = *.x ]]; then
export COMPONENTS=$(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -not -wholename '*/Bridge/PhpUnit/*' -printf '%h\n' | sort)
fi
@ -267,11 +267,11 @@ install:
else
export SYMFONY_REQUIRE=">=$SYMFONY_VERSION"
fi
composer global require --no-progress --no-scripts --no-plugins symfony/flex dev-master
composer global require --no-progress --no-scripts --no-plugins symfony/flex
- |
# 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 '^ *"version". *"[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 '^ *"branch-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

4
composer.json
View File

@ -161,5 +161,7 @@
}
],
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Bridge/Doctrine/composer.json
View File

@ -71,5 +71,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Bridge/Monolog/composer.json
View File

@ -43,5 +43,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Bridge/PhpUnit/composer.json
View File

@ -38,10 +38,10 @@
],
"minimum-stability": "dev",
"extra": {
"branch-version": "4.4-dev",
"thanks": {
"name": "phpunit/phpunit",
"url": "https://github.com/sebastianbergmann/phpunit"
}
},
"version": "4.4.x-dev"
}
}

4
src/Symfony/Bridge/ProxyManager/composer.json
View File

@ -33,5 +33,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Bridge/Twig/composer.json
View File

@ -79,5 +79,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Bundle/DebugBundle/composer.json
View File

@ -42,5 +42,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Bundle/FrameworkBundle/composer.json
View File

@ -107,5 +107,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Bundle/SecurityBundle/composer.json
View File

@ -59,5 +59,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Bundle/TwigBundle/composer.json
View File

@ -51,5 +51,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Bundle/WebProfilerBundle/composer.json
View File

@ -42,5 +42,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Bundle/WebServerBundle/composer.json
View File

@ -35,5 +35,7 @@
"symfony/expression-language": "For using the filter option of the log server."
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Component/Asset/composer.json
View File

@ -32,5 +32,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Component/BrowserKit/composer.json
View File

@ -35,5 +35,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Component/Cache/composer.json
View File

@ -51,5 +51,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Component/Config/composer.json
View File

@ -40,5 +40,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Component/Console/composer.json
View File

@ -53,5 +53,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Component/CssSelector/composer.json
View File

@ -29,5 +29,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Component/Debug/composer.json
View File

@ -33,5 +33,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Component/DependencyInjection/composer.json
View File

@ -49,5 +49,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Component/DomCrawler/composer.json
View File

@ -37,5 +37,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Component/Dotenv/composer.json
View File

@ -28,5 +28,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Component/ErrorHandler/composer.json
View File

@ -33,5 +33,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Component/EventDispatcher/composer.json
View File

@ -47,5 +47,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Component/ExpressionLanguage/composer.json
View File

@ -27,5 +27,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Component/Filesystem/composer.json
View File

@ -26,5 +26,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Component/Finder/composer.json
View File

@ -25,5 +25,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Component/Form/composer.json
View File

@ -61,5 +61,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Component/HttpClient/composer.json
View File

@ -43,5 +43,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Component/HttpFoundation/composer.json
View File

@ -31,5 +31,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Component/HttpKernel/composer.json
View File

@ -68,5 +68,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Component/Inflector/composer.json
View File

@ -33,5 +33,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Component/Intl/composer.json
View File

@ -41,5 +41,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Component/Ldap/composer.json
View File

@ -33,5 +33,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Component/Lock/composer.json
View File

@ -33,5 +33,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Component/Mailer/Bridge/Amazon/composer.json
View File

@ -29,5 +29,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Component/Mailer/Bridge/Google/composer.json
View File

@ -29,5 +29,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Component/Mailer/Bridge/Mailchimp/composer.json
View File

@ -29,5 +29,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Component/Mailer/Bridge/Mailgun/composer.json
View File

@ -29,5 +29,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Component/Mailer/Bridge/Postmark/composer.json
View File

@ -29,5 +29,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Component/Mailer/Bridge/Sendgrid/composer.json
View File

@ -29,5 +29,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Component/Mailer/composer.json
View File

@ -44,5 +44,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Component/Messenger/composer.json
View File

@ -51,5 +51,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Component/Mime/composer.json
View File

@ -34,5 +34,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Component/OptionsResolver/composer.json
View File

@ -25,5 +25,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Component/Process/composer.json
View File

@ -25,5 +25,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Component/PropertyAccess/composer.json
View File

@ -32,5 +32,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Component/PropertyInfo/composer.json
View File

@ -51,5 +51,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Component/Routing/composer.json
View File

@ -46,5 +46,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Component/Security/Core/composer.json
View File

@ -49,5 +49,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Component/Security/Csrf/composer.json
View File

@ -35,5 +35,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Component/Security/Guard/composer.json
View File

@ -30,5 +30,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Component/Security/Http/composer.json
View File

@ -42,5 +42,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Component/Security/composer.json
View File

@ -62,5 +62,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Component/Serializer/composer.json
View File

@ -58,5 +58,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Component/Stopwatch/composer.json
View File

@ -26,5 +26,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Component/Templating/composer.json
View File

@ -32,5 +32,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Component/Translation/composer.json
View File

@ -52,5 +52,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Component/Validator/composer.json
View File

@ -69,5 +69,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Component/VarDumper/composer.json
View File

@ -47,5 +47,7 @@
"Resources/bin/var-dump-server"
],
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Component/VarExporter/composer.json
View File

@ -28,5 +28,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Component/WebLink/composer.json
View File

@ -40,5 +40,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Component/Workflow/composer.json
View File

@ -39,5 +39,7 @@
"psr-4": { "Symfony\\Component\\Workflow\\": "" }
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Component/Yaml/composer.json
View File

@ -35,5 +35,7 @@
]
},
"minimum-stability": "dev",
"version": "4.4.x-dev"
"extra": {
"branch-version": "4.4-dev"
}
}

4
src/Symfony/Contracts/Cache/composer.json
View File

@ -32,5 +32,7 @@
"url": "https://github.com/symfony/contracts"
}
},
"version": "1.1.x-dev"
"extra": {
"branch-version": "1.1-dev"
}
}

4
src/Symfony/Contracts/EventDispatcher/composer.json
View File

@ -32,5 +32,7 @@
"url": "https://github.com/symfony/contracts"
}
},
"version": "1.1.x-dev"
"extra": {
"branch-version": "1.1-dev"
}
}

4
src/Symfony/Contracts/HttpClient/composer.json
View File

@ -31,5 +31,7 @@
"url": "https://github.com/symfony/contracts"
}
},
"version": "1.1.x-dev"
"extra": {
"branch-version": "1.1-dev"
}
}

4
src/Symfony/Contracts/Service/composer.json
View File

@ -32,5 +32,7 @@
"url": "https://github.com/symfony/contracts"
}
},
"version": "1.1.x-dev"
"extra": {
"branch-version": "1.1-dev"
}
}

4
src/Symfony/Contracts/Translation/composer.json
View File

@ -31,5 +31,7 @@
"url": "https://github.com/symfony/contracts"
}
},
"version": "1.1.x-dev"
"extra": {
"branch-version": "1.1-dev"
}
}

4
src/Symfony/Contracts/composer.json
View File

@ -45,5 +45,7 @@
]
},
"minimum-stability": "dev",
"version": "1.1.x-dev"
"extra": {
"branch-version": "1.1-dev"
}
}