这是indexloc提供的服务,不要输入任何密码
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ jobs:
name: Build and test
strategy:
matrix:
php: [7.3, 7.4, 8.0]
php: [7.4, 8.0]
deps: [high]
include:
- php: 7.3
- php: 7.4
deps: low

steps:
Expand All @@ -42,13 +42,13 @@ jobs:
run: make update-min test-min

- uses: actions/upload-artifact@v1
if: matrix.php == '7.3' && matrix.deps == 'high'
if: matrix.php == '7.4' && matrix.deps == 'high'
with:
name: toolbox.phar
path: build/toolbox.phar

- uses: actions/upload-artifact@v1
if: matrix.php == '7.3' && matrix.deps == 'high'
if: matrix.php == '7.4' && matrix.deps == 'high'
with:
name: devkit.phar
path: build/devkit.phar
Expand All @@ -59,7 +59,7 @@ jobs:
needs: tests
strategy:
matrix:
php: [7.3, 7.4, 8.0]
php: [7.4, 8.0]

steps:
- uses: actions/checkout@v2
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ package: tools/box
sed -e 's/Application('"'"'dev/Application('"'"'$(TOOLBOX_VERSION)/g' bin/toolbox.php > build/phar/bin/toolbox.php

cd build/phar && \
composer config platform.php 7.3 && \
composer config platform.php 7.4.7 && \
composer update --no-dev -o -a

tools/box compile
Expand All @@ -83,7 +83,7 @@ package-devkit: tools/box
sed -e 's/\(Application(.*\)'"'"'dev/\1'"'"'$(TOOLBOX_VERSION)/g' bin/devkit.php > build/devkit-phar/bin/devkit.php

cd build/devkit-phar && \
composer config platform.php 7.3 && \
composer config platform.php 7.4.7 && \
composer update --no-dev -o -a

tools/box compile -c box-devkit.json.dist
Expand Down Expand Up @@ -137,8 +137,8 @@ tools/php-cs-fixer:
curl -Ls https://cs.symfony.com/download/php-cs-fixer-v3.phar -o tools/php-cs-fixer && chmod +x tools/php-cs-fixer

tools/deptrac:
curl -Ls https://github.com/qossmic/deptrac/releases/download/0.14.0/deptrac.phar -o tools/deptrac && chmod +x tools/deptrac
curl -Ls https://github.com/qossmic/deptrac/releases/download/0.14.0/deptrac.phar.asc -o tools/deptrac.asc
curl -Ls https://github.com/qossmic/deptrac/releases/download/0.18.0/deptrac.phar -o tools/deptrac && chmod +x tools/deptrac
curl -Ls https://github.com/qossmic/deptrac/releases/download/0.18.0/deptrac.phar.asc -o tools/deptrac.asc

tools/box:
curl -Ls https://github.com/humbug/box/releases/download/3.13.0/box.phar -o tools/box && chmod +x tools/box
167 changes: 83 additions & 84 deletions README.md

Large diffs are not rendered by default.

7 changes: 3 additions & 4 deletions bin/devkit.php
Original file line number Diff line number Diff line change
Expand Up @@ -73,17 +73,16 @@ protected function execute(InputInterface $input, OutputInterface $output)
$readmePath = $input->getOption('readme');
$tools = $this->loadTools($jsonPath);

$toolsList = '| Name | Description | PHP 7.3 | PHP 7.4 | PHP 8.0' . PHP_EOL;
$toolsList .= '| :--- | :---------- | :------ | :------ | :------' . PHP_EOL;
$toolsList = '| Name | Description | PHP 7.4 | PHP 8.0' . PHP_EOL;
$toolsList .= '| :--- | :---------- | :------ | :------' . PHP_EOL;
$toolsList .= $tools->sort(function (Tool $left, Tool $right) {
return strcasecmp($left->name(), $right->name());
})->reduce('', function ($acc, Tool $tool) {

return $acc . sprintf('| %s | [%s](%s) | %s | %s | %s |',
return $acc . sprintf('| %s | [%s](%s) | %s | %s |',
$tool->name(),
$tool->summary(),
$tool->website(),
in_array('exclude-php:7.3', $tool->tags(), true) ? '❌' : '✅' ,
in_array('exclude-php:7.4', $tool->tags(), true) ? '❌' : '✅' ,
in_array('exclude-php:8.0', $tool->tags(), true) ? '❌' : '✅'
) . PHP_EOL;
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
"description": "Helps to discover and install tools",
"type": "project",
"require": {
"php": "^7.3 || ~8.0.0",
"php": "^7.4.7 || ~8.0.0",
"symfony/console": "^4.4 || ^5.3",
"psr/container": "^1.0"
},
"require-dev": {
"phpunit/phpunit": "^9.5",
"zalas/phpunit-globals": "^2.1",
"phpspec/prophecy-phpunit": "^2.0",
"infection/infection": "^0.18 || ^0.20.2"
"infection/infection": "^0.25.4"
},
"autoload": {
"psr-4": {
Expand Down
2 changes: 2 additions & 0 deletions infection.json.dist
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
"@default": true,
"IdenticalEqual": false,
"NotIdenticalNotEqual": false,
"Concat": false,
"ConcatOperandRemoval": false,
"ArrayItemRemoval": {
"ignore": [
"Zalas\\Toolbox\\Cli\\Command\\ListCommand::execute"
Expand Down
2 changes: 1 addition & 1 deletion resources/architecture.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
}
},
"test": "deptrac list",
"tags": ["featured", "architecture", "exclude-php:7.3"]
"tags": ["featured", "architecture"]
},
{
"name": "pdepend",
Expand Down
2 changes: 1 addition & 1 deletion resources/compatibility.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
}
},
"test": "roave-backward-compatibility-check --version",
"tags": ["exclude-php:7.3", "exclude-php:8.0", "compatibility"]
"tags": ["exclude-php:8.0", "compatibility"]
}
]
}
14 changes: 1 addition & 13 deletions resources/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,19 +38,7 @@
}
},
"test": "composer-require-checker -V",
"tags": ["exclude-php:7.3", "composer"]
},
{
"name": "composer-require-checker-v2",
"summary": "Verify that no unknown symbols are used in the sources of a package.",
"website": "https://github.com/maglnet/ComposerRequireChecker",
"command": {
"composer-global-install": {
"package": "maglnet/composer-require-checker:^2.0"
}
},
"test": "composer-require-checker -V",
"tags": ["exclude-php:7.4", "exclude-php:8.0", "composer"]
"tags": ["composer"]
}
]
}
2 changes: 1 addition & 1 deletion resources/linting.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
}
},
"test": "phplint -V",
"tags": ["exclude-php:7.3", "linting"]
"tags": ["linting"]
},
{
"name": "twig-lint",
Expand Down
4 changes: 2 additions & 2 deletions resources/test.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
}
},
"test": "infection --version",
"tags": ["featured", "exclude-php:7.3", "test"]
"tags": ["featured", "test"]
},
{
"name": "paratest",
Expand Down Expand Up @@ -79,7 +79,7 @@
}
},
"test": "php-fuzzer --help",
"tags": ["exclude-php:7.3", "test"]
"tags": ["test"]
},
{
"name": "phpspec",
Expand Down