Skip to content

Commit 151c256

Browse files
committed
Rearrange src/tests so we can use composer-require-checker
1 parent 43bf470 commit 151c256

26 files changed

Lines changed: 52 additions & 10 deletions

.github/workflows/dependencies.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Dependencies
2+
3+
permissions:
4+
contents: read
5+
6+
on:
7+
push:
8+
branches:
9+
- master
10+
pull_request:
11+
12+
env:
13+
PHP_VERSION: 7.2
14+
15+
jobs:
16+
composer-require-checker:
17+
name: Check missing composer requirements
18+
runs-on: ubuntu-20.04
19+
steps:
20+
- uses: shivammathur/setup-php@v2
21+
with:
22+
php-version: ${{ env.PHP_VERSION }}
23+
tools: composer:v2
24+
- uses: actions/checkout@v2
25+
- uses: actions/cache@v2
26+
with:
27+
path: vendor
28+
key: composer-${{ runner.os }}-${{ env.PHP_VERSION }}-${{ matrix.symfony-locked-version }}-${{ matrix.dependency-version }}-${{ hashFiles('composer.json') }}
29+
restore-keys: |
30+
composer-${{ runner.os }}-${{ env.PHP_VERSION }}-${{ matrix.symfony-locked-version }}-${{ matrix.dependency-version }}-
31+
- run: composer install --no-interaction --no-scripts --no-progress --prefer-dist
32+
- uses: docker://webfactory/composer-require-checker:3.2.0

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ vendor/
33
phpunit.xml
44
.phpunit.result.cache
55
.php_cs.cache
6-
Tests/Fixtures/cache/
6+
tests/Fixtures/cache/

Tests/Fixtures/cache/.keepme

Whitespace-only changes.

composer.json

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,40 @@
55

66
"require": {
77
"php": ">=7.2",
8+
"ext-json": "*",
9+
"ext-mbstring": "*",
810
"psr/log": "^1.0.2",
9-
"symfony/dependency-injection": "^3.4.11|^4.0|5.3.*",
10-
"symfony/http-kernel": "^3.4.11|^4.0|5.3.*",
11-
"symfony/twig-bundle": "^3.4.11|^4.0|5.3.*",
11+
"symfony/config": "^3.4.11|^4.0|^5.0",
12+
"symfony/dependency-injection": "^3.4.11|^4.0|^5.0",
13+
"symfony/http-foundation": "^3.4.11|^4.0|^5.0",
14+
"symfony/http-kernel": "^3.4.11|^4.0|^5.0",
1215
"thunderer/shortcode": "^0.6.5|^0.7",
1316
"twig/twig": "^1.34|^2.0|^3.0"
1417
},
1518

1619
"require-dev": {
1720
"phpunit/phpunit": "^7.0|^8.0|^9.0",
18-
"symfony/expression-language": "^3.4.11|^4.0|5.3.*",
19-
"symfony/framework-bundle": "^3.4.11|^4.0|5.3.*",
21+
"symfony/expression-language": "^3.4.11|^4.0|^5.0",
22+
"symfony/framework-bundle": "^3.4.11|^4.0|^5.0",
2023
"symfony/phpunit-bridge": "*",
21-
"symfony/routing": "^3.4.11|^4.0|5.3.*",
22-
"symfony/templating": "^3.4.11|^4.0|5.3.*",
23-
"symfony/yaml": "^3.4.11|^4.0|5.3.*"
24+
"symfony/routing": "^3.4.11|^4.0|^5.0",
25+
"symfony/templating": "^3.4.11|^4.0|^5.0",
26+
"symfony/twig-bundle": "^3.4.11|^4.0|^5.0",
27+
"symfony/yaml": "^3.4.11|^4.0|^5.0"
2428
},
2529

2630
"autoload": {
2731
"psr-4": {
28-
"Webfactory\\ShortcodeBundle\\": ""
32+
"Webfactory\\ShortcodeBundle\\": "src"
2933
}
3034
},
3135

36+
"autoload-dev": {
37+
"psr-4": {
38+
"Webfactory\\ShortcodeBundle\\Tests\\": "tests"
39+
}
40+
},
41+
3242
"config": {
3343
"sort-packages": true
3444
}

DependencyInjection/Compiler/ShortcodeCompilerPass.php renamed to src/DependencyInjection/Compiler/ShortcodeCompilerPass.php

File renamed without changes.

DependencyInjection/WebfactoryShortcodeExtension.php renamed to src/DependencyInjection/WebfactoryShortcodeExtension.php

File renamed without changes.

0 commit comments

Comments
 (0)