Skip to content

Commit

Permalink
Merge pull request #2321 from acrobat/taggingbundle-upgrade-dev
Browse files Browse the repository at this point in the history
[TaggingBundle] upgraded dev dependencies
  • Loading branch information
sandergo90 committed Feb 1, 2019
2 parents deb388f + a734514 commit 546c02b
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 23 deletions.
1 change: 1 addition & 0 deletions src/Kunstmaan/TaggingBundle/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
.idea
vendor
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@

use Kunstmaan\TaggingBundle\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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
use Kunstmaan\TaggingBundle\Entity\Taggable;
use Kunstmaan\TaggingBundle\Entity\TaggableTrait;
use Kunstmaan\TaggingBundle\Entity\TagManager;
use PHPUnit_Framework_TestCase;
use PHPUnit\Framework\TestCase;

class Query extends AbstractQuery
{
Expand Down Expand Up @@ -83,7 +83,7 @@ public function getId()
/**
* Class TagManagerTest
*/
class TagManagerTest extends PHPUnit_Framework_TestCase
class TagManagerTest extends TestCase
{
/** @var TagManager $object */
private $object;
Expand Down
11 changes: 5 additions & 6 deletions src/Kunstmaan/TaggingBundle/Tests/unit/Entity/TagTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,19 @@

namespace Kunstmaan\TaggingBundle\Tests\Entity;

use DateTime;
use Kunstmaan\TaggingBundle\Entity\Tag;
use Kunstmaan\TaggingBundle\Form\TagAdminType;
use PHPUnit_Framework_TestCase;
use PHPUnit\Framework\TestCase;

/**
* Class TagTest
*/
class TagTest extends PHPUnit_Framework_TestCase
class TagTest extends TestCase
{
public function testGetters()
{
$object = new Tag();
$today = new DateTime();
$today = new \DateTime();

$object->setId(666);
$object->setCreatedAt($today);
Expand All @@ -26,8 +25,8 @@ public function testGetters()
$this->assertEquals(666, $object->getId());
$this->assertEquals('Nigel Farage', $object->getName());
$this->assertEquals('en', $object->getTranslatableLocale());
$this->assertInstanceOf(DateTime::class, $object->getCreatedAt());
$this->assertInstanceOf(DateTime::class, $object->getUpdatedAt());
$this->assertInstanceOf(\DateTime::class, $object->getCreatedAt());
$this->assertInstanceOf(\DateTime::class, $object->getUpdatedAt());
$this->assertEquals(TagAdminType::class, $object->getDefaultAdminType());
$this->assertEquals('Nigel Farage', $object->__toString());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
use Doctrine\Common\Collections\ArrayCollection;
use Kunstmaan\TaggingBundle\Entity\Taggable;
use Kunstmaan\TaggingBundle\Entity\TaggableTrait;
use PHPUnit_Framework_TestCase;
use PHPUnit\Framework\TestCase;

class Random implements Taggable
{
Expand All @@ -32,7 +32,7 @@ public function getId()
/**
* Class TaggableTraitTest
*/
class TaggableTraitTest extends PHPUnit_Framework_TestCase
class TaggableTraitTest extends TestCase
{
public function testGetters()
{
Expand Down
11 changes: 5 additions & 6 deletions src/Kunstmaan/TaggingBundle/Tests/unit/Entity/TaggingTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,19 @@

namespace Kunstmaan\TaggingBundle\Tests\Entity;

use DateTime;
use Kunstmaan\TaggingBundle\Entity\Tag;
use Kunstmaan\TaggingBundle\Entity\Tagging;
use PHPUnit_Framework_TestCase;
use PHPUnit\Framework\TestCase;

/**
* Class TagTest
*/
class TaggingTest extends PHPUnit_Framework_TestCase
class TaggingTest extends TestCase
{
public function testGetters()
{
$object = new Tagging();
$today = new DateTime();
$today = new \DateTime();

$object->setId(666);
$object->setCreatedAt($today);
Expand All @@ -27,8 +26,8 @@ public function testGetters()
$this->assertEquals(666, $object->getId());
$this->assertEquals(667, $object->getResourceId());
$this->assertEquals('something', $object->getResourceType());
$this->assertInstanceOf(DateTime::class, $object->getCreatedAt());
$this->assertInstanceOf(DateTime::class, $object->getUpdatedAt());
$this->assertInstanceOf(\DateTime::class, $object->getCreatedAt());
$this->assertInstanceOf(\DateTime::class, $object->getUpdatedAt());
$this->assertInstanceOf(Tag::class, $object->getTag());
}
}
10 changes: 5 additions & 5 deletions src/Kunstmaan/TaggingBundle/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@
"kunstmaan/pagepart-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\\TaggingBundle\\": "" }
Expand Down

0 comments on commit 546c02b

Please sign in to comment.