From b90a79044e0fd9a0aeef46d012e32e384957269e Mon Sep 17 00:00:00 2001 From: KyleKatarn Date: Fri, 17 Jan 2020 09:12:33 +0100 Subject: [PATCH] Cleanup obsolete code --- src/ServiceProvider.php | 4 +--- tests/BladeDirectivesTest.php | 1 + tests/ServiceProviderTest.php | 10 ---------- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php index 6b167db..b861604 100644 --- a/src/ServiceProvider.php +++ b/src/ServiceProvider.php @@ -219,11 +219,9 @@ public function registerPugBladeCompiler() */ public function getConfig() { - $key = $this->version() >= 5 ? 'laravel-pug' : 'laravel-pug::config'; - return array_merge([ 'allow_composite_extensions' => true, - ], $this->app->make('config')->get($key)); + ], $this->app->make('config')->get('laravel-pug')); } /** diff --git a/tests/BladeDirectivesTest.php b/tests/BladeDirectivesTest.php index ded26f1..f22ae01 100644 --- a/tests/BladeDirectivesTest.php +++ b/tests/BladeDirectivesTest.php @@ -48,6 +48,7 @@ protected function setUp(): void } /** + * @covers ::version * @covers ::getCompilerCreator * @covers ::getPugEngine * @covers ::getEngineResolver diff --git a/tests/ServiceProviderTest.php b/tests/ServiceProviderTest.php index aee3f78..ae5bc42 100644 --- a/tests/ServiceProviderTest.php +++ b/tests/ServiceProviderTest.php @@ -15,16 +15,6 @@ use Pug\Pug; include_once __DIR__ . '/helpers.php'; - -$file = __DIR__ . '/LaravelTestApp.php'; -$contents = file_get_contents($file); - -$contents = version_compare(PHP_VERSION, '5.6.0-dev', '>=') - ? str_replace('(/*...$environments*/)', '(...$environments)', $contents) - : str_replace('(...$environments)', '(/*...$environments*/)', $contents); - -file_put_contents($file, $contents); - include_once __DIR__ . '/LaravelTestApp.php'; include_once __DIR__ . '/Laravel5ServiceProvider.php';