From a26684df7972683103feee488857e5c9e4835d2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=8Carodej?= Date: Fri, 24 Jun 2022 12:15:40 +0200 Subject: [PATCH] - composer repository update - paypal test fix --- composer.json | 16 +++-- composer.lock | 59 +++++++++++-------- .../Actions/TestPayPalConnectionAction.php | 2 +- 3 files changed, 47 insertions(+), 30 deletions(-) diff --git a/composer.json b/composer.json index e61aa804..0878cc96 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,7 @@ "laravel/ui": "^3.4.2", "league/flysystem-aws-s3-v3": "^3.0.9", "league/flysystem-ftp": "^3.0", - "makingcg/subscription": "dev-main", + "makingcg/subscription": "*", "matthewbdaly/laravel-azure-storage": "^2.0", "pusher/pusher-php-server": "^7.0", "spatie/data-transfer-object": "^3.7.3", @@ -55,12 +55,18 @@ "fakerphp/faker": "^1.19.0", "ext-json": "*" }, - "repositories": [ - { + "repositories": { + "makingcg/subscription": { "type": "path", - "url": "packages/subscription" + "url": "packages/subscription", + "only": [ + "makingcg/*" + ], + "options": { + "symlink": true + } } - ], + }, "config": { "optimize-autoloader": true, "preferred-install": "dist", diff --git a/composer.lock b/composer.lock index f3183ae9..9b678832 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "6c5bd6b425c483acb2c29e9cb4794fdf", + "content-hash": "05544f92a4ec73284d9a0042968129a9", "packages": [ { "name": "amphp/amp", @@ -4562,17 +4562,11 @@ }, { "name": "makingcg/subscription", - "version": "dev-main", - "source": { - "type": "git", - "url": "https://github.com/gvidas/subcription.git", - "reference": "f1777b8ecc8bdf7dac813ff33876f6edb7df9b7b" - }, + "version": "dev-master", "dist": { - "type": "zip", - "url": "https://api.github.com/repos/gvidas/subcription/zipball/f1777b8ecc8bdf7dac813ff33876f6edb7df9b7b", - "reference": "f1777b8ecc8bdf7dac813ff33876f6edb7df9b7b", - "shasum": "" + "type": "path", + "url": "packages/subscription", + "reference": "16c29a065079db3bcbe51eb9c1b720c48d9dd940" }, "require": { "friendsofphp/php-cs-fixer": "^3.6.0", @@ -4594,7 +4588,6 @@ "phpunit/phpunit": "^9.5.16", "spatie/laravel-ray": "^1.29.4" }, - "default-branch": true, "type": "library", "extra": { "laravel": { @@ -4607,18 +4600,39 @@ } }, "autoload": { + "psr-4": { + "VueFileManager\\Subscription\\": "src", + "VueFileManager\\Subscription\\Database\\Factories\\": "database/factories" + }, "files": [ "src/Support/helpers.php", "src/Support/PayPalHelpers.php", "src/Support/PaystackHelpers.php", "src/Support/StripeHelpers.php" - ], + ] + }, + "autoload-dev": { "psr-4": { - "VueFileManager\\Subscription\\": "src", - "VueFileManager\\Subscription\\Database\\Factories\\": "database/factories" + "App\\": "src/App/", + "Domain\\": "src/Domain/", + "Support\\": "src/Support/", + "Tests\\": "tests" } }, - "notification-url": "https://packagist.org/downloads/", + "scripts": { + "psalm": [ + "vendor/bin/psalm" + ], + "format": [ + "vendor/bin/php-cs-fixer fix --allow-risky=yes" + ], + "test": [ + "./vendor/bin/testbench package:test --parallel --no-coverage" + ], + "test-coverage": [ + "vendor/bin/phpunit --coverage-html coverage" + ] + }, "license": [ "MIT" ], @@ -4636,11 +4650,10 @@ "laravel", "subscription" ], - "support": { - "issues": "https://github.com/gvidas/subcription/issues", - "source": "https://github.com/gvidas/subcription/tree/main" - }, - "time": "2022-04-03T12:11:09+00:00" + "transport-options": { + "symlink": true, + "relative": true + } }, { "name": "matthewbdaly/laravel-azure-storage", @@ -14888,9 +14901,7 @@ ], "aliases": [], "minimum-stability": "dev", - "stability-flags": { - "makingcg/subscription": 20 - }, + "stability-flags": [], "prefer-stable": true, "prefer-lowest": false, "platform": { diff --git a/src/Domain/Settings/Actions/TestPayPalConnectionAction.php b/src/Domain/Settings/Actions/TestPayPalConnectionAction.php index f67969ff..b573d76d 100644 --- a/src/Domain/Settings/Actions/TestPayPalConnectionAction.php +++ b/src/Domain/Settings/Actions/TestPayPalConnectionAction.php @@ -29,7 +29,7 @@ class TestPayPalConnectionAction $data = CreateFixedPlanData::fromArray([ 'type' => 'fixed', 'name' => 'Test Plan', - 'description' => null, + 'description' => 'Test plan description...', 'features' => [ 'max_storage_amount' => 200, 'max_team_members' => 20,