Merge pull request #1825 from Slamdunk/patch-1

l3pp4rd · web-flow · commit ad2d4f4f0aee · 2018-01-30T20:41:46.000+02:00
Tests: remove manual env checks, update PHPUnit
diff --git a/.travis.yml b/.travis.yml
@@ -12,6 +12,10 @@ matrix:
         - php: 7.1
         - php: 7.2
 
+cache:
+    directories:
+        - $HOME/.composer/cache
+
 services: mongodb
 
 before_install:
diff --git a/composer.json b/composer.json
@@ -47,7 +47,7 @@
         "doctrine/orm": ">=2.5.0",
         "doctrine/common": ">=2.5.0",
         "symfony/yaml": "~2.6|~3.0|~4.0",
-        "phpunit/phpunit": "*"
+        "phpunit/phpunit": "^4.8|^5.7|^6.5"
     },
     "suggest": {
         "doctrine/mongodb-odm": "to use the extensions with the MongoDB ODM",
diff --git a/composer7.json b/composer7.json
@@ -47,11 +47,11 @@
     },
     "require-dev": {
         "alcaeus/mongo-php-adapter": "~1.0.4",
-        "doctrine/mongodb-odm": "~1.0",
+        "doctrine/mongodb-odm": ">=1.0.2",
         "doctrine/orm": ">=2.5.0",
         "doctrine/common": ">=2.5.0",
-        "symfony/yaml": "~2.6|~3.0",
-        "phpunit/phpunit": "*"
+        "symfony/yaml": "~2.6|~3.0|~4.0",
+        "phpunit/phpunit": "^4.8|^5.7|^6.5"
     },
     "suggest": {
         "doctrine/mongodb-odm": "to use the extensions with the MongoDB ODM",
diff --git a/lib/Gedmo/Tool/Logging/DBAL/QueryAnalyzer.php b/lib/Gedmo/Tool/Logging/DBAL/QueryAnalyzer.php
@@ -180,15 +180,15 @@ public function getExecutionTimes()
     /**
      * Create the SQL with mapped parameters
      *
-     * @param string $sql
-     * @param array  $params
-     * @param array  $types
+     * @param string      $sql
+     * @param null|array  $params
+     * @param null|array  $types
      *
      * @return string
      */
     private function generateSql($sql, $params, $types)
     {
-        if (!count($params)) {
+        if (null === $params || !count($params)) {
             return $sql;
         }
         $converted = $this->getConvertedParams($params, $types);
diff --git a/tests/Gedmo/IpTraceable/IpTraceableTest.php b/tests/Gedmo/IpTraceable/IpTraceableTest.php
@@ -40,7 +40,7 @@ public function testInvalidIpShouldThrowInvalidArgumentException()
     {
         $listener = new IpTraceableListener();
 
-        $this->setExpectedException('Gedmo\Exception\InvalidArgumentException');
+        $this->expectException('Gedmo\Exception\InvalidArgumentException');
 
         $listener->setIpValue('xx.xxx.xx.xxx');
     }
diff --git a/tests/Gedmo/Mapping/LoggableMappingTest.php b/tests/Gedmo/Mapping/LoggableMappingTest.php
@@ -14,7 +14,7 @@
  * @link http://www.gediminasm.org
  * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-class LoggableMappingTest extends \PHPUnit_Framework_TestCase
+class LoggableMappingTest extends \PHPUnit\Framework\TestCase
 {
     const YAML_CATEGORY = 'Mapping\Fixture\Yaml\Category';
     private $em;
diff --git a/tests/Gedmo/Mapping/MappingEventAdapterTest.php b/tests/Gedmo/Mapping/MappingEventAdapterTest.php
@@ -8,7 +8,7 @@
 use Doctrine\ORM\Event\LifecycleEventArgs;
 use Gedmo\Mapping\Mock\Mapping\Event\Adapter\ORM as CustomizedORMAdapter;
 
-class MappingEventAdapterTest extends \PHPUnit_Framework_TestCase
+class MappingEventAdapterTest extends \PHPUnit\Framework\TestCase
 {
     public function testCustomizedAdapter()
     {
diff --git a/tests/Gedmo/Mapping/MappingTest.php b/tests/Gedmo/Mapping/MappingTest.php
@@ -11,7 +11,7 @@
  * @link http://www.gediminasm.org
  * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-class MappingTest extends \PHPUnit_Framework_TestCase
+class MappingTest extends \PHPUnit\Framework\TestCase
 {
     const TEST_ENTITY_CATEGORY = "Tree\Fixture\BehavioralCategory";
     const TEST_ENTITY_TRANSLATION = "Gedmo\Translatable\Entity\Translation";
diff --git a/tests/Gedmo/Mapping/MetadataFactory/CustomDriverTest.php b/tests/Gedmo/Mapping/MetadataFactory/CustomDriverTest.php
@@ -11,7 +11,7 @@
 * @link http://www.gediminasm.org
 * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
 */
-class CustomDriverTest extends \PHPUnit_Framework_TestCase
+class CustomDriverTest extends \PHPUnit\Framework\TestCase
 {
     public function setUp()
     {
diff --git a/tests/Gedmo/Mapping/MetadataFactory/ForcedMetadataTest.php b/tests/Gedmo/Mapping/MetadataFactory/ForcedMetadataTest.php
@@ -11,7 +11,7 @@
 * @link http://www.gediminasm.org
 * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
 */
-class ForcedMetadataTest extends \PHPUnit_Framework_TestCase
+class ForcedMetadataTest extends \PHPUnit\Framework\TestCase
 {
     public function setUp()
     {
diff --git a/tests/Gedmo/Mapping/SluggableMappingTest.php b/tests/Gedmo/Mapping/SluggableMappingTest.php
@@ -14,7 +14,7 @@
  * @link http://www.gediminasm.org
  * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-class SluggableMappingTest extends \PHPUnit_Framework_TestCase
+class SluggableMappingTest extends \PHPUnit\Framework\TestCase
 {
     const TEST_YAML_ENTITY_CLASS = 'Mapping\Fixture\Yaml\Category';
     const SLUGGABLE = 'Mapping\Fixture\Sluggable';
diff --git a/tests/Gedmo/Mapping/TimestampableMappingTest.php b/tests/Gedmo/Mapping/TimestampableMappingTest.php
@@ -14,7 +14,7 @@
  * @link http://www.gediminasm.org
  * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-class TimestampableMappingTest extends \PHPUnit_Framework_TestCase
+class TimestampableMappingTest extends \PHPUnit\Framework\TestCase
 {
     const TEST_YAML_ENTITY_CLASS = 'Mapping\Fixture\Yaml\Category';
     private $em;
diff --git a/tests/Gedmo/Mapping/TranslatableMappingTest.php b/tests/Gedmo/Mapping/TranslatableMappingTest.php
@@ -14,7 +14,7 @@
  * @link http://www.gediminasm.org
  * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-class TranslatableMappingTest extends \PHPUnit_Framework_TestCase
+class TranslatableMappingTest extends \PHPUnit\Framework\TestCase
 {
     const TEST_YAML_ENTITY_CLASS = 'Mapping\Fixture\Yaml\User';
     private $em;
diff --git a/tests/Gedmo/Mapping/TreeMappingTest.php b/tests/Gedmo/Mapping/TreeMappingTest.php
@@ -13,7 +13,7 @@
  * @link http://www.gediminasm.org
  * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-class TreeMappingTest extends \PHPUnit_Framework_TestCase
+class TreeMappingTest extends \PHPUnit\Framework\TestCase
 {
     const TEST_YAML_ENTITY_CLASS = 'Mapping\Fixture\Yaml\Category';
     const YAML_CLOSURE_CATEGORY = 'Mapping\Fixture\Yaml\ClosureCategory';
diff --git a/tests/Gedmo/SoftDeleteable/SoftDeletableDocumentTraitTest.php b/tests/Gedmo/SoftDeleteable/SoftDeletableDocumentTraitTest.php
@@ -11,7 +11,7 @@
  * @link http://www.gediminasm.org
  * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-class SoftDeletableDocumentTraitTest extends \PHPUnit_Framework_TestCase
+class SoftDeletableDocumentTraitTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var UsingTrait
diff --git a/tests/Gedmo/SoftDeleteable/SoftDeletableEntityTraitTest.php b/tests/Gedmo/SoftDeleteable/SoftDeletableEntityTraitTest.php
@@ -11,7 +11,7 @@
  * @link http://www.gediminasm.org
  * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-class SoftDeletableEntityTraitTest extends \PHPUnit_Framework_TestCase
+class SoftDeletableEntityTraitTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var UsingTrait
diff --git a/tests/Gedmo/Tool/BaseTestCaseMongoODM.php b/tests/Gedmo/Tool/BaseTestCaseMongoODM.php
@@ -22,7 +22,7 @@
  * @link http://www.gediminasm.org
  * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-abstract class BaseTestCaseMongoODM extends \PHPUnit_Framework_TestCase
+abstract class BaseTestCaseMongoODM extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var DocumentManager
@@ -39,6 +39,18 @@ protected function setUp()
         }
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function expectException($exception)
+    {
+        if (method_exists('PHPUnit\\Framework\\TestCase', 'setExpectedException')) {
+            return parent::setExpectedException($exception);
+        }
+
+        return parent::expectException($exception);
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/tests/Gedmo/Tool/BaseTestCaseOM.php b/tests/Gedmo/Tool/BaseTestCaseOM.php
@@ -33,7 +33,7 @@
  * @link http://www.gediminasm.org
  * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-abstract class BaseTestCaseOM extends \PHPUnit_Framework_TestCase
+abstract class BaseTestCaseOM extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var EventManager
@@ -54,6 +54,18 @@ protected function setUp()
     {
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function expectException($exception)
+    {
+        if (method_exists('PHPUnit\\Framework\\TestCase', 'setExpectedException')) {
+            return parent::setExpectedException($exception);
+        }
+
+        return parent::expectException($exception);
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/tests/Gedmo/Tool/BaseTestCaseORM.php b/tests/Gedmo/Tool/BaseTestCaseORM.php
@@ -27,7 +27,7 @@
  * @link http://www.gediminasm.org
  * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-abstract class BaseTestCaseORM extends \PHPUnit_Framework_TestCase
+abstract class BaseTestCaseORM extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var EntityManager
@@ -46,6 +46,18 @@ protected function setUp()
     {
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function expectException($exception)
+    {
+        if (method_exists('PHPUnit\\Framework\\TestCase', 'setExpectedException')) {
+            return parent::setExpectedException($exception);
+        }
+
+        return parent::expectException($exception);
+    }
+
     /**
      * EntityManager mock object together with
      * annotation mapping driver and pdo_sqlite
diff --git a/tests/Gedmo/Tree/MaterializedPathODMMongoDBTest.php b/tests/Gedmo/Tree/MaterializedPathODMMongoDBTest.php
@@ -110,7 +110,7 @@ public function insertUpdateAndRemove()
      */
     public function useOfSeparatorInPathSourceShouldThrowAnException()
     {
-        $this->setExpectedException('Gedmo\Exception\RuntimeException');
+        $this->expectException('Gedmo\Exception\RuntimeException');
 
         $category = $this->createCategory();
         $category->setTitle('1'.$this->config['path_separator']);
diff --git a/tests/Gedmo/Tree/MaterializedPathODMMongoDBTreeLockingTest.php b/tests/Gedmo/Tree/MaterializedPathODMMongoDBTreeLockingTest.php
@@ -43,7 +43,7 @@ public function modifyingANodeWhileItsTreeIsLockedShouldThrowAnException()
     {
         // By default, TreeListenerMock disables the release of the locks
         // for testing purposes
-        $this->setExpectedException('Gedmo\Exception\TreeLockingException');
+        $this->expectException('Gedmo\Exception\TreeLockingException');
 
         $article = $this->createArticle();
         $article->setTitle('1');
@@ -94,7 +94,7 @@ public function modifyingANodeWhileItsTreeIsNotLockedShouldNotThrowException()
         $this->dm->flush();
 
         // But this should throw it, because the root of its tree ($article) is still locked
-        $this->setExpectedException('Gedmo\Exception\TreeLockingException');
+        $this->expectException('Gedmo\Exception\TreeLockingException');
 
         $repo = $this->dm->getRepository(self::ARTICLE);
         $article2 = $repo->findOneByTitle('2');
diff --git a/tests/Gedmo/Tree/MaterializedPathORMTest.php b/tests/Gedmo/Tree/MaterializedPathORMTest.php
@@ -121,7 +121,7 @@ public function insertUpdateAndRemove()
      */
     public function useOfSeparatorInPathSourceShouldThrowAnException()
     {
-        $this->setExpectedException('Gedmo\Exception\RuntimeException');
+        $this->expectException('Gedmo\Exception\RuntimeException');
 
         $category = $this->createCategory();
         $category->setTitle('1'.$this->config['path_separator']);
diff --git a/tests/Gedmo/Uploadable/FileInfo/FileInfoArrayTest.php b/tests/Gedmo/Uploadable/FileInfo/FileInfoArrayTest.php
@@ -11,7 +11,7 @@
  * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
-class FileInfoArrayTest extends \PHPUnit_Framework_TestCase
+class FileInfoArrayTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @expectedException RuntimeException
diff --git a/tests/Gedmo/Uploadable/FilenameGenerator/FilenameGeneratorAlphanumericTest.php b/tests/Gedmo/Uploadable/FilenameGenerator/FilenameGeneratorAlphanumericTest.php
@@ -12,7 +12,7 @@
  * @link http://www.gediminasm.org
  * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-class FilenameGeneratorAlphanumericTest extends \PHPUnit_Framework_TestCase
+class FilenameGeneratorAlphanumericTest extends \PHPUnit\Framework\TestCase
 {
     public function testGenerator()
     {
diff --git a/tests/Gedmo/Uploadable/Mapping/ValidatorTest.php b/tests/Gedmo/Uploadable/Mapping/ValidatorTest.php
@@ -11,7 +11,7 @@
  * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
-class ValidatorTest extends \PHPUnit_Framework_TestCase
+class ValidatorTest extends \PHPUnit\Framework\TestCase
 {
     protected $meta;
 
diff --git a/tests/Gedmo/Uploadable/UploadableEntityTest.php b/tests/Gedmo/Uploadable/UploadableEntityTest.php
@@ -313,7 +313,7 @@ public function testCallbackIsCalledIfItsSetOnEntity()
      */
     public function testUploadExceptions($error, $exceptionClass)
     {
-        $this->setExpectedException($exceptionClass);
+        $this->expectException($exceptionClass);
 
         $file = new File();
         $fileInfo = $this->generateUploadedFile();
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -20,16 +20,6 @@
 define('TESTS_TEMP_DIR', __DIR__.'/temp');
 define('VENDOR_PATH', realpath(__DIR__.'/../vendor'));
 
-if (!class_exists('PHPUnit_Framework_TestCase') ||
-    version_compare(PHPUnit_Runner_Version::id(), '3.5') < 0
-) {
-    die('PHPUnit framework is required, at least 3.5 version');
-}
-
-if (!class_exists('PHPUnit_Framework_MockObject_MockBuilder')) {
-    die('PHPUnit MockObject plugin is required, at least 1.0.8 version');
-}
-
 /** @var $loader ClassLoader */
 $loader = require __DIR__.'/../vendor/autoload.php';
 

Original file line number	Diff line number	Diff line change
`@@ -180,15 +180,15 @@ public function getExecutionTimes()`
`180`	`180`	`/**`
`181`	`181`	`* Create the SQL with mapped parameters`
`182`	`182`	`*`
`183`		`- * @param string $sql`
`184`		`- * @param array $params`
`185`		`- * @param array $types`
	`183`	`+ * @param string $sql`
	`184`	`+ * @param null\|array $params`
	`185`	`+ * @param null\|array $types`
`186`	`186`	`*`
`187`	`187`	`* @return string`
`188`	`188`	`*/`
`189`	`189`	`private function generateSql($sql, $params, $types)`
`190`	`190`	`{`
`191`		`- if (!count($params)) {`
	`191`	`+ if (null === $params \|\| !count($params)) {`
`192`	`192`	`return $sql;`
`193`	`193`	`}`
`194`	`194`	`$converted = $this->getConvertedParams($params, $types);`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public function testInvalidIpShouldThrowInvalidArgumentException()`
`40`	`40`	`{`
`41`	`41`	`$listener = new IpTraceableListener();`
`42`	`42`
`43`		`- $this->setExpectedException('Gedmo\Exception\InvalidArgumentException');`
	`43`	`+ $this->expectException('Gedmo\Exception\InvalidArgumentException');`
`44`	`44`
`45`	`45`	`$listener->setIpValue('xx.xxx.xx.xxx');`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`* @link http://www.gediminasm.org`
`15`	`15`	`* @license MIT License (http://www.opensource.org/licenses/mit-license.php)`
`16`	`16`	`*/`
`17`		`-class LoggableMappingTest extends \PHPUnit_Framework_TestCase`
	`17`	`+class LoggableMappingTest extends \PHPUnit\Framework\TestCase`
`18`	`18`	`{`
`19`	`19`	`const YAML_CATEGORY = 'Mapping\Fixture\Yaml\Category';`
`20`	`20`	`private $em;`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`use Doctrine\ORM\Event\LifecycleEventArgs;`
`9`	`9`	`use Gedmo\Mapping\Mock\Mapping\Event\Adapter\ORM as CustomizedORMAdapter;`
`10`	`10`
`11`		`-class MappingEventAdapterTest extends \PHPUnit_Framework_TestCase`
	`11`	`+class MappingEventAdapterTest extends \PHPUnit\Framework\TestCase`
`12`	`12`	`{`
`13`	`13`	`public function testCustomizedAdapter()`
`14`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`* @link http://www.gediminasm.org`
`12`	`12`	`* @license MIT License (http://www.opensource.org/licenses/mit-license.php)`
`13`	`13`	`*/`
`14`		`-class MappingTest extends \PHPUnit_Framework_TestCase`
	`14`	`+class MappingTest extends \PHPUnit\Framework\TestCase`
`15`	`15`	`{`
`16`	`16`	`const TEST_ENTITY_CATEGORY = "Tree\Fixture\BehavioralCategory";`
`17`	`17`	`const TEST_ENTITY_TRANSLATION = "Gedmo\Translatable\Entity\Translation";`