PHPUnit 6.0 & PSR-4 refactoring

lastzero · Feb 4, 2017 · 8769a67 · 8769a67 · TomasVotruba · Feb 4, 2017
1 parent d20e7c4
commit 8769a67
Show file tree

Hide file tree

Showing 68 changed files with 5 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -31,7 +31,7 @@
         "phpunit/phpunit": ">=6.0"
     },
     "autoload": {
-        "psr-0": { "TestTools\\": "src/" }
+        "psr-4": { "TestTools\\": "src/" }
     },
     "config": {
         "bin-dir": "bin/"

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -13,15 +13,15 @@
         >
     <testsuites>
         <testsuite>
-            <directory>src/*/Tests</directory>
+            <directory>src/Tests</directory>
         </testsuite>
     </testsuites>
 
     <filter>
         <whitelist>
             <directory>src</directory>
             <exclude>
-                <directory>src/*/Tests</directory>
+                <directory>src/Tests</directory>
             </exclude>
         </whitelist>
     </filter>

diff --git a/src/TestTools/Basho/Riak.php → src/Basho/Riak.php b/src/TestTools/Basho/Riak.php → src/Basho/Riak.php
diff --git a/src/TestTools/Buzz/Client.php → src/Buzz/Client.php b/src/TestTools/Buzz/Client.php → src/Buzz/Client.php
diff --git a/src/TestTools/Doctrine/DBAL/Connection.php → src/Doctrine/DBAL/Connection.php b/src/TestTools/Doctrine/DBAL/Connection.php → src/Doctrine/DBAL/Connection.php
diff --git a/src/TestTools/Fixture/BlackBox.php → src/Fixture/BlackBox.php b/src/TestTools/Fixture/BlackBox.php → src/Fixture/BlackBox.php
diff --git a/...ception/FixtureEmptyFilenameException.php → ...ception/FixtureEmptyFilenameException.php b/...ception/FixtureEmptyFilenameException.php → ...ception/FixtureEmptyFilenameException.php
diff --git a/...ls/Fixture/Exception/FixtureException.php → src/Fixture/Exception/FixtureException.php b/...ls/Fixture/Exception/FixtureException.php → src/Fixture/Exception/FixtureException.php
diff --git a/...tion/FixtureInvalidDirectoryException.php → ...tion/FixtureInvalidDirectoryException.php b/...tion/FixtureInvalidDirectoryException.php → ...tion/FixtureInvalidDirectoryException.php
diff --git a/...re/Exception/FixtureNotFoundException.php → ...re/Exception/FixtureNotFoundException.php b/...re/Exception/FixtureNotFoundException.php → ...re/Exception/FixtureNotFoundException.php
diff --git a/...re/Exception/FixtureNotValidException.php → ...re/Exception/FixtureNotValidException.php b/...re/Exception/FixtureNotValidException.php → ...re/Exception/FixtureNotValidException.php
diff --git a/...ls/Fixture/Exception/OfflineException.php → src/Fixture/Exception/OfflineException.php b/...ls/Fixture/Exception/OfflineException.php → src/Fixture/Exception/OfflineException.php
diff --git a/src/TestTools/Fixture/FileFixture.php → src/Fixture/FileFixture.php b/src/TestTools/Fixture/FileFixture.php → src/Fixture/FileFixture.php
diff --git a/...ure/NonSerializableExceptionContainer.php → ...ure/NonSerializableExceptionContainer.php b/...ure/NonSerializableExceptionContainer.php → ...ure/NonSerializableExceptionContainer.php
diff --git a/.../Fixture/SelfInitializingFixtureTrait.php → src/Fixture/SelfInitializingFixtureTrait.php b/.../Fixture/SelfInitializingFixtureTrait.php → src/Fixture/SelfInitializingFixtureTrait.php
diff --git a/...ls/Guzzle/Http/EntityEnclosingRequest.php → src/Guzzle/Http/EntityEnclosingRequest.php b/...ls/Guzzle/Http/EntityEnclosingRequest.php → src/Guzzle/Http/EntityEnclosingRequest.php
diff --git a/src/TestTools/Guzzle/Http/Request.php → src/Guzzle/Http/Request.php b/src/TestTools/Guzzle/Http/Request.php → src/Guzzle/Http/Request.php
diff --git a/src/TestTools/Guzzle/Http/RequestFactory.php → src/Guzzle/Http/RequestFactory.php b/src/TestTools/Guzzle/Http/RequestFactory.php → src/Guzzle/Http/RequestFactory.php
diff --git a/src/TestTools/Profiler/Profiler.php → src/Profiler/Profiler.php b/src/TestTools/Profiler/Profiler.php → src/Profiler/Profiler.php
diff --git a/src/TestTools/Swift/Mailer.php → src/Swift/Mailer.php b/src/TestTools/Swift/Mailer.php → src/Swift/Mailer.php
diff --git a/src/TestTools/TestCase/CommandTestCase.php → src/TestCase/CommandTestCase.php b/src/TestTools/TestCase/CommandTestCase.php → src/TestCase/CommandTestCase.php
diff --git a/src/TestTools/TestCase/FixturePathTrait.php → src/TestCase/FixturePathTrait.php b/src/TestTools/TestCase/FixturePathTrait.php → src/TestCase/FixturePathTrait.php
diff --git a/src/TestTools/TestCase/UnitTestCase.php → src/TestCase/UnitTestCase.php b/src/TestTools/TestCase/UnitTestCase.php → src/TestCase/UnitTestCase.php
diff --git a/src/TestTools/TestCase/WebTestCase.php → src/TestCase/WebTestCase.php b/src/TestTools/TestCase/WebTestCase.php → src/TestCase/WebTestCase.php
diff --git a/src/TestTools/Tests/Buzz/ClientTest.php → src/Tests/Buzz/ClientTest.php b/src/TestTools/Tests/Buzz/ClientTest.php → src/Tests/Buzz/ClientTest.php
diff --git a/...ls/Tests/Doctrine/DBAL/ConnectionTest.php → src/Tests/Doctrine/DBAL/ConnectionTest.php b/...ls/Tests/Doctrine/DBAL/ConnectionTest.php → src/Tests/Doctrine/DBAL/ConnectionTest.php
diff --git a/...stTools/Tests/Fixture/FileFixtureTest.php → src/Tests/Fixture/FileFixtureTest.php b/...stTools/Tests/Fixture/FileFixtureTest.php → src/Tests/Fixture/FileFixtureTest.php
@@ -18,8 +18,7 @@ public function testBasePath () {
 
     public function testFixturePath () {
         $result = $this->getFixturePath();
-        $this->assertEquals(36, strpos(strrev($result), strrev('TestTools')));
-        $this->assertEquals(21, strpos(strrev($result), strrev('_fixture')));
+        $this->assertStringEndsWith('src/Tests/_fixtures/Fixture/FileFixture', $result);
     }
 
     public function testFilterAlphanumeric () {

diff --git a/...stTools/Tests/Fixture/NotSerializable.php → src/Tests/Fixture/NotSerializable.php b/...stTools/Tests/Fixture/NotSerializable.php → src/Tests/Fixture/NotSerializable.php
diff --git a/...ests/Fixture/NotSerializableException.php → ...ests/Fixture/NotSerializableException.php b/...ests/Fixture/NotSerializableException.php → ...ests/Fixture/NotSerializableException.php
diff --git a/...estTools/Tests/Guzzle/Http/ClientTest.php → src/Tests/Guzzle/Http/ClientTest.php b/...estTools/Tests/Guzzle/Http/ClientTest.php → src/Tests/Guzzle/Http/ClientTest.php
diff --git a/...TestTools/Tests/Profiler/ProfilerTest.php → src/Tests/Profiler/ProfilerTest.php b/...TestTools/Tests/Profiler/ProfilerTest.php → src/Tests/Profiler/ProfilerTest.php
diff --git a/src/TestTools/Tests/Swift/MailerTest.php → src/Tests/Swift/MailerTest.php b/src/TestTools/Tests/Swift/MailerTest.php → src/Tests/Swift/MailerTest.php
diff --git a/...Tools/Tests/TestCase/UnitTestCaseTest.php → src/Tests/TestCase/UnitTestCaseTest.php b/...Tools/Tests/TestCase/UnitTestCaseTest.php → src/Tests/TestCase/UnitTestCaseTest.php
@@ -17,7 +17,7 @@ class UnitTestCaseTest extends UnitTestCase
     public function testGetFixturePath()
     {
         $fixturePath = $this->getContainer()->getParameter('fixture.path') . '/';
-        $this->assertStringEndsWith('src/TestTools/Tests/_fixtures/TestCase/UnitTestCase/', $fixturePath);
+        $this->assertStringEndsWith('src/Tests/_fixtures/TestCase/UnitTestCase/', $fixturePath);
 
         $buzz = $this->get('buzz.fixture');
         $this->assertInstanceOf('TestTools\Buzz\Client', $buzz);

diff --git a/src/TestTools/Tests/TestCase/bar/.gitignore → src/Tests/TestCase/bar/.gitignore b/src/TestTools/Tests/TestCase/bar/.gitignore → src/Tests/TestCase/bar/.gitignore
diff --git a/src/TestTools/Tests/TestCase/container.yml → src/Tests/TestCase/container.yml b/src/TestTools/Tests/TestCase/container.yml → src/Tests/TestCase/container.yml
diff --git a/src/TestTools/Tests/TestCase/foo/.gitignore → src/Tests/TestCase/foo/.gitignore b/src/TestTools/Tests/TestCase/foo/.gitignore → src/Tests/TestCase/foo/.gitignore
diff --git a/...estTools/Tests/Util/FixedDateTimeTest.php → src/Tests/Util/FixedDateTimeTest.php b/...estTools/Tests/Util/FixedDateTimeTest.php → src/Tests/Util/FixedDateTimeTest.php
diff --git a/...array_0_HEADHTTP10Hosthttpgooglecom1_.fix → ...array_0_HEADHTTP10Hosthttpgooglecom1_.fix b/...array_0_HEADHTTP10Hosthttpgooglecom1_.fix → ...array_0_HEADHTTP10Hosthttpgooglecom1_.fix
diff --git a/...array_0_HEADHTTP11Hosthttpgooglecom1_.fix → ...array_0_HEADHTTP11Hosthttpgooglecom1_.fix b/...array_0_HEADHTTP11Hosthttpgooglecom1_.fix → ...array_0_HEADHTTP11Hosthttpgooglecom1_.fix
diff --git a/.../DBAL/Connection/sql_beginTransaction.fix → .../DBAL/Connection/sql_beginTransaction.fix b/.../DBAL/Connection/sql_beginTransaction.fix → .../DBAL/Connection/sql_beginTransaction.fix
diff --git a/...s/Doctrine/DBAL/Connection/sql_commit.fix → ...s/Doctrine/DBAL/Connection/sql_commit.fix b/...s/Doctrine/DBAL/Connection/sql_commit.fix → ...s/Doctrine/DBAL/Connection/sql_commit.fix
diff --git a/.../sql_delete.array_0_users1_array_id_3.fix → .../sql_delete.array_0_users1_array_id_3.fix b/.../sql_delete.array_0_users1_array_id_3.fix → .../sql_delete.array_0_users1_array_id_3.fix
diff --git a/...date.2072660e046f188438b6d2c161c79a7d.fix → ...date.2072660e046f188438b6d2c161c79a7d.fix b/...date.2072660e046f188438b6d2c161c79a7d.fix → ...date.2072660e046f188438b6d2c161c79a7d.fix
diff --git a/...date.6493d75f5d1160bd475c1e72a08b7238.fix → ...date.6493d75f5d1160bd475c1e72a08b7238.fix b/...date.6493d75f5d1160bd475c1e72a08b7238.fix → ...date.6493d75f5d1160bd475c1e72a08b7238.fix
diff --git a/...date.6a36349c4562e9b0fdf83e8439431486.fix → ...date.6a36349c4562e9b0fdf83e8439431486.fix b/...date.6a36349c4562e9b0fdf83e8439431486.fix → ...date.6a36349c4562e9b0fdf83e8439431486.fix
diff --git a/...date.b940a6eef37e0022d141c4b1de87014d.fix → ...date.b940a6eef37e0022d141c4b1de87014d.fix b/...date.b940a6eef37e0022d141c4b1de87014d.fix → ...date.b940a6eef37e0022d141c4b1de87014d.fix
diff --git a/...date.cbd9fec6f285963e4bffc2d7a8fb6036.fix → ...date.cbd9fec6f285963e4bffc2d7a8fb6036.fix b/...date.cbd9fec6f285963e4bffc2d7a8fb6036.fix → ...date.cbd9fec6f285963e4bffc2d7a8fb6036.fix
diff --git a/.../sql_fetchAll.array_0_SELECTFROMusers.fix → .../sql_fetchAll.array_0_SELECTFROMusers.fix b/.../sql_fetchAll.array_0_SELECTFROMusers.fix → .../sql_fetchAll.array_0_SELECTFROMusers.fix
diff --git a/...rray.array_0_SELECTFROMusersWHEREid_2.fix → ...rray.array_0_SELECTFROMusersWHEREid_2.fix b/...rray.array_0_SELECTFROMusersWHEREid_2.fix → ...rray.array_0_SELECTFROMusersWHEREid_2.fix
diff --git a/...ssoc.array_0_SELECTFROMusersWHEREid_2.fix → ...ssoc.array_0_SELECTFROMusersWHEREid_2.fix b/...ssoc.array_0_SELECTFROMusersWHEREid_2.fix → ...ssoc.array_0_SELECTFROMusersWHEREid_2.fix
diff --git a/...ay_0_SELECTusernameFROMusersWHEREid_2.fix → ...ay_0_SELECTusernameFROMusersWHEREid_2.fix b/...ay_0_SELECTusernameFROMusersWHEREid_2.fix → ...ay_0_SELECTusernameFROMusersWHEREid_2.fix
diff --git a/...AL/Connection/sql_getDatabasePlatform.fix → ...AL/Connection/sql_getDatabasePlatform.fix b/...AL/Connection/sql_getDatabasePlatform.fix → ...AL/Connection/sql_getDatabasePlatform.fix
diff --git a/...sert.5bb383030c65529cf1a7ef17cb00492d.fix → ...sert.5bb383030c65529cf1a7ef17cb00492d.fix b/...sert.5bb383030c65529cf1a7ef17cb00492d.fix → ...sert.5bb383030c65529cf1a7ef17cb00492d.fix
diff --git a/...sert.72db591ba51019ee42ee97adbec7b713.fix → ...sert.72db591ba51019ee42ee97adbec7b713.fix b/...sert.72db591ba51019ee42ee97adbec7b713.fix → ...sert.72db591ba51019ee42ee97adbec7b713.fix
diff --git a/...sert.b22732ed6fbb3b1f70da80eb789da0c6.fix → ...sert.b22732ed6fbb3b1f70da80eb789da0c6.fix b/...sert.b22732ed6fbb3b1f70da80eb789da0c6.fix → ...sert.b22732ed6fbb3b1f70da80eb789da0c6.fix
diff --git a/...rine/DBAL/Connection/sql_lastInsertId.fix → ...rine/DBAL/Connection/sql_lastInsertId.fix b/...rine/DBAL/Connection/sql_lastInsertId.fix → ...rine/DBAL/Connection/sql_lastInsertId.fix
diff --git a/...Doctrine/DBAL/Connection/sql_rollBack.fix → ...Doctrine/DBAL/Connection/sql_rollBack.fix b/...Doctrine/DBAL/Connection/sql_rollBack.fix → ...Doctrine/DBAL/Connection/sql_rollBack.fix
diff --git a/...date.b9ec7fc2d55c37e0486b0f5ad0830364.fix → ...date.b9ec7fc2d55c37e0486b0f5ad0830364.fix b/...date.b9ec7fc2d55c37e0486b0f5ad0830364.fix → ...date.b9ec7fc2d55c37e0486b0f5ad0830364.fix
diff --git a/...Fixture/FileFixture/fixture_test_find.fix → ...Fixture/FileFixture/fixture_test_find.fix b/...Fixture/FileFixture/fixture_test_find.fix → ...Fixture/FileFixture/fixture_test_find.fix
diff --git a/...Fixture/FileFixture/fixture_test_save.fix → ...Fixture/FileFixture/fixture_test_save.fix b/...Fixture/FileFixture/fixture_test_save.fix → ...Fixture/FileFixture/fixture_test_save.fix
diff --git a/...FileFixture/not_serializable_argument.fix → ...FileFixture/not_serializable_argument.fix b/...FileFixture/not_serializable_argument.fix → ...FileFixture/not_serializable_argument.fix
diff --git a/...ileFixture/not_serializable_exception.fix → ...ileFixture/not_serializable_exception.fix b/...ileFixture/not_serializable_exception.fix → ...ileFixture/not_serializable_exception.fix
diff --git a/...e/FileFixture/not_serializable_result.fix → ...e/FileFixture/not_serializable_result.fix b/...e/FileFixture/not_serializable_result.fix → ...e/FileFixture/not_serializable_result.fix
diff --git a/...send.3a4ca4c1c60a70512f298eadffd9c0ed.fix → ...send.3a4ca4c1c60a70512f298eadffd9c0ed.fix b/...send.3a4ca4c1c60a70512f298eadffd9c0ed.fix → ...send.3a4ca4c1c60a70512f298eadffd9c0ed.fix
diff --git a/...send.420aa989171fe07cfe4d4501e385d1f3.fix → ...send.420aa989171fe07cfe4d4501e385d1f3.fix b/...send.420aa989171fe07cfe4d4501e385d1f3.fix → ...send.420aa989171fe07cfe4d4501e385d1f3.fix
diff --git a/src/TestTools/Tests/_fixtures/schema.sql → src/Tests/_fixtures/schema.sql b/src/TestTools/Tests/_fixtures/schema.sql → src/Tests/_fixtures/schema.sql
diff --git a/src/TestTools/Tests/config.yml → src/Tests/config.yml b/src/TestTools/Tests/config.yml → src/Tests/config.yml
diff --git a/src/TestTools/Util/FixedDateTime.php → src/Util/FixedDateTime.php b/src/TestTools/Util/FixedDateTime.php → src/Util/FixedDateTime.php