diff --git a/.gitattributes b/.gitattributes index 67ae023..500a7cf 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4,6 +4,10 @@ /.gitignore export-ignore /.scrutinizer.yml export-ignore /.travis.yml export-ignore +/.editorconfig export-ignore +/codecov.yml export-ignore +/.remarkrc export-ignore +/.remarkignore export-ignore /behat.yml export-ignore /phpunit.xml.dist export-ignore /phpcs.xml.dist export-ignore diff --git a/.scrutinizer.yml b/.scrutinizer.yml index 5e6d01b..b579dd2 100644 --- a/.scrutinizer.yml +++ b/.scrutinizer.yml @@ -44,6 +44,7 @@ build: COMPOSER_OPTIONS: '--optimize-autoloader' COVERAGE_OUTPUT_STYLE: 'clover' COVERAGE_CLOVER_FILE_PATH: 'build/coverage/clover.xml' + PHPCS_DISABLE_WARNING: 'true' php: version: "8.2" ini: diff --git a/features/demo_app/src/AbstractKernel.php b/features/demo_app/src/AbstractKernel.php index 62897dc..d874983 100644 --- a/features/demo_app/src/AbstractKernel.php +++ b/features/demo_app/src/AbstractKernel.php @@ -57,6 +57,11 @@ public function getProjectDir(): string return realpath(__DIR__.'/../'); } + public function getConfigDir(): string + { + return $this->getProjectDir().'/'.$this->getConfigDirectoryName(); + } + /** * @param RouteCollectionBuilder|RoutingConfigurator $routes */ @@ -69,7 +74,7 @@ protected function configureRoutes($routes) $routes->import($confDir . '/routes' . self::CONFIG_EXTS, '/', 'glob'); } } - + /** * {@inheritdoc} */ @@ -93,5 +98,4 @@ protected function getContainerClass(): string } abstract public function getConfigDirectoryName() : string; - abstract public function getConfigDir(): string; } diff --git a/features/demo_app/src/DefaultKernel.php b/features/demo_app/src/DefaultKernel.php index de495b7..f91f2d0 100644 --- a/features/demo_app/src/DefaultKernel.php +++ b/features/demo_app/src/DefaultKernel.php @@ -10,9 +10,4 @@ public function getConfigDirectoryName() : string { return 'default_config'; } - - public function getConfigDir(): string - { - return $this->getProjectDir().'/'.$this->getConfigDirectoryName(); - } }