Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix licenses summary with missing license info #10536

Closed
wants to merge 65 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
d2ede37
Bump target version, bump PHP and dependency requirements to PHP 7.2+
Seldaek Dec 8, 2021
2a771df
Update PHPUnit to 8.5
Seldaek Dec 8, 2021
bf72afe
Fix Symfony6 compat
Seldaek Dec 8, 2021
59603a3
Remove PHPUnit direct require again
Seldaek Dec 9, 2021
095c36e
Fix some PHPStan errors/..
Seldaek Dec 9, 2021
ffd6279
Get rid of all the ->at() mock invocations
Seldaek Dec 9, 2021
32dcb93
Update extra files for latest polyfill lib
Seldaek Dec 9, 2021
6ed3aeb
Remove setExpectedException wrapper
Seldaek Dec 9, 2021
96486d8
Fix many PHPStan issues and update baseline
Seldaek Dec 9, 2021
ed08c40
Fix phar build
Seldaek Dec 9, 2021
22fed0d
Get rid of prophecy usage
Seldaek Dec 10, 2021
e4e0e0d
Remove deprecations baseline
Seldaek Dec 10, 2021
4f7d06e
Mark PHP8.1 phpstan build experimental
Seldaek Dec 10, 2021
ccd87c4
Test fixes
Seldaek Dec 10, 2021
a4a2b6d
Make SvnDriverTest and XzDownloaderTest more portable on Windows
Seldaek Dec 31, 2021
0b3adc8
Fix a few phpstan errors and add a php8+ baseline for the rest
Seldaek Jan 1, 2022
7e27a25
Get rid of RetutnTypeWillChange where possible, fixes #10014
Seldaek Jan 1, 2022
efa08e7
Merge pull request #10343 from Seldaek/drop_old_php
Seldaek Jan 3, 2022
5805a68
Fix some todos dropping support for older Symfony releases
Seldaek Jan 3, 2022
4e6d54b
Fix all 5.3 $this-in-closure usages
Seldaek Jan 3, 2022
0ece276
Get rid of redundant \Exception catch blocks
Seldaek Jan 3, 2022
e6cfc92
Merge pull request #10420 from Seldaek/php53_cleanups
Seldaek Jan 3, 2022
1c92846
Remove code blocks for php <7.2 compatibility (#10417)
Nielsvanpach Jan 3, 2022
36da81b
Remove obsolete Symfony feature detections (#10425)
derrabus Jan 4, 2022
7e50f37
Remove some dead code and deprecate JsonFormatter, JsonFile::JSON_* c…
Seldaek Jan 4, 2022
4fdc8b8
dirname(__FILE__) no longer needed
mvorisek Nov 6, 2020
06e445c
Drop PHP <7.2 and HHVM support from autoload_real, individual autoloa…
Seldaek Jan 4, 2022
0be1e5a
Merge branch '2.2' into main
Seldaek Jan 4, 2022
404c58a
Merge pull request #10428 from Seldaek/deprecations
Seldaek Jan 4, 2022
99fa611
Merge branch '2.2' into main
Seldaek Jan 4, 2022
711f436
Use finally to restore error handler after command runs
Seldaek Jan 4, 2022
06bb3c9
Add links to repo to show/outdated commands package lists, fixes #9367
Seldaek Jan 4, 2022
f9d61c0
Add links to repo to fund/licenses/search commands and add links to d…
Seldaek Jan 5, 2022
ef2b52e
Make the package name bold in plugin activation warnings
Seldaek Jan 5, 2022
f7ce907
Update plugin-api in docs
Seldaek Jan 5, 2022
b96c419
Merge pull request #10430 from Seldaek/add_links
Seldaek Jan 5, 2022
3a27cb2
Merge branch '2.2' into main
Seldaek Jan 5, 2022
7d1aa65
Merge branch '2.2' into main
Seldaek Jan 5, 2022
5f0a3f4
Allow xdebug-handler 3.x, update deps
Seldaek Jan 3, 2022
9d6cf58
Merge pull request #10416 from Seldaek/update_deps
Seldaek Jan 5, 2022
5e4a8a8
Allow ProcessExecutor to receive commands as arrays, refs #6552 (#10435)
Seldaek Jan 6, 2022
f1568f1
Merge branch '2.2' into main
Seldaek Jan 7, 2022
3844e05
Merge branch '2.2' into main
Seldaek Jan 7, 2022
9466e68
Require latest phpstan
Seldaek Jan 7, 2022
3d6bf8c
Merge branch '2.2' into main
Seldaek Jan 7, 2022
e2ba625
Merge branch '2.2' into main
Seldaek Jan 7, 2022
13bd212
Merge branch '2.2' into main
Seldaek Jan 7, 2022
49541ce
Merge branch '2.2' into main
Seldaek Jan 8, 2022
b9c368a
Use new url for semver testing tool (#10449)
jdrieghe Jan 10, 2022
4a45718
Allow psr/log ^3.0 (#10454)
simPod Jan 13, 2022
9633216
Fix simple typo and slightly reword phrase. (#10456)
jameswatts Jan 13, 2022
cd34886
Update to PHPStan 1.4 (#10459)
ondrejmirtes Jan 17, 2022
a943aac
Update to PHPStan 1.4.1 (#10466)
ondrejmirtes Jan 21, 2022
bab9745
Merge branch '2.2' into main
Seldaek Jan 21, 2022
31429ce
Update baselines
Seldaek Jan 21, 2022
bf1ad4d
Make sure test runs in isolated dir
Seldaek Jan 21, 2022
7f18085
Merge branch '2.2' into main
Seldaek Jan 21, 2022
3ae1111
Improve documentation (#10477)
houssemz Jan 21, 2022
1704466
Add abandoned flag to show/outdated commands package lists (#10485)
boesing Feb 3, 2022
3446091
Merge branch '2.2' into main
Seldaek Feb 4, 2022
4b67a97
Update baseline
Seldaek Feb 4, 2022
ac8fb8c
Merge branch '2.2' into main
Seldaek Feb 4, 2022
a0b0ddc
Add config option for update reference in path repository (#10488)
sveneld Feb 7, 2022
ae68ada
Merge branch '2.2' into main
Seldaek Feb 8, 2022
280fcbf
Handle missing license when showing license summary
gzumba Feb 15, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
48 changes: 14 additions & 34 deletions .github/workflows/continuous-integration.yml
Expand Up @@ -22,12 +22,6 @@ jobs:
strategy:
matrix:
php-version:
- "5.3"
- "5.4"
- "5.5"
- "5.6"
- "7.0"
- "7.1"
- "7.2"
- "7.3"
- "7.4"
Expand All @@ -37,30 +31,34 @@ jobs:
os: [ubuntu-latest]
experimental: [false]
include:
- php-version: "5.3"
- php-version: "7.2"
dependencies: highest
os: ubuntu-latest
experimental: false
- php-version: "5.3"
- php-version: "7.2"
dependencies: lowest
os: ubuntu-latest
experimental: false
- php-version: "8.0"
- php-version: "8.1"
dependencies: highest
os: ubuntu-latest
experimental: false
- php-version: "8.1"
os: windows-latest
dependencies: locked
experimental: false
- php-version: "8.0"
- php-version: "8.1"
os: macos-latest
dependencies: locked
experimental: false
- php-version: "8.1"
dependencies: lowest
- php-version: "8.2"
dependencies: lowest-ignore
os: ubuntu-latest
experimental: false
- php-version: "8.1"
dependencies: highest
experimental: true
- php-version: "8.2"
dependencies: highest-ignore
os: ubuntu-latest
experimental: false
experimental: true

steps:
- name: "Checkout"
Expand Down Expand Up @@ -99,24 +97,6 @@ jobs:
if: "matrix.dependencies == 'locked'"
run: "composer install ${{ env.COMPOSER_FLAGS }}"

- name: "Require latest PHPUnitBridge for PHP 8.x"
if: "startsWith(matrix.php-version, '8.')"
# using ~ here to avoid issues with windows CLI removing the ^
run: 'composer require --no-update --dev "symfony/phpunit-bridge:~5.2"'

# temporary fix until phpunit-bridge has a release supporting 8.1
- name: "Require latest dev PHPUnitBridge for PHP 8.1"
if: "matrix.experimental"
# using ~ here to avoid issues with windows CLI removing the ^
run: 'composer require --no-update --dev "symfony/phpunit-bridge:~5.4@dev"'

- name: "Set ignored deprecations for php 8.1+ on lowest or locked deps"
if: "matrix.php-version >= '8.1' && !contains(matrix.dependencies, 'highest')"
run: "echo \"SYMFONY_DEPRECATIONS_HELPER=baselineFile=./tests/deprecations-8.1.json&max[direct]=0\" >> $GITHUB_ENV"

- name: "Update dev requirements to latest available for the current PHP even on locked builds as they are not bundled dependencies"
run: "composer config platform --unset && composer update ${{ env.COMPOSER_FLAGS }} symfony/phpunit-bridge phpspec/prophecy phpdocumentor/* sebastian/* doctrine/instantiator"

- name: "Run install again using composer binary from source"
run: "bin/composer install ${{ env.COMPOSER_FLAGS }}"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
matrix:
php-version:
- "5.3"
- "7.2"
- "latest"

steps:
Expand Down
23 changes: 16 additions & 7 deletions .github/workflows/phpstan.yml
Expand Up @@ -17,11 +17,16 @@ jobs:
name: "PHPStan"

runs-on: ubuntu-latest
continue-on-error: ${{ matrix.experimental }}

strategy:
matrix:
php-version:
- "7.4"
include:
- php-version: "7.2"
experimental: false
- php-version: "8.1"
experimental: true
fail-fast: false

steps:
- name: "Checkout"
Expand All @@ -46,12 +51,16 @@ jobs:
key: "php-${{ matrix.php-version }}-symfony-php-unit-version-${{ env.SYMFONY_PHPUNIT_VERSION }}-${{ hashFiles('**/composer.lock') }}"
restore-keys: "php-${{ matrix.php-version }}-symfony-php-unit-version-${{ env.SYMFONY_PHPUNIT_VERSION }}"

- name: "Install highest dependencies from composer.json using composer binary provided by system"
- name: "Install highest dependencies"
if: "matrix.experimental == true"
run: "composer config platform --unset && composer update ${{ env.COMPOSER_FLAGS }}"

- name: "Install PHPStan"
# Locked to phpunit 7.5 here as newer ones have void return types which break inheritance
run: "bin/composer require --dev phpstan/phpstan:1.4.* phpstan/phpstan-phpunit:1.0.* phpstan/phpstan-deprecation-rules:1.0.* phpstan/phpstan-strict-rules:1.1.* phpunit/phpunit:^7.5.20 --with-all-dependencies ${{ env.COMPOSER_FLAGS }}"
- name: "Install locked dependencies"
if: "matrix.experimental == false"
run: "composer config platform --unset && composer update ${{ env.COMPOSER_FLAGS }}"

- name: "Initialize PHPUnit sources"
run: "vendor/bin/simple-phpunit --filter NO_TEST_JUST_AUTOLOAD_THANKS"

- name: "Run PHPStan"
run: "vendor/bin/phpstan analyse --configuration=phpstan/config.neon"
run: "composer phpstan"
45 changes: 18 additions & 27 deletions composer.json
Expand Up @@ -22,26 +22,29 @@
}
],
"require": {
"php": "^5.3.2 || ^7.0 || ^8.0",
"php": "^7.2.5 || ^8.0",
"composer/ca-bundle": "^1.0",
"composer/metadata-minifier": "^1.0",
"composer/semver": "^3.0",
"composer/spdx-licenses": "^1.2",
"composer/xdebug-handler": "^2.0",
"composer/xdebug-handler": "^2 || ^3.0.1",
"justinrainbow/json-schema": "^5.2.11",
"psr/log": "^1.0 || ^2.0",
"psr/log": "^1.0 || ^2.0 || ^3.0",
"seld/jsonlint": "^1.4",
"seld/phar-utils": "^1.0",
"symfony/console": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0",
"symfony/filesystem": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0",
"symfony/finder": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0",
"symfony/process": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0",
"react/promise": "^1.2 || ^2.7",
"seld/phar-utils": "^1.2",
"symfony/console": "^5.4.1 || ^6.0",
"symfony/filesystem": "^5.4 || ^6.0",
"symfony/finder": "^5.4 || ^6.0",
"symfony/process": "^5.4 || ^6.0",
"react/promise": "^2.8",
"composer/pcre": "^1.0"
},
"require-dev": {
"symfony/phpunit-bridge": "^4.2 || ^5.0 || ^6.0",
"phpspec/prophecy": "^1.10"
"symfony/phpunit-bridge": "^6.0",
"phpstan/phpstan": "^1.4.1",
"phpstan/phpstan-phpunit": "^1.0",
"phpstan/phpstan-deprecation-rules": "^1",
"phpstan/phpstan-strict-rules": "^1"
},
"suggest": {
"ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
Expand All @@ -50,13 +53,13 @@
},
"config": {
"platform": {
"php": "5.3.9"
"php": "7.2.5"
},
"platform-check": false
},
"extra": {
"branch-alias": {
"dev-main": "2.2-dev"
"dev-main": "2.3-dev"
}
},
"autoload": {
Expand All @@ -66,32 +69,20 @@
},
"autoload-dev": {
"psr-4": {
"Composer\\Test\\": "tests/Composer/Test",
"Composer\\PHPStanRules\\": "phpstan/Rules/src",
"Composer\\PHPStanRulesTests\\": "phpstan/Rules/tests"
},
"classmap": [
"phpstan/Rules/tests/data"
]
"Composer\\Test\\": "tests/Composer/Test"
}
},
"bin": [
"bin/composer"
],
"scripts": {
"compile": "@php -dphar.readonly=0 bin/compile",
"test": "@php simple-phpunit",
"phpstan-setup": [
"@composer config platform --unset",
"@composer update",
"@composer require --dev phpstan/phpstan:1.4.* phpstan/phpstan-phpunit:1.0.* phpstan/phpstan-deprecation-rules:1.0.* phpstan/phpstan-strict-rules:1.1.* phpunit/phpunit:^7.5.20 --with-all-dependencies",
"git checkout composer.json composer.lock"
],
"phpstan": "@php vendor/bin/phpstan analyse --configuration=phpstan/config.neon"
},
"scripts-descriptions": {
"compile": "Compile composer.phar",
"test": "Run all tests",
"phpstan-setup": "Prepare environment to run PHPStan locally (must be run with PHP7.4)",
"phpstan": "Runs PHPStan (after phpstan-setup was executed, must be run with PHP7.4)"
},
"support": {
Expand Down