Merge branch '2.7' into 2.8

* 2.7: fail when detecting risky tests
fail when detecting risky tests
2026-03-24 09:12:18 +01:00 · 2017-04-12 07:07:15 -07:00 · 2017-04-12 09:39:27 +02:00 · 2017-02-18 11:13:35 -08:00 · 2017-02-18 10:28:08 -08:00 · 2017-02-18 18:06:33 +01:00
9 changed files with 17 additions and 8 deletions
--- a/Tests/ApcClassLoaderTest.php
+++ b/Tests/ApcClassLoaderTest.php
@@ -11,10 +11,11 @@

 namespace Symfony\Component\ClassLoader\Tests;

+use PHPUnit\Framework\TestCase;
 use Symfony\Component\ClassLoader\ApcClassLoader;
 use Symfony\Component\ClassLoader\ClassLoader;

-class ApcClassLoaderTest extends \PHPUnit_Framework_TestCase
+class ApcClassLoaderTest extends TestCase
 {
    protected function setUp()
    {
--- a/Tests/ClassCollectionLoaderTest.php
+++ b/Tests/ClassCollectionLoaderTest.php
@@ -11,6 +11,7 @@

 namespace Symfony\Component\ClassLoader\Tests;

+use PHPUnit\Framework\TestCase;
 use Symfony\Component\ClassLoader\ClassCollectionLoader;

 require_once __DIR__.'/Fixtures/ClassesWithParents/GInterface.php';
@@ -18,7 +19,7 @@ require_once __DIR__.'/Fixtures/ClassesWithParents/CInterface.php';
 require_once __DIR__.'/Fixtures/ClassesWithParents/B.php';
 require_once __DIR__.'/Fixtures/ClassesWithParents/A.php';

-class ClassCollectionLoaderTest extends \PHPUnit_Framework_TestCase
+class ClassCollectionLoaderTest extends TestCase
 {
    /**
     * @requires PHP 5.4
--- a/Tests/ClassLoaderTest.php
+++ b/Tests/ClassLoaderTest.php
@@ -11,9 +11,10 @@

 namespace Symfony\Component\ClassLoader\Tests;

+use PHPUnit\Framework\TestCase;
 use Symfony\Component\ClassLoader\ClassLoader;

-class ClassLoaderTest extends \PHPUnit_Framework_TestCase
+class ClassLoaderTest extends TestCase
 {
    public function testGetPrefixes()
    {
--- a/Tests/ClassMapGeneratorTest.php
+++ b/Tests/ClassMapGeneratorTest.php
@@ -11,9 +11,10 @@

 namespace Symfony\Component\ClassLoader\Tests;

+use PHPUnit\Framework\TestCase;
 use Symfony\Component\ClassLoader\ClassMapGenerator;

-class ClassMapGeneratorTest extends \PHPUnit_Framework_TestCase
+class ClassMapGeneratorTest extends TestCase
 {
    /**
     * @var string|null
--- a/Tests/LegacyApcUniversalClassLoaderTest.php
+++ b/Tests/LegacyApcUniversalClassLoaderTest.php
@@ -11,12 +11,13 @@

 namespace Symfony\Component\ClassLoader\Tests;

+use PHPUnit\Framework\TestCase;
 use Symfony\Component\ClassLoader\ApcUniversalClassLoader;

 /**
 * @group legacy
 */
-class LegacyApcUniversalClassLoaderTest extends \PHPUnit_Framework_TestCase
+class LegacyApcUniversalClassLoaderTest extends TestCase
 {
    protected function setUp()
    {
--- a/Tests/LegacyUniversalClassLoaderTest.php
+++ b/Tests/LegacyUniversalClassLoaderTest.php
@@ -11,12 +11,13 @@

 namespace Symfony\Component\ClassLoader\Tests;

+use PHPUnit\Framework\TestCase;
 use Symfony\Component\ClassLoader\UniversalClassLoader;

 /**
 * @group legacy
 */
-class LegacyUniversalClassLoaderTest extends \PHPUnit_Framework_TestCase
+class LegacyUniversalClassLoaderTest extends TestCase
 {
    /**
     * @dataProvider getLoadClassTests
--- a/Tests/Psr4ClassLoaderTest.php
+++ b/Tests/Psr4ClassLoaderTest.php
@@ -11,9 +11,10 @@

 namespace Symfony\Component\ClassLoader\Tests;

+use PHPUnit\Framework\TestCase;
 use Symfony\Component\ClassLoader\Psr4ClassLoader;

-class Psr4ClassLoaderTest extends \PHPUnit_Framework_TestCase
+class Psr4ClassLoaderTest extends TestCase
 {
    /**
     * @param string $className
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
        "symfony/polyfill-apcu": "~1.1"
    },
    "require-dev": {
-        "symfony/finder": "~2.0,>=2.0.5|~3.0.0"
+        "symfony/finder": "^2.0.5|~3.0.0"
    },
    "autoload": {
        "psr-4": { "Symfony\\Component\\ClassLoader\\": "" },
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -5,6 +5,8 @@
         backupGlobals="false"
         colors="true"
         bootstrap="vendor/autoload.php"
+         failOnRisky="true"
+         failOnWarning="true"
 >
    <php>
        <ini name="error_reporting" value="-1" />
Author	SHA1	Message	Date
Fabien Potencier	6789dc86c9	Merge branch '2.7' into 2.8 * 2.7: fail when detecting risky tests	2017-04-12 07:07:15 -07:00
Christian Flothmann	fdb4806d2e	fail when detecting risky tests	2017-04-12 09:39:27 +02:00
Fabien Potencier	2c8de07a8a	fixed Composer constraints	2017-02-18 11:13:35 -08:00
Fabien Potencier	b6e2bb88a8	fixed Composer constraints	2017-02-18 10:28:08 -08:00
Nicolas Grekas	a6f009ccd5	Merge branch '2.7' into 2.8 * 2.7: Update to PHPUnit namespaces remove translation data collector when not usable	2017-02-18 18:06:33 +01:00
Peter Rehm	64d2af707a	Update to PHPUnit namespaces	2017-02-18 08:02:39 -08:00