From 584a842059ffd6e49b8e87441cc39717b368682e Mon Sep 17 00:00:00 2001 From: Jeroen Thora Date: Fri, 1 Feb 2019 09:24:13 +0100 Subject: [PATCH] [RedirectBundle] upgraded dev dependencies --- src/Kunstmaan/RedirectBundle/.gitignore | 6 ++++++ .../RedirectAdminListConfiguratorTest.php | 4 ++-- .../unit/DependencyInjection/ConfigurationTest.php | 4 ++-- .../KunstmaanRedirectExtensionTest.php | 4 ++-- .../Tests/unit/Entity/RedirectTest.php | 4 ++-- .../Tests/unit/Form/RedirectAdminTypeTest.php | 4 ++-- .../Tests/unit/Router/RedirectRouterTest.php | 14 ++++++++------ src/Kunstmaan/RedirectBundle/composer.json | 10 +++++----- 8 files changed, 29 insertions(+), 21 deletions(-) create mode 100644 src/Kunstmaan/RedirectBundle/.gitignore diff --git a/src/Kunstmaan/RedirectBundle/.gitignore b/src/Kunstmaan/RedirectBundle/.gitignore new file mode 100644 index 0000000000..b76c1caab3 --- /dev/null +++ b/src/Kunstmaan/RedirectBundle/.gitignore @@ -0,0 +1,6 @@ +.DS_Store +.idea +composer.lock +composer.phar +vendor/* +*.orig diff --git a/src/Kunstmaan/RedirectBundle/Tests/unit/AdminList/RedirectAdminListConfiguratorTest.php b/src/Kunstmaan/RedirectBundle/Tests/unit/AdminList/RedirectAdminListConfiguratorTest.php index 959a748f32..5184505ab3 100644 --- a/src/Kunstmaan/RedirectBundle/Tests/unit/AdminList/RedirectAdminListConfiguratorTest.php +++ b/src/Kunstmaan/RedirectBundle/Tests/unit/AdminList/RedirectAdminListConfiguratorTest.php @@ -6,12 +6,12 @@ use Kunstmaan\AdminBundle\Helper\Security\Acl\AclHelper; use Kunstmaan\AdminListBundle\AdminList\Field; use Kunstmaan\RedirectBundle\AdminList\RedirectAdminListConfigurator; -use PHPUnit_Framework_TestCase; +use PHPUnit\Framework\TestCase; /** * Class RedirectAdminListConfiguratorTest */ -class RedirectAdminListConfiguratorTest extends PHPUnit_Framework_TestCase +class RedirectAdminListConfiguratorTest extends TestCase { /** * @var EntityManager diff --git a/src/Kunstmaan/RedirectBundle/Tests/unit/DependencyInjection/ConfigurationTest.php b/src/Kunstmaan/RedirectBundle/Tests/unit/DependencyInjection/ConfigurationTest.php index 57b069c8f9..b5f663be2c 100644 --- a/src/Kunstmaan/RedirectBundle/Tests/unit/DependencyInjection/ConfigurationTest.php +++ b/src/Kunstmaan/RedirectBundle/Tests/unit/DependencyInjection/ConfigurationTest.php @@ -4,12 +4,12 @@ use Kunstmaan\RedirectBundle\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/RedirectBundle/Tests/unit/DependencyInjection/KunstmaanRedirectExtensionTest.php b/src/Kunstmaan/RedirectBundle/Tests/unit/DependencyInjection/KunstmaanRedirectExtensionTest.php index ce6c8fd700..2f449dd883 100644 --- a/src/Kunstmaan/RedirectBundle/Tests/unit/DependencyInjection/KunstmaanRedirectExtensionTest.php +++ b/src/Kunstmaan/RedirectBundle/Tests/unit/DependencyInjection/KunstmaanRedirectExtensionTest.php @@ -3,13 +3,13 @@ namespace Kunstmaan\RedirectBundle\Tests\DependencyInjection; use Kunstmaan\RedirectBundle\DependencyInjection\KunstmaanRedirectExtension; +use Matthias\SymfonyDependencyInjectionTest\PhpUnit\AbstractExtensionTestCase; use Symfony\Component\DependencyInjection\Extension\ExtensionInterface; -use Kunstmaan\AdminBundle\Tests\unit\AbstractPrependableExtensionTestCase; /** * Class KunstmaanRedirectExtensionTest */ -class KunstmaanRedirectExtensionTest extends AbstractPrependableExtensionTestCase +class KunstmaanRedirectExtensionTest extends AbstractExtensionTestCase { /** * @return ExtensionInterface[] diff --git a/src/Kunstmaan/RedirectBundle/Tests/unit/Entity/RedirectTest.php b/src/Kunstmaan/RedirectBundle/Tests/unit/Entity/RedirectTest.php index ff4052a542..42a95a5bd1 100644 --- a/src/Kunstmaan/RedirectBundle/Tests/unit/Entity/RedirectTest.php +++ b/src/Kunstmaan/RedirectBundle/Tests/unit/Entity/RedirectTest.php @@ -3,14 +3,14 @@ namespace Kunstmaan\RedirectBundle\Tests\Entity; use Kunstmaan\RedirectBundle\Entity\Redirect; -use PHPUnit_Framework_TestCase; +use PHPUnit\Framework\TestCase; use Symfony\Component\Validator\Context\ExecutionContext; use Symfony\Component\Validator\Violation\ConstraintViolationBuilder; /** * Class RedirectTest */ -class RedirectTest extends PHPUnit_Framework_TestCase +class RedirectTest extends TestCase { /** * @var Redirect diff --git a/src/Kunstmaan/RedirectBundle/Tests/unit/Form/RedirectAdminTypeTest.php b/src/Kunstmaan/RedirectBundle/Tests/unit/Form/RedirectAdminTypeTest.php index b31b63d9f7..0bcfeacd91 100644 --- a/src/Kunstmaan/RedirectBundle/Tests/unit/Form/RedirectAdminTypeTest.php +++ b/src/Kunstmaan/RedirectBundle/Tests/unit/Form/RedirectAdminTypeTest.php @@ -4,12 +4,12 @@ use Kunstmaan\AdminBundle\Helper\DomainConfigurationInterface; use Kunstmaan\RedirectBundle\Form\RedirectAdminType; -use PHPUnit_Framework_TestCase; +use PHPUnit\Framework\TestCase; /** * Class RedirectAdminTypeTest */ -class RedirectAdminTypeTest extends PHPUnit_Framework_TestCase +class RedirectAdminTypeTest extends TestCase { /** * @var RedirectAdminType diff --git a/src/Kunstmaan/RedirectBundle/Tests/unit/Router/RedirectRouterTest.php b/src/Kunstmaan/RedirectBundle/Tests/unit/Router/RedirectRouterTest.php index 43885ec1b8..5fa1a65805 100644 --- a/src/Kunstmaan/RedirectBundle/Tests/unit/Router/RedirectRouterTest.php +++ b/src/Kunstmaan/RedirectBundle/Tests/unit/Router/RedirectRouterTest.php @@ -5,14 +5,13 @@ use Doctrine\Common\Persistence\ObjectRepository; use Kunstmaan\RedirectBundle\Entity\Redirect; use Kunstmaan\RedirectBundle\Router\RedirectRouter; -use PHPUnit_Framework_TestCase; -use Symfony\Component\Routing\Exception\RouteNotFoundException; +use PHPUnit\Framework\TestCase; use Symfony\Component\Routing\RequestContext; /** * Class RedirectRouterTest */ -class RedirectRouterTest extends PHPUnit_Framework_TestCase +class RedirectRouterTest extends TestCase { /** * @var RedirectRouter @@ -113,12 +112,17 @@ public function testGetRouteCollectionf() $this->assertEquals(3, $collection->count()); } + /** + * @expectedException \Symfony\Component\Routing\Exception\RouteNotFoundException + */ public function testGenerate() { - $this->setExpectedException(RouteNotFoundException::class); $this->firstObject->generate('test'); } + /** + * @expectedException \Symfony\Component\Routing\Exception\ResourceNotFoundException + */ public function testMatch() { $redirect = $this->firstObject->match('/test1'); @@ -154,10 +158,8 @@ public function testMatch() $redirect ); - $this->setExpectedException('Symfony\Component\Routing\Exception\ResourceNotFoundException'); $this->firstObject->match('/testnotfound'); - $this->setExpectedException('Symfony\Component\Routing\Exception\ResourceNotFoundException'); $this->firstObject->match('/test4'); $redirect = $this->secondObject->match('/test4'); diff --git a/src/Kunstmaan/RedirectBundle/composer.json b/src/Kunstmaan/RedirectBundle/composer.json index b02a7a6ec8..58100d6e43 100644 --- a/src/Kunstmaan/RedirectBundle/composer.json +++ b/src/Kunstmaan/RedirectBundle/composer.json @@ -18,11 +18,11 @@ "symfony-cmf/routing-bundle": "~2.0" }, "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" }, "minimum-stability": "dev", "autoload": {