From 248042c796937e7f7a3a89c09646212e48395886 Mon Sep 17 00:00:00 2001 From: Peter Zentjens Date: Fri, 1 Feb 2019 09:19:51 +0100 Subject: [PATCH 1/3] [MultiDomainBundle] updated phpunit namespaces --- .../Tests/unit/DependencyInjection/ConfigurationTest.php | 4 ++-- .../Tests/unit/EventListener/HostOverrideListenerTest.php | 4 ++-- .../unit/Helper/AdminPanel/SitesAdminPanelAdaptorTest.php | 4 ++-- .../Tests/unit/Helper/DomainConfigurationTest.php | 4 ++-- .../Tests/unit/Helper/HostOverrideCleanupHandlerTest.php | 4 ++-- .../Tests/unit/Router/DomainBasedLocaleRouterTest.php | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Kunstmaan/MultiDomainBundle/Tests/unit/DependencyInjection/ConfigurationTest.php b/src/Kunstmaan/MultiDomainBundle/Tests/unit/DependencyInjection/ConfigurationTest.php index 86c2758305..6191455bcc 100644 --- a/src/Kunstmaan/MultiDomainBundle/Tests/unit/DependencyInjection/ConfigurationTest.php +++ b/src/Kunstmaan/MultiDomainBundle/Tests/unit/DependencyInjection/ConfigurationTest.php @@ -4,12 +4,12 @@ use Kunstmaan\MultiDomainBundle\DependencyInjection\Configuration; use Matthias\SymfonyConfigTest\PhpUnit\ConfigurationTestCaseTrait; -use PHPUnit_Framework_TestCase; +use PHPUnit\Framework\TestCase; /** * Class ConfigurationTest */ -class ConfigurationTest extends PHPUnit_Framework_TestCase +class ConfigurationTest extends TestCase { use ConfigurationTestCaseTrait; diff --git a/src/Kunstmaan/MultiDomainBundle/Tests/unit/EventListener/HostOverrideListenerTest.php b/src/Kunstmaan/MultiDomainBundle/Tests/unit/EventListener/HostOverrideListenerTest.php index c968fc2327..ff6c83954c 100644 --- a/src/Kunstmaan/MultiDomainBundle/Tests/unit/EventListener/HostOverrideListenerTest.php +++ b/src/Kunstmaan/MultiDomainBundle/Tests/unit/EventListener/HostOverrideListenerTest.php @@ -3,11 +3,11 @@ namespace Kunstmaan\MultiDomainBundle\Tests\EventListener; use Kunstmaan\MultiDomainBundle\EventListener\HostOverrideListener; -use PHPUnit_Framework_TestCase; +use PHPUnit\Framework\TestCase; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\HttpKernelInterface; -class HostOverrideListenerTest extends PHPUnit_Framework_TestCase +class HostOverrideListenerTest extends TestCase { /** * @var HostOverrideListener diff --git a/src/Kunstmaan/MultiDomainBundle/Tests/unit/Helper/AdminPanel/SitesAdminPanelAdaptorTest.php b/src/Kunstmaan/MultiDomainBundle/Tests/unit/Helper/AdminPanel/SitesAdminPanelAdaptorTest.php index 7ba6e78a3e..4351095393 100644 --- a/src/Kunstmaan/MultiDomainBundle/Tests/unit/Helper/AdminPanel/SitesAdminPanelAdaptorTest.php +++ b/src/Kunstmaan/MultiDomainBundle/Tests/unit/Helper/AdminPanel/SitesAdminPanelAdaptorTest.php @@ -3,9 +3,9 @@ namespace Kunstmaan\MultiDomainBundle\Tests\Helper\AdminPanel; use Kunstmaan\MultiDomainBundle\Helper\AdminPanel\SitesAdminPanelAdaptor; -use PHPUnit_Framework_TestCase; +use PHPUnit\Framework\TestCase; -class SitesAdminPanelAdaptorTest extends PHPUnit_Framework_TestCase +class SitesAdminPanelAdaptorTest extends TestCase { /** * @var SitesAdminPanelAdaptor diff --git a/src/Kunstmaan/MultiDomainBundle/Tests/unit/Helper/DomainConfigurationTest.php b/src/Kunstmaan/MultiDomainBundle/Tests/unit/Helper/DomainConfigurationTest.php index af8d60f4f0..b7b45396cf 100644 --- a/src/Kunstmaan/MultiDomainBundle/Tests/unit/Helper/DomainConfigurationTest.php +++ b/src/Kunstmaan/MultiDomainBundle/Tests/unit/Helper/DomainConfigurationTest.php @@ -4,13 +4,13 @@ use Kunstmaan\MultiDomainBundle\Helper\DomainConfiguration; use Kunstmaan\NodeBundle\Entity\Node; -use PHPUnit_Framework_TestCase; +use PHPUnit\Framework\TestCase; use ReflectionClass; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Session\Session; use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage; -class DomainConfigurationTest extends PHPUnit_Framework_TestCase +class DomainConfigurationTest extends TestCase { /** * @var Node diff --git a/src/Kunstmaan/MultiDomainBundle/Tests/unit/Helper/HostOverrideCleanupHandlerTest.php b/src/Kunstmaan/MultiDomainBundle/Tests/unit/Helper/HostOverrideCleanupHandlerTest.php index 492f38e672..b4bd4a4a54 100644 --- a/src/Kunstmaan/MultiDomainBundle/Tests/unit/Helper/HostOverrideCleanupHandlerTest.php +++ b/src/Kunstmaan/MultiDomainBundle/Tests/unit/Helper/HostOverrideCleanupHandlerTest.php @@ -4,13 +4,13 @@ use Kunstmaan\MultiDomainBundle\Helper\DomainConfiguration; use Kunstmaan\MultiDomainBundle\Helper\HostOverrideCleanupHandler; -use PHPUnit_Framework_TestCase; +use PHPUnit\Framework\TestCase; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Session\Session; use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage; -class HostOverrideCleanupHandlerTest extends PHPUnit_Framework_TestCase +class HostOverrideCleanupHandlerTest extends TestCase { /** * @var HostOverrideCleanupHandler diff --git a/src/Kunstmaan/MultiDomainBundle/Tests/unit/Router/DomainBasedLocaleRouterTest.php b/src/Kunstmaan/MultiDomainBundle/Tests/unit/Router/DomainBasedLocaleRouterTest.php index 4dd49bc1ea..51f1c11ca3 100644 --- a/src/Kunstmaan/MultiDomainBundle/Tests/unit/Router/DomainBasedLocaleRouterTest.php +++ b/src/Kunstmaan/MultiDomainBundle/Tests/unit/Router/DomainBasedLocaleRouterTest.php @@ -4,14 +4,14 @@ use Kunstmaan\MultiDomainBundle\Router\DomainBasedLocaleRouter; use Kunstmaan\NodeBundle\Entity\NodeTranslation; -use PHPUnit_Framework_TestCase; +use PHPUnit\Framework\TestCase; use ReflectionClass; use Symfony\Component\DependencyInjection\Container; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\Routing\Exception\ResourceNotFoundException; use Symfony\Component\Routing\Generator\UrlGeneratorInterface; -class DomainBasedLocaleRouterTest extends PHPUnit_Framework_TestCase +class DomainBasedLocaleRouterTest extends TestCase { public function testGenerate() { From 4591421f28955fb47c16e585c560c35c800df9bb Mon Sep 17 00:00:00 2001 From: Peter Zentjens Date: Fri, 1 Feb 2019 09:20:09 +0100 Subject: [PATCH 2/3] [MultiDomainBundle] replaced the AbstractPrependableExtensionTestCase --- .../DependencyInjection/KunstmaanMultiDomainExtensionTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Kunstmaan/MultiDomainBundle/Tests/unit/DependencyInjection/KunstmaanMultiDomainExtensionTest.php b/src/Kunstmaan/MultiDomainBundle/Tests/unit/DependencyInjection/KunstmaanMultiDomainExtensionTest.php index eca63f1c12..88a78d71d9 100644 --- a/src/Kunstmaan/MultiDomainBundle/Tests/unit/DependencyInjection/KunstmaanMultiDomainExtensionTest.php +++ b/src/Kunstmaan/MultiDomainBundle/Tests/unit/DependencyInjection/KunstmaanMultiDomainExtensionTest.php @@ -3,13 +3,13 @@ namespace Kunstmaan\MultiDomainBundle\Tests\DependencyInjection; use Kunstmaan\MultiDomainBundle\DependencyInjection\KunstmaanMultiDomainExtension; +use Matthias\SymfonyDependencyInjectionTest\PhpUnit\AbstractExtensionTestCase; use Symfony\Component\DependencyInjection\Extension\ExtensionInterface; -use Kunstmaan\AdminBundle\Tests\unit\AbstractPrependableExtensionTestCase; /** * Class KunstmaanMultiDomainExtensionTest */ -class KunstmaanMultiDomainExtensionTest extends AbstractPrependableExtensionTestCase +class KunstmaanMultiDomainExtensionTest extends AbstractExtensionTestCase { /** * @return ExtensionInterface[] From 6b11513f6ba13d73c40af3b89b6e83e119456d7a Mon Sep 17 00:00:00 2001 From: Peter Zentjens Date: Fri, 1 Feb 2019 09:20:28 +0100 Subject: [PATCH 3/3] [MultiDomainBundle] upgraded dev dependencies --- src/Kunstmaan/MultiDomainBundle/composer.json | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/Kunstmaan/MultiDomainBundle/composer.json b/src/Kunstmaan/MultiDomainBundle/composer.json index b36afff6c0..55ef2ed5e9 100644 --- a/src/Kunstmaan/MultiDomainBundle/composer.json +++ b/src/Kunstmaan/MultiDomainBundle/composer.json @@ -20,15 +20,14 @@ "minimum-stability": "dev", "require": { "php": "^7.1", - "kunstmaan/adminlist-bundle": "~5.2", - "kunstmaan/node-bundle": "~5.2" + "kunstmaan/adminlist-bundle": "~5.2" }, "require-dev": { - "codeception/codeception": "^2.4", - "matthiasnoback/symfony-config-test": "2.2.0", - "matthiasnoback/symfony-dependency-injection-test": "1.2.0", - "phpunit/phpunit": "^5.7", - "symfony/phpunit-bridge": "~3.0" + "codeception/codeception": "^2.5", + "matthiasnoback/symfony-config-test": "^4.0", + "matthiasnoback/symfony-dependency-injection-test": "^3.1", + "symfony/phpunit-bridge": "^4.2", + "phpunit/phpunit": "^7.5" }, "autoload": { "psr-4": { "Kunstmaan\\MultiDomainBundle\\": "" }