Merge branch '2.0'

* 2.0:
  Minor improvements to CI config
  Fix docs to reflect extension configuration: change 'kernel.file' to 'kernel.path'
  Use right namespace for service definition
This commit is contained in:
Kamil Kokot
2019-05-17 17:19:31 +08:00
4 changed files with 22 additions and 10 deletions

View File

@@ -1,9 +1,9 @@
language: php language: php
php: php:
- 7.1 - '7.1'
- 7.2 - '7.2'
- 7.3 - '7.3'
env: env:
- SYMFONY_VERSION=3.4.* - SYMFONY_VERSION=3.4.*
@@ -21,11 +21,10 @@ install:
- composer require symfony/http-kernel:${SYMFONY_VERSION} --no-update --no-scripts --prefer-dist - composer require symfony/http-kernel:${SYMFONY_VERSION} --no-update --no-scripts --prefer-dist
- composer require symfony/proxy-manager-bridge:${SYMFONY_VERSION} --no-update --no-scripts --prefer-dist - composer require symfony/proxy-manager-bridge:${SYMFONY_VERSION} --no-update --no-scripts --prefer-dist
- composer require --dev symfony/framework-bundle:${SYMFONY_VERSION} --no-update --no-scripts --prefer-dist - composer require --dev symfony/framework-bundle:${SYMFONY_VERSION} --no-update --no-scripts --prefer-dist
- composer require --dev symfony/yaml:${SYMFONY_VERSION} --no-update --no-scripts --prefer-dist
- composer update --prefer-dist - composer update --prefer-dist
script: script:
- composer validate --strict - composer check
- vendor/bin/phpstan analyse -c phpstan.neon -l max src -vvv
- vendor/bin/behat -f progress --strict -vvv --no-interaction - vendor/bin/behat -f progress --strict -vvv --no-interaction

View File

@@ -40,6 +40,19 @@
"config": { "config": {
"sort-packages": true "sort-packages": true
}, },
"scripts": {
"check": [
"composer validate --ansi --strict",
"@analyse"
],
"fix": [
"vendor/bin/ecs check --ansi --no-progress-bar src tests --fix"
],
"analyse": [
"vendor/bin/ecs check --ansi --no-progress-bar src tests",
"vendor/bin/phpstan analyse --ansi --no-progress -c phpstan.neon -l max src"
]
},
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.1-dev" "dev-master": "2.1-dev"

View File

@@ -93,7 +93,7 @@ If you're not, you need to register your context as a public service and define
# app/config/config_test.yml (Symfony 3) # app/config/config_test.yml (Symfony 3)
services: services:
App\Tests\DemoContext: App\Tests\Behat\DemoContext:
public: true public: true
arguments: arguments:
- "@kernel" - "@kernel"
@@ -139,7 +139,7 @@ If you're not, you need to register your context as a public service and define
# app/config/config_test.yml (Symfony 3) # app/config/config_test.yml (Symfony 3)
services: services:
App\Tests\DemoContext: App\Tests\Behat\DemoContext:
public: true public: true
arguments: arguments:
- "%kernel.environment%" - "%kernel.environment%"

View File

@@ -12,7 +12,7 @@ default:
bootstrap: ~ bootstrap: ~
kernel: kernel:
class: ~ class: ~
file: ~ path: ~
environment: ~ environment: ~
debug: ~ debug: ~
``` ```
@@ -30,7 +30,7 @@ default:
If you do not pass any, it would look for either `App\Kernel` (Symfony 4) or `AppKernel` (Symfony 3). If you do not pass any, it would look for either `App\Kernel` (Symfony 4) or `AppKernel` (Symfony 3).
If none are found, an exception would be thrown and you would be required to specify it explicitly. If none are found, an exception would be thrown and you would be required to specify it explicitly.
* **`kernel.file`**: * **`kernel.path`**:
It is a path to the file containing the application kernel class. You might want to set it if your kernel is not It is a path to the file containing the application kernel class. You might want to set it if your kernel is not
autoloaded by Composer's autoloaded. autoloaded by Composer's autoloaded.