From e41cd763f9e4d5252fba5cda8140f5f9c9e0bcba Mon Sep 17 00:00:00 2001 From: adam Date: Tue, 6 Oct 2020 08:26:23 +0200 Subject: [PATCH 1/4] bump dredd-hooks-php version --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 29344da..7b87f39 100644 --- a/composer.json +++ b/composer.json @@ -3,9 +3,9 @@ "description": "Laravel hooks for the Dredd testing tool", "type": "package", "require": { - "php": ">=7.1", + "php": ">=7.2", "nikic/php-parser": "^4.2", - "ddelnano/dredd-hooks-php": "^1.1" + "ddelnano/dredd-hooks-php": "^2.0" }, "license": "MIT", "authors": [ From fbe7e80db40c243770cf95d60df3e92e9657ede2 Mon Sep 17 00:00:00 2001 From: adam Date: Tue, 6 Oct 2020 08:36:59 +0200 Subject: [PATCH 2/4] phpdoc added --- src/Kernel.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/Kernel.php b/src/Kernel.php index 9db1114..650a07f 100644 --- a/src/Kernel.php +++ b/src/Kernel.php @@ -4,6 +4,20 @@ use Dredd\Hooks; +/** + * Class Kernel + * + * @package Netsells\Dredd + * + * @method Hooks\beforeAll beforeAll(callable $function) + * @method Hooks\beforeEach beforeEach(callable $function) + * @method Hooks\beforeEachValidation beforeEachValidation(callable $function) + * @method Hooks\afterEach afterEach(callable $function) + * @method Hooks\afterAll afterAll(callable $function) + * @method Hooks\before before(string $transactionName, callable $function) + * @method Hooks\beforeValidation beforeValidation(callable $function) + * @method Hooks\after after(string $transactionName, callable $function) + */ abstract class Kernel { use ResolvesArgumentTrait; From aa70ef90cb9d1c9880e7ea4c818af890dd921cf3 Mon Sep 17 00:00:00 2001 From: adam Date: Tue, 6 Oct 2020 08:52:28 +0200 Subject: [PATCH 3/4] compatiblity with new DotEnv setup --- bin/dredd-hooks-laravel | 4 ++-- server.php | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/dredd-hooks-laravel b/bin/dredd-hooks-laravel index 7596764..b9c0d34 100755 --- a/bin/dredd-hooks-laravel +++ b/bin/dredd-hooks-laravel @@ -32,8 +32,8 @@ if (!$loaded) { // Laravel will not overwrite existing environment variables, so we'll pull in custom ones here if (file_exists($basePath . '/.env.dredd')) { - $dotenv = new Dotenv\Dotenv(new \Dotenv\Loader([$basePath . '/.env.dredd'], new \Dotenv\Environment\DotenvFactory())); - $dotenv->overload(); + $dotenv = Dotenv\Dotenv::createMutable($basePath, '.env.dredd'); + $dotenv->load(); } // Load Laravel diff --git a/server.php b/server.php index de707f1..104eda9 100644 --- a/server.php +++ b/server.php @@ -7,8 +7,8 @@ // Laravel will not overwrite existing environment variables, so we'll pull in custom ones here if (file_exists($basePath . '/.env.dredd')) { - $dotenv = new Dotenv\Dotenv(new \Dotenv\Loader([$basePath . '/.env.dredd'], new \Dotenv\Environment\DotenvFactory())); - $dotenv->overload(); + $dotenv = Dotenv\Dotenv::createMutable($basePath, '.env.dredd'); + $dotenv->load(); } -require_once $basePath . '/server.php'; \ No newline at end of file +require_once $basePath . '/server.php'; From cf710b9b029979fef10e50332d6666c02db1d777 Mon Sep 17 00:00:00 2001 From: Adam Date: Wed, 11 Sep 2024 10:39:18 +0200 Subject: [PATCH 4/4] compatibility with php-parser 5 --- bin/dredd-hooks-laravel | 4 ++-- composer.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/dredd-hooks-laravel b/bin/dredd-hooks-laravel index b9c0d34..a3938aa 100755 --- a/bin/dredd-hooks-laravel +++ b/bin/dredd-hooks-laravel @@ -49,7 +49,7 @@ $options = getopt('', [ // Second argument is the single kernel file $dreddKernelPath = $argv[1]; -$parser = (new ParserFactory)->create(ParserFactory::PREFER_PHP7); +$parser = (new ParserFactory)->createForNewestSupportedVersion(); try { $statements = $parser->parse(file_get_contents($dreddKernelPath)); @@ -60,7 +60,7 @@ try { try { if ($statements[0] instanceof PhpParser\Node\Stmt\Namespace_) { - $kernelClass = implode('\\', $statements[0]->name->parts); + $kernelClass = implode('\\', $statements[0]->name->getParts()); foreach ($statements[0]->stmts as $statement) { if ($statement instanceof PhpParser\Node\Stmt\Class_) { $kernelClass .= '\\' . $statement->name; diff --git a/composer.json b/composer.json index 7b87f39..b343727 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ "type": "package", "require": { "php": ">=7.2", - "nikic/php-parser": "^4.2", + "nikic/php-parser": "^5.0", "ddelnano/dredd-hooks-php": "^2.0" }, "license": "MIT",