Merge 2.x into master

sonata-project · Oct 17, 2017 · 6b8230b · 6b8230b
2 parents 1e6afe1 + e573f00
commit 6b8230b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/Tests/Checker/TranslatableCheckerForKnpTest.php b/Tests/Checker/TranslatableCheckerForKnpTest.php
@@ -11,13 +11,14 @@
 
 namespace Sonata\AdminBundle\Tests\Checker;
 
+use PHPUnit\Framework\TestCase;
 use Sonata\TranslationBundle\Checker\TranslatableChecker;
 use Sonata\TranslationBundle\Tests\Fixtures\Model\Knplabs\TranslatableEntity;
 
 /**
  * @author Alfonso Machado <email@alfonsomachado.com>
  */
-class TranslatableCheckerForKnpTest extends \PHPUnit_Framework_TestCase
+class TranslatableCheckerForKnpTest extends TestCase
 {
     /**
      * @test TranslatableChecker::isTranslatable

diff --git a/Tests/Checker/TranslatableCheckerTest.php b/Tests/Checker/TranslatableCheckerTest.php
@@ -11,6 +11,7 @@
 
 namespace Sonata\TranslationBundle\Tests\Checker;
 
+use PHPUnit\Framework\TestCase;
 use Sonata\TranslationBundle\Checker\TranslatableChecker;
 use Sonata\TranslationBundle\Tests\Fixtures\Model\ModelCustomTranslatable;
 use Sonata\TranslationBundle\Tests\Fixtures\Model\ModelTranslatable;
@@ -19,7 +20,7 @@
 /**
  * @author Nicolas Bastien <nbastien.pro@gmail.com>
  */
-class TranslatableCheckerTest extends \PHPUnit_Framework_TestCase
+class TranslatableCheckerTest extends TestCase
 {
     /**
      * @test TranslatableChecker::isTranslatable

diff --git a/Tests/Model/GedmoTest.php b/Tests/Model/GedmoTest.php
@@ -11,6 +11,7 @@
 
 namespace Sonata\TranslationBundle\Tests\Model;
 
+use PHPUnit\Framework\TestCase;
 use Sonata\TranslationBundle\Model\Gedmo\TranslatableInterface;
 use Sonata\TranslationBundle\Tests\Fixtures\Model\ModelPersonalTranslatable;
 use Sonata\TranslationBundle\Tests\Fixtures\Model\ModelPersonalTranslation;
@@ -19,7 +20,7 @@
 /**
  * @author Nicolas Bastien <nbastien.pro@gmail.com>
  */
-class GedmoTest extends \PHPUnit_Framework_TestCase
+class GedmoTest extends TestCase
 {
     /**
      * @test AbstractTranslatable

diff --git a/Tests/Traits/GedmoTest.php b/Tests/Traits/GedmoTest.php
@@ -11,6 +11,7 @@
 
 namespace Sonata\TranslationBundle\Tests\Traits;
 
+use PHPUnit\Framework\TestCase;
 use Sonata\TranslationBundle\Tests\Fixtures\Traits\ModelPersonalTranslatable;
 use Sonata\TranslationBundle\Tests\Fixtures\Traits\ModelPersonalTranslation;
 use Sonata\TranslationBundle\Tests\Fixtures\Traits\ModelTranslatable;
@@ -20,7 +21,7 @@
 /**
  * @author Nicolas Bastien <nbastien.pro@gmail.com>
  */
-class GedmoTest extends \PHPUnit_Framework_TestCase
+class GedmoTest extends TestCase
 {
     /**
      * @test TranslatableTrait