Skip to content

Commit 4aa135f

Browse files
committed
update to latest dependencies
1 parent bd96226 commit 4aa135f

File tree

6 files changed

+85
-44
lines changed

6 files changed

+85
-44
lines changed

.github/workflows/php.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Check
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
pull_request:
8+
branches:
9+
- master
10+
11+
jobs:
12+
build:
13+
14+
runs-on: ubuntu-latest
15+
16+
strategy:
17+
matrix:
18+
php-versions: [ '8.2', '8.3' ]
19+
20+
steps:
21+
- uses: actions/checkout@v2
22+
23+
- name: Setup PHP
24+
uses: shivammathur/setup-php@v2
25+
with:
26+
php-version: ${{ matrix.php-versions }}
27+
28+
- run: composer validate --strict -n
29+
- run: composer install --prefer-dist --no-progress --no-suggest
30+
- run: composer check

composer-unused.php

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
use ComposerUnused\ComposerUnused\Configuration\Configuration;
6+
use ComposerUnused\ComposerUnused\Configuration\NamedFilter;
7+
8+
return static function (Configuration $config): Configuration {
9+
return $config
10+
->addNamedFilter(NamedFilter::fromString('symfony/framework-bundle'))
11+
->addNamedFilter(NamedFilter::fromString('symfony/twig-bundle'))
12+
->addNamedFilter(NamedFilter::fromString('symfony/yaml'))
13+
->addNamedFilter(NamedFilter::fromString('shapecode/twig-string-loader'));
14+
};

composer.json

Lines changed: 27 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -28,28 +28,29 @@
2828
}
2929
],
3030
"require": {
31-
"php": "^7.4|^8.0",
31+
"php": "^8.1",
3232

33-
"symfony/framework-bundle": "^4.4|^5.4|^6.0",
34-
"symfony/dependency-injection": "^4.4|^5.4|^6.0",
35-
"symfony/http-kernel": "^4.4|^5.4|^6.0",
36-
"symfony/config": "^4.4|^5.4|^6.0",
37-
"symfony/twig-bundle": "^4.4|^5.4|^6.0",
38-
"symfony/yaml": "^4.4|^5.4|^6.0",
33+
"symfony/framework-bundle": "^5.4 || ^6.4 || ^7.0",
34+
"symfony/dependency-injection": "^5.4 || ^6.4 || ^7.0",
35+
"symfony/http-kernel": "^5.4 || ^6.4 || ^7.0",
36+
"symfony/config": "^5.4 || ^6.4 || ^7.0",
37+
"symfony/twig-bundle": "^5.4 || ^6.4 || ^7.0",
38+
"symfony/yaml": "^5.4 || ^6.4 || ^7.0",
3939

40-
"shapecode/twig-string-loader": "^1.1"
40+
"shapecode/twig-string-loader": "^2.0"
4141
},
4242
"require-dev": {
43-
"doctrine/coding-standard": "^9.0",
43+
"doctrine/coding-standard": "^12.0",
4444
"roave/security-advisories": "dev-master",
45-
"squizlabs/php_codesniffer": "^3.4",
46-
"phpstan/phpstan": "^1.4",
47-
"phpstan/phpstan-deprecation-rules": "^1.0",
48-
"phpstan/phpstan-phpunit": "^1.0",
49-
"phpstan/phpstan-strict-rules": "^1.1",
50-
"maglnet/composer-require-checker": "^3.8|^4.0",
51-
"phpunit/phpunit": "^9.5",
52-
"symfony/var-dumper": "^5.4"
45+
"squizlabs/php_codesniffer": "^3.7",
46+
"phpstan/phpstan": "^1.10",
47+
"phpstan/phpstan-deprecation-rules": "^1.1",
48+
"phpstan/phpstan-phpunit": "^1.3",
49+
"phpstan/phpstan-strict-rules": "^1.5",
50+
"maglnet/composer-require-checker": "^4.7",
51+
"phpunit/phpunit": "^10.5",
52+
"symfony/var-dumper": "^7.0",
53+
"icanhazstring/composer-unused": "^0.8"
5354
},
5455
"autoload": {
5556
"psr-4": {
@@ -64,10 +65,11 @@
6465
"scripts": {
6566
"check": [
6667
"@crc",
67-
"@cs-fix",
68+
"@unused",
6869
"@cs-check",
6970
"@phpstan"
7071
],
72+
"unused": "vendor/bin/composer-unused",
7173
"phpstan": "./vendor/bin/phpstan analyse ./src",
7274
"crc": "./vendor/bin/composer-require-checker --config-file=./composer-require-checker.json",
7375
"phpunit": "./vendor/bin/phpunit",
@@ -76,9 +78,14 @@
7678
},
7779
"extra": {
7880
"branch-alias": {
79-
"dev-master": "2.1-dev"
81+
"dev-master": "3.0-dev"
8082
}
8183
},
8284
"minimum-stability": "dev",
83-
"prefer-stable": true
85+
"prefer-stable": true,
86+
"config": {
87+
"allow-plugins": {
88+
"dealerdirect/phpcodesniffer-composer-installer": true
89+
}
90+
}
8491
}

phpstan.neon.dist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ includes:
22
- vendor/phpstan/phpstan/conf/bleedingEdge.neon
33
- vendor/phpstan/phpstan-strict-rules/rules.neon
44
- vendor/phpstan/phpstan-deprecation-rules/rules.neon
5-
#- vendor/phpstan/phpstan-phpunit/extension.neon
5+
- vendor/phpstan/phpstan-phpunit/extension.neon
66
- vendor/phpstan/phpstan-phpunit/rules.neon
77

88
parameters:

phpunit.xml

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,14 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/8.4/phpunit.xsd"
4-
bootstrap="vendor/autoload.php"
5-
executionOrder="depends,defects"
6-
forceCoversAnnotation="true"
7-
beStrictAboutCoversAnnotation="true"
8-
beStrictAboutOutputDuringTests="true"
9-
beStrictAboutTodoAnnotatedTests="true"
10-
verbose="true">
11-
<testsuites>
12-
<testsuite name="default">
13-
<directory suffix="Test.php">tests</directory>
14-
</testsuite>
15-
</testsuites>
16-
17-
<filter>
18-
<whitelist processUncoveredFilesFromWhitelist="true">
19-
<directory suffix=".php">src</directory>
20-
</whitelist>
21-
</filter>
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" bootstrap="vendor/autoload.php" executionOrder="depends,defects" beStrictAboutOutputDuringTests="true" cacheDirectory=".phpunit.cache" requireCoverageMetadata="true" beStrictAboutCoverageMetadata="true">
3+
<coverage/>
4+
<testsuites>
5+
<testsuite name="default">
6+
<directory suffix="Test.php">tests</directory>
7+
</testsuite>
8+
</testsuites>
9+
<source>
10+
<include>
11+
<directory suffix=".php">src</directory>
12+
</include>
13+
</source>
2214
</phpunit>

src/DependencyInjection/ShapecodeTwigStringLoaderExtension.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@
1111

1212
class ShapecodeTwigStringLoaderExtension extends Extension
1313
{
14-
/**
15-
* @param array<mixed> $configs
16-
*/
14+
/** @inheritDoc */
1715
public function load(array $configs, ContainerBuilder $container): void
1816
{
1917
$loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));

0 commit comments

Comments
 (0)