From c8147d5ca9b2c4adef389f5128863f181b71d806 Mon Sep 17 00:00:00 2001 From: David Greminger Date: Thu, 5 Mar 2020 11:13:27 +0100 Subject: [PATCH] Remove kernel, use test kernel from core-bundle --- composer.json | 12 ++++- config/config_phpstan.yml | 21 -------- config/security.yml | 63 ------------------------ src/AppKernel.php | 101 -------------------------------------- src/ServiceHelper.php | 1 + 5 files changed, 11 insertions(+), 187 deletions(-) delete mode 100644 config/config_phpstan.yml delete mode 100644 config/security.yml delete mode 100644 src/AppKernel.php diff --git a/composer.json b/composer.json index 0efbb42..5824aad 100644 --- a/composer.json +++ b/composer.json @@ -13,8 +13,8 @@ "php": "^7.2", "friendsofsymfony/http-cache-bundle": "^2.6", "phpstan/phpstan": "^0.12", - "phpstan/phpstan-symfony": "^0.12", "phpstan/phpstan-phpunit": "^0.12", + "phpstan/phpstan-symfony": "^0.12", "symfony/debug": "^4.4", "symfony/monolog-bridge": "^4.4", "symfony/monolog-bundle": "^3.3", @@ -22,6 +22,7 @@ }, "require-dev": { "contao/core-bundle": "^4.9", + "contao/news-bundle": "^4.9", "contao/test-case": "^3.0", "friendsofphp/php-cs-fixer": "^2.14", "lexik/maintenance-bundle": "^2.1.3", @@ -31,6 +32,12 @@ "symfony/http-client": "^4.4", "symfony/var-dumper": "^4.4" }, + "config": { + "preferred-install": { + "contao/*": "source", + "*": "dist" + } + }, "extra": { "phpstan": { "includes": [ @@ -43,7 +50,8 @@ }, "autoload": { "psr-4": { - "Contao\\PhpStan\\": "src/" + "Contao\\PhpStan\\": "src/", + "Contao\\CoreBundle\\Tests\\": "../../contao/core-bundle/tests/" } }, "autoload-dev": { diff --git a/config/config_phpstan.yml b/config/config_phpstan.yml deleted file mode 100644 index 9855052..0000000 --- a/config/config_phpstan.yml +++ /dev/null @@ -1,21 +0,0 @@ -imports: - - { resource: security.yml } - -parameters: - secret: s3cr3t - mailer_transport: ~ - -framework: - secret: '%secret%' - router: - resource: ../vendor/contao/core-bundle/src/Resources/config/routing.yml - strict_requirements: '%kernel.debug%' - session: - storage_id: session.storage.mock_file - -doctrine: - dbal: - default_connection: default - connections: - default: ~ - orm: ~ diff --git a/config/security.yml b/config/security.yml deleted file mode 100644 index 1462609..0000000 --- a/config/security.yml +++ /dev/null @@ -1,63 +0,0 @@ -security: - providers: - contao.security.backend_user_provider: - id: contao.security.backend_user_provider - - contao.security.frontend_user_provider: - id: contao.security.frontend_user_provider - - encoders: - Contao\User: - algorithm: auto - - firewalls: - dev: - pattern: ^/(_(profiler|wdt|error)|css|images|js)/ - security: false - - contao_install: - pattern: ^/contao/install$ - security: false - - contao_backend: - request_matcher: contao.routing.backend_matcher - provider: contao.security.backend_user_provider - user_checker: contao.security.user_checker - anonymous: ~ - switch_user: true - - contao_login: - remember_me: false - - logout: - path: contao_backend_logout - handlers: - - contao.security.logout_handler - success_handler: contao.security.logout_success_handler - - contao_frontend: - request_matcher: contao.routing.frontend_matcher - provider: contao.security.frontend_user_provider - user_checker: contao.security.user_checker - anonymous: ~ - switch_user: false - - contao_login: - remember_me: true - - remember_me: - secret: '%kernel.secret%' - remember_me_parameter: autologin - - logout: - path: contao_frontend_logout - target: contao_root - handlers: - - contao.security.logout_handler - success_handler: contao.security.logout_success_handler - - access_control: - - { path: ^/contao/login$, roles: IS_AUTHENTICATED_ANONYMOUSLY } - - { path: ^/contao/logout$, roles: IS_AUTHENTICATED_ANONYMOUSLY } - - { path: ^/contao(/|$), roles: ROLE_USER } - - { path: ^/, roles: [IS_AUTHENTICATED_ANONYMOUSLY] } diff --git a/src/AppKernel.php b/src/AppKernel.php deleted file mode 100644 index b59b367..0000000 --- a/src/AppKernel.php +++ /dev/null @@ -1,101 +0,0 @@ - - */ - public function registerBundles(): array - { - return [ - new FrameworkBundle(), - new SecurityBundle(), - new TwigBundle(), - new MonologBundle(), - new SwiftmailerBundle(), - new DoctrineBundle(), - new SchebTwoFactorBundle(), - new KnpTimeBundle(), - new KnpMenuBundle(), - new CmfRoutingBundle(), - new ContaoCoreBundle(), - ]; - } - - /** - * {@inheritdoc} - */ - public function getProjectDir(): string - { - return \dirname(__DIR__); - } - - /** - * {@inheritdoc} - */ - public function getRootDir(): string - { - return __DIR__; - } - - /** - * {@inheritdoc} - */ - public function getCacheDir(): string - { - return \dirname(__DIR__).'/var/cache/'.$this->environment; - } - - /** - * {@inheritdoc} - */ - public function getLogDir(): string - { - return \dirname(__DIR__).'/var/logs'; - } - - /** - * {@inheritdoc} - */ - public function registerContainerConfiguration(LoaderInterface $loader): void - { - $loader->load(\dirname(__DIR__).'/config/config_'.$this->environment.'.yml'); - } - - /** - * {@inheritdoc} - */ - protected function build(ContainerBuilder $container): void - { - $container->register('monolog.logger.contao', NullLogger::class); - } -} diff --git a/src/ServiceHelper.php b/src/ServiceHelper.php index da5031d..cbabc21 100644 --- a/src/ServiceHelper.php +++ b/src/ServiceHelper.php @@ -12,6 +12,7 @@ namespace Contao\PhpStan; +use Contao\CoreBundle\Tests\Functional\app\AppKernel; use PhpParser\Node\Expr; use PHPStan\Analyser\Scope; use PHPStan\Type\TypeUtils;