diff --git a/composer.json b/composer.json index 5a8ebc0b2..9e6cbf27d 100644 --- a/composer.json +++ b/composer.json @@ -41,9 +41,7 @@ "psr-4": { "Mollie\\": "src/", "Mollie\\Subscription\\": "subscription/", - "Mollie\\Shared\\": "shared/", - "Mollie\\Vendor\\Psr\\Container\\": "vendor\/psr\/container\/src\/", - "Mollie\\Vendor\\League\\Container\\": "vendor\/league\/container\/src\/" + "Mollie\\Shared\\": "shared/" }, "classmap": [ "mollie.php", diff --git a/scoper.inc.php b/scoper.inc.php deleted file mode 100644 index 938c53096..000000000 --- a/scoper.inc.php +++ /dev/null @@ -1,47 +0,0 @@ - 'Mollie\\Vendor', - - // By default when running php-scoper add-prefix, it will prefix all relevant code found in the current working - // directory. You can however define which files should be scoped by defining a collection of Finders in the - // following configuration key. - // - // For more see: https://github.com/humbug/php-scoper#finders-and-paths - 'finders' => [ - Finder::create() - ->files() - ->ignoreVCS(true) - ->notName('/LICENSE|.*\\.md|.*\\.dist|Makefile|composer\\.json|composer\\.lock/') - ->exclude([ - 'test', - 'test_old', - 'tests', - 'Tests', - 'vendor-bin', - 'console', - ]) - ->in('vendor/league'), - Finder::create() - ->files() - ->ignoreVCS(true) - ->notName('/LICENSE|.*\\.md|.*\\.dist|Makefile|composer\\.json|composer\\.lock/') - ->exclude([ - 'test', - 'test_old', - 'tests', - 'Tests', - 'vendor-bin', - 'console', - ]) - ->in('vendor/psr'), - Finder::create()->append([ - 'composer.json', - ]), - ], -]; diff --git a/src/ServiceProvider/BaseServiceProvider.php b/src/ServiceProvider/BaseServiceProvider.php index 4f893f5a0..4d2e6d869 100644 --- a/src/ServiceProvider/BaseServiceProvider.php +++ b/src/ServiceProvider/BaseServiceProvider.php @@ -143,7 +143,7 @@ use Mollie\Utility\Decoder\DecoderInterface; use Mollie\Utility\Decoder\JsonDecoder; use Mollie\Utility\NumberIdempotencyProvider; -use Mollie\Vendor\League\Container\Container; +use League\Container\Container; use Mollie\Verification\PaymentType\CanBeRegularPaymentType; use Mollie\Verification\PaymentType\PaymentTypeVerificationInterface; use Mollie\Verification\Shipment\CanSendShipment; diff --git a/src/ServiceProvider/LeagueServiceContainerProvider.php b/src/ServiceProvider/LeagueServiceContainerProvider.php index a3a0997d7..d5486fe82 100644 --- a/src/ServiceProvider/LeagueServiceContainerProvider.php +++ b/src/ServiceProvider/LeagueServiceContainerProvider.php @@ -14,8 +14,8 @@ namespace Mollie\ServiceProvider; -use Mollie\Vendor\League\Container\Container; -use Mollie\Vendor\League\Container\ReflectionContainer; +use League\Container\Container; +use League\Container\ReflectionContainer; if (!defined('_PS_VERSION_')) { exit; diff --git a/src/ServiceProvider/PrestashopContainer.php b/src/ServiceProvider/PrestashopContainer.php index 73ea8929b..b782485c3 100644 --- a/src/ServiceProvider/PrestashopContainer.php +++ b/src/ServiceProvider/PrestashopContainer.php @@ -14,7 +14,7 @@ namespace Mollie\ServiceProvider; -use Mollie\Vendor\Psr\Container\ContainerInterface as PsrContainerInterface; +use Psr\Container\ContainerInterface as PsrContainerInterface; use PrestaShop\PrestaShop\Adapter\SymfonyContainer; use Symfony\Component\DependencyInjection\ContainerInterface; diff --git a/subscription/Install/AttributeInstaller.php b/subscription/Install/AttributeInstaller.php index e3252571f..7ea92291a 100644 --- a/subscription/Install/AttributeInstaller.php +++ b/subscription/Install/AttributeInstaller.php @@ -21,7 +21,7 @@ use Mollie\Logger\PrestaLoggerInterface; use Mollie\Subscription\Config\Config; use Mollie\Subscription\Repository\LanguageRepository; -use Mollie\Vendor\Psr\Log\LogLevel; +use Psr\Log\LogLevel; use PrestaShopDatabaseException; use PrestaShopException; use Validate;