From 7daae10d334d18e6da73077a72013d962d44ce6c Mon Sep 17 00:00:00 2001 From: George Birnbaum Date: Fri, 10 Sep 2021 07:52:04 -0400 Subject: [PATCH 1/6] add illuminate support and add service provider --- .../CronExpressionServiceProvider.php | 27 +++++++++++++++++++ composer.json | 14 +++++++--- 2 files changed, 37 insertions(+), 4 deletions(-) create mode 100644 CronExpression/CronExpressionServiceProvider.php diff --git a/CronExpression/CronExpressionServiceProvider.php b/CronExpression/CronExpressionServiceProvider.php new file mode 100644 index 0000000..d8b22a0 --- /dev/null +++ b/CronExpression/CronExpressionServiceProvider.php @@ -0,0 +1,27 @@ +=7.2", - "platformsh/config-reader": "^2.4.0" + "platformsh/config-reader": "^2.4.0", + "illuminate/support": "^8.60" }, "autoload": { "files": ["platformsh-laravel-env.php"] @@ -22,9 +23,14 @@ } }, "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } + "branch-alias": { + "dev-master": "1.0.x-dev" + }, + "laravel": { + "providers": [ + "Platformsh\\LaravelBridge\\CronExpression\\CronExpressionServiceProvider" + ] + } }, "require-dev": { "phpunit/phpunit": "^8.5" From 15bcea09cb93d066588557d30ed86978f3d01a02 Mon Sep 17 00:00:00 2001 From: George Birnbaum Date: Fri, 10 Sep 2021 08:02:50 -0400 Subject: [PATCH 2/6] add cron expression package to extend and define container bindings --- .../CronExpressionServiceProvider.php | 22 ++++--------------- CronExpression/PSHCronExpression.php | 10 +++++++++ composer.json | 3 ++- 3 files changed, 16 insertions(+), 19 deletions(-) create mode 100644 CronExpression/PSHCronExpression.php diff --git a/CronExpression/CronExpressionServiceProvider.php b/CronExpression/CronExpressionServiceProvider.php index d8b22a0..d76161c 100644 --- a/CronExpression/CronExpressionServiceProvider.php +++ b/CronExpression/CronExpressionServiceProvider.php @@ -2,26 +2,12 @@ namespace Platformsh\LaravelBridge\CronExpression; +use Cron\CronExpression; use Illuminate\Support\ServiceProvider; class CronExpressionServiceProvider extends ServiceProvider { - /** - * Register any application services. - * - * @return void - */ - public function register() - { - } - - /** - * Bootstrap any application services. - * - * @return void - */ - public function boot() - { - // - } + public $bindings = [ + CronExpression::class => PSHCronExpression::class, + ]; } diff --git a/CronExpression/PSHCronExpression.php b/CronExpression/PSHCronExpression.php new file mode 100644 index 0000000..a6b5ae5 --- /dev/null +++ b/CronExpression/PSHCronExpression.php @@ -0,0 +1,10 @@ +=7.2", "platformsh/config-reader": "^2.4.0", - "illuminate/support": "^8.60" + "illuminate/support": "^8.60", + "dragonmantank/cron-expression": "^3.1" }, "autoload": { "files": ["platformsh-laravel-env.php"] From 380c4454fc530c79a9fd3296617af8cc6f3663d1 Mon Sep 17 00:00:00 2001 From: George Birnbaum Date: Fri, 10 Sep 2021 08:44:55 -0400 Subject: [PATCH 3/6] update providers namespace --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 7ff5fd9..d1e12c9 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,7 @@ }, "laravel": { "providers": [ - "Platformsh\\LaravelBridge\\CronExpression\\CronExpressionServiceProvider" + "\\Platformsh\\LaravelBridge\\CronExpression\\CronExpressionServiceProvider" ] } }, From f1411c04d087cb6c5e507b98368e95129513ebe0 Mon Sep 17 00:00:00 2001 From: George Birnbaum Date: Fri, 10 Sep 2021 09:01:48 -0400 Subject: [PATCH 4/6] wip --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index d1e12c9..7ff5fd9 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,7 @@ }, "laravel": { "providers": [ - "\\Platformsh\\LaravelBridge\\CronExpression\\CronExpressionServiceProvider" + "Platformsh\\LaravelBridge\\CronExpression\\CronExpressionServiceProvider" ] } }, From 7e0d1fdc71904bcbb8fb517585a614e4f8d9da11 Mon Sep 17 00:00:00 2001 From: George Birnbaum Date: Fri, 10 Sep 2021 09:04:31 -0400 Subject: [PATCH 5/6] add psr-4 namespace definition --- composer.json | 73 +++++++++++++++++++++++++++------------------------ 1 file changed, 38 insertions(+), 35 deletions(-) diff --git a/composer.json b/composer.json index 7ff5fd9..01e8b07 100644 --- a/composer.json +++ b/composer.json @@ -1,39 +1,42 @@ { - "name": "platformsh/laravel-bridge", - "description": "Bridge library for running Symfony Flex on Platform.sh", - "type": "library", - "license": "MIT", - "authors": [ - { - "name": "Larry Garfield", - "email": "larry@platform.sh" - } - ], - "require": { - "php": ">=7.2", - "platformsh/config-reader": "^2.4.0", - "illuminate/support": "^8.60", - "dragonmantank/cron-expression": "^3.1" - }, - "autoload": { - "files": ["platformsh-laravel-env.php"] - }, - "autoload-dev": { - "psr-4": { - "Platformsh\\LaravelBridge\\Tests\\": "tests/" - } - }, - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - }, - "laravel": { - "providers": [ - "Platformsh\\LaravelBridge\\CronExpression\\CronExpressionServiceProvider" - ] - } + "name": "platformsh/laravel-bridge", + "description": "Bridge library for running Symfony Flex on Platform.sh", + "type": "library", + "license": "MIT", + "authors": [ + { + "name": "Larry Garfield", + "email": "larry@platform.sh" + } + ], + "require": { + "php": ">=7.2", + "platformsh/config-reader": "^2.4.0", + "illuminate/support": "^8.60", + "dragonmantank/cron-expression": "^3.1" + }, + "autoload": { + "files": [ + "platformsh-laravel-env.php" + ] + }, + "autoload-dev": { + "psr-4": { + "Platformsh\\LaravelBridge\\Tests\\": "tests/", + "Platformsh\\LaravelBridge\\CronExpression\\": "CronExpression/" + } + }, + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" }, - "require-dev": { - "phpunit/phpunit": "^8.5" + "laravel": { + "providers": [ + "Platformsh\\LaravelBridge\\CronExpression\\CronExpressionServiceProvider" + ] } + }, + "require-dev": { + "phpunit/phpunit": "^8.5" + } } From 181dbc8bf3c4c78bad10bd57c5a86efc81ee0b9a Mon Sep 17 00:00:00 2001 From: George Birnbaum Date: Fri, 10 Sep 2021 09:10:15 -0400 Subject: [PATCH 6/6] add psr4 autoloading to the right location --- composer.json | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 01e8b07..111e8a1 100644 --- a/composer.json +++ b/composer.json @@ -18,12 +18,14 @@ "autoload": { "files": [ "platformsh-laravel-env.php" - ] + ], + "psr-4": { + "Platformsh\\LaravelBridge\\CronExpression\\": "CronExpression/" + } }, "autoload-dev": { "psr-4": { - "Platformsh\\LaravelBridge\\Tests\\": "tests/", - "Platformsh\\LaravelBridge\\CronExpression\\": "CronExpression/" + "Platformsh\\LaravelBridge\\Tests\\": "tests/" } }, "extra": {