Merge pull request #917 from Tobion/remove-submodule-entries

Remove submodule entries & improve test setup

.gitattributes

@@ -8,4 +8,3 @@ build.properties export-ignore
 build.xml export-ignore
 phpunit.xml.dist export-ignore
 run-all.sh export-ignore
-composer.lock export-ignore

.gitmodules

-[submodule "lib/vendor/doctrine-common"]
-	path = lib/vendor/doctrine-common
-	url = git://github.com/doctrine/common.git
-[submodule "lib/vendor/Symfony/Component/Console"]
-	path = lib/vendor/Symfony/Component/Console
-	url = git://github.com/symfony/Console.git
-[submodule "lib/vendor/doctrine-build-common"]
-	path = lib/vendor/doctrine-build-common
-	url = git://github.com/doctrine/doctrine-build-common.git
 [submodule "docs/en/_theme"]
     path = docs/en/_theme
     url = git://github.com/doctrine/doctrine-sphinx-theme.git

.travis.yml

 language: php
 
+sudo: false
+
+cache:
+    directories:
+        - vendor
+        - $HOME/.composer/cache
+
 php:
   - 5.4
   - 5.5
@@ -16,11 +23,8 @@ env:
   - DB=sqlite
   - DB=mysqli
 
-before_install:
-  - composer self-update
-
 install:
-  - composer update --prefer-source
+  - travis_retry composer install
 
 before_script:
   - if [ '$DB' = 'pgsql' ]; then sudo service postgresql stop; sudo service postgresql start $POSTGRESQL_VERSION; fi
@@ -28,6 +32,7 @@ before_script:
 script: ./vendor/bin/phpunit --configuration tests/travis/$DB.travis.xml
 
 matrix:
+  fast_finish: true
   include:
     - php: 5.4
       env: DB=mariadb
@@ -106,5 +111,3 @@ matrix:
 
 addons:
   postgresql: '9.4'
-
-sudo: false

phpunit.xml.dist

@@ -11,37 +11,34 @@
            tests/ folder: phpunit -c <filename> ...
            Example: phpunit -c mysqlconf.xml
 -->
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.8/phpunit.xsd"
+         backupGlobals="false"
          colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="false"
-         bootstrap="./tests/Doctrine/Tests/TestInit.php"
+         bootstrap="vendor/autoload.php"
 >
-  <php>
-    <!-- "Real" test database -->
-    <!-- Uncomment, otherwise SQLite runs
-    <var name="db_type" value="pdo_mysql"/>
-    <var name="db_host" value="localhost" />
-    <var name="db_username" value="root" />
-    <var name="db_password" value="" />
-    <var name="db_name" value="doctrine_tests" />
-    <var name="db_port" value="3306"/>
-    -->
-    <!--<var name="db_event_subscribers" value="Doctrine\DBAL\Event\Listeners\OracleSessionInit">-->
+    <php>
+        <ini name="error_reporting" value="-1" />
+
+        <!-- "Real" test database -->
+        <!-- Uncomment, otherwise SQLite runs
+        <var name="db_type" value="pdo_mysql"/>
+        <var name="db_host" value="localhost" />
+        <var name="db_username" value="root" />
+        <var name="db_password" value="" />
+        <var name="db_name" value="doctrine_tests" />
+        <var name="db_port" value="3306"/>
+        -->
+        <!--<var name="db_event_subscribers" value="Doctrine\DBAL\Event\Listeners\OracleSessionInit">-->
     
-    <!-- Database for temporary connections (i.e. to drop/create the main database) -->
-    <var name="tmpdb_type" value="pdo_mysql"/>
-    <var name="tmpdb_host" value="localhost" />
-    <var name="tmpdb_username" value="root" />
-    <var name="tmpdb_password" value="" />
-    <var name="tmpdb_name" value="doctrine_tests_tmp" />
-    <var name="tmpdb_port" value="3306"/>
-  </php>
+        <!-- Database for temporary connections (i.e. to drop/create the main database) -->
+        <var name="tmpdb_type" value="pdo_mysql"/>
+        <var name="tmpdb_host" value="localhost" />
+        <var name="tmpdb_username" value="root" />
+        <var name="tmpdb_password" value="" />
+        <var name="tmpdb_name" value="doctrine_tests_tmp" />
+        <var name="tmpdb_port" value="3306"/>
+    </php>
 
     <testsuites>
         <testsuite name="Doctrine DBAL Test Suite">

tests/Doctrine/Tests/DBAL/ConfigurationTest.php

@@ -39,7 +39,7 @@ class ConfigurationTest extends DbalTestCase
     /**
      * {@inheritdoc}
      */
-    public function setUp()
+    protected function setUp()
     {
         $this->config = new Configuration();
     }

tests/Doctrine/Tests/DBAL/ConnectionTest.php

@@ -24,7 +24,7 @@ class ConnectionTest extends \Doctrine\Tests\DbalTestCase
         'port' => '1234'
     );
 
-    public function setUp()
+    protected function setUp()
     {
         $this->_conn = \Doctrine\DBAL\DriverManager::getConnection($this->params);
     }

tests/Doctrine/Tests/DBAL/Driver/OCI8/OCI8StatementTest.php

@@ -4,7 +4,7 @@ namespace Doctrine\Tests\DBAL;
 
 class OCI8StatementTest extends \Doctrine\Tests\DbalTestCase
 {
-    public function setUp()
+    protected function setUp()
     {
         if (!extension_loaded('oci8')) {
             $this->markTestSkipped('oci8 is not installed.');

tests/Doctrine/Tests/DBAL/Functional/BlobTest.php

@@ -10,7 +10,7 @@ use PDO;
  */
 class BlobTest extends \Doctrine\Tests\DbalFunctionalTestCase
 {
-    public function setUp()
+    protected function setUp()
     {
         parent::setUp();
 

tests/Doctrine/Tests/DBAL/Functional/ConnectionTest.php

@@ -8,13 +8,13 @@ use Doctrine\DBAL\Types\Type;
 
 class ConnectionTest extends \Doctrine\Tests\DbalFunctionalTestCase
 {
-    public function setUp()
+    protected function setUp()
     {
         $this->resetSharedConn();
         parent::setUp();
     }
 
-    public function tearDown()
+    protected function tearDown()
     {
         parent::tearDown();
         $this->resetSharedConn();

tests/Doctrine/Tests/DBAL/Functional/DataAccessTest.php

@@ -11,7 +11,7 @@ class DataAccessTest extends \Doctrine\Tests\DbalFunctionalTestCase
 {
     static private $generated = false;
 
-    public function setUp()
+    protected function setUp()
     {
         parent::setUp();
 

tests/Doctrine/Tests/DBAL/Functional/Driver/Mysqli/ConnectionTest.php

@@ -3,7 +3,7 @@ namespace Doctrine\Tests\DBAL\Functional\Driver\Mysqli;
 
 class ConnectionTest extends \Doctrine\Tests\DbalFunctionalTestCase
 {
-    public function setUp()
+    protected function setUp()
     {
         if (!extension_loaded('mysqli')) {
             $this->markTestSkipped('mysqli is not installed.');
@@ -16,7 +16,7 @@ class ConnectionTest extends \Doctrine\Tests\DbalFunctionalTestCase
         }
     }
 
-    public function tearDown()
+    protected function tearDown()
     {
         parent::tearDown();
     }

tests/Doctrine/Tests/DBAL/Functional/MasterSlaveConnectionTest.php

@@ -10,7 +10,7 @@ use Doctrine\Tests\DbalFunctionalTestCase;
  */
 class MasterSlaveConnectionTest extends DbalFunctionalTestCase
 {
-    public function setUp()
+    protected function setUp()
     {
         parent::setUp();
 

tests/Doctrine/Tests/DBAL/Functional/ModifyLimitQueryTest.php

@@ -6,7 +6,7 @@ class ModifyLimitQueryTest extends \Doctrine\Tests\DbalFunctionalTestCase
 {
     private static $tableCreated = false;
 
-    public function setUp()
+    protected function setUp()
     {
         parent::setUp();
 

tests/Doctrine/Tests/DBAL/Functional/NamedParametersTest.php

@@ -101,7 +101,7 @@ class NamedParametersTest extends \Doctrine\Tests\DbalFunctionalTestCase
         );
     }
 
-    public function setUp()
+    protected function setUp()
     {
         parent::setUp();
 

tests/Doctrine/Tests/DBAL/Functional/PortabilityTest.php

@@ -14,7 +14,7 @@ class PortabilityTest extends \Doctrine\Tests\DbalFunctionalTestCase
 {
     private $portableConnection;
 
-    public function tearDown()
+    protected function tearDown()
     {
         if ($this->portableConnection) {
             $this->portableConnection->close();

tests/Doctrine/Tests/DBAL/Functional/ResultCacheTest.php

@@ -12,7 +12,7 @@ class ResultCacheTest extends \Doctrine\Tests\DbalFunctionalTestCase
     private $expectedResult = array(array('test_int' => 100, 'test_string' => 'foo'), array('test_int' => 200, 'test_string' => 'bar'), array('test_int' => 300, 'test_string' => 'baz'));
     private $sqlLogger;
 
-    public function setUp()
+    protected function setUp()
     {
         parent::setUp();
 

tests/Doctrine/Tests/DBAL/Functional/Schema/OracleSchemaManagerTest.php

@@ -7,7 +7,7 @@ use Doctrine\Tests\TestUtil;
 
 class OracleSchemaManagerTest extends SchemaManagerFunctionalTestCase
 {
-    public function setUp()
+    protected function setUp()
     {
         parent::setUp();
 

tests/Doctrine/Tests/DBAL/Functional/Schema/PostgreSqlSchemaManagerTest.php

@@ -9,7 +9,7 @@ use Doctrine\DBAL\Types\Type;
 
 class PostgreSqlSchemaManagerTest extends SchemaManagerFunctionalTestCase
 {
-    public function tearDown()
+    protected function tearDown()
     {
         parent::tearDown();
 

tests/Doctrine/Tests/DBAL/Functional/TableGeneratorTest.php

@@ -11,7 +11,7 @@ class TableGeneratorTest extends \Doctrine\Tests\DbalFunctionalTestCase
 {
     private $generator;
 
-    public function setUp()
+    protected function setUp()
     {
         parent::setUp();
 

tests/Doctrine/Tests/DBAL/Functional/TemporaryTableTest.php

@@ -7,7 +7,7 @@ use Doctrine\DBAL\Types\Type;
 
 class TemporaryTableTest extends \Doctrine\Tests\DbalFunctionalTestCase
 {
-    public function setUp()
+    protected function setUp()
     {
         parent::setUp();
         try {
@@ -17,7 +17,7 @@ class TemporaryTableTest extends \Doctrine\Tests\DbalFunctionalTestCase
         }
     }
 
-    public function tearDown()
+    protected function tearDown()
     {
         if ($this->_conn) {
             try {

tests/Doctrine/Tests/DBAL/Functional/Ticket/DBAL510Test.php

@@ -10,7 +10,7 @@ use Doctrine\DBAL\Schema\Table;
  */
 class DBAL510Test extends \Doctrine\Tests\DbalFunctionalTestCase
 {
-    public function setUp()
+    protected function setUp()
     {
         parent::setUp();
 

tests/Doctrine/Tests/DBAL/Functional/TypeConversionTest.php

@@ -8,7 +8,7 @@ class TypeConversionTest extends \Doctrine\Tests\DbalFunctionalTestCase
 {
     static private $typeCounter = 0;
 
-    public function setUp()
+    protected function setUp()
     {
         parent::setUp();
 

tests/Doctrine/Tests/DBAL/Functional/WriteTest.php

@@ -6,7 +6,7 @@ use PDO;
 
 class WriteTest extends \Doctrine\Tests\DbalFunctionalTestCase
 {
-    public function setUp()
+    protected function setUp()
     {
         parent::setUp();
 

tests/Doctrine/Tests/DBAL/Logging/DebugStackTest.php

@@ -4,12 +4,12 @@ namespace Doctrine\Tests\DBAL\Logging;
 
 class DebugStackTest extends \Doctrine\Tests\DbalTestCase
 {
-    public function setUp()
+    protected function setUp()
     {
         $this->logger = new \Doctrine\DBAL\Logging\DebugStack();
     }
 
-    public function tearDown()
+    protected function tearDown()
     {
         unset($this->logger);
     }

tests/Doctrine/Tests/DBAL/Platforms/AbstractPlatformTestCase.php

@@ -23,7 +23,7 @@ abstract class AbstractPlatformTestCase extends \Doctrine\Tests\DbalTestCase
 
     abstract public function createPlatform();
 
-    public function setUp()
+    protected function setUp()
     {
         $this->_platform = $this->createPlatform();
     }

tests/Doctrine/Tests/DBAL/Platforms/ReservedKeywordsValidatorTest.php

@@ -12,7 +12,7 @@ class ReservedKeywordsValidatorTest extends \Doctrine\Tests\DbalTestCase
      */
     private $validator;
 
-    public function setUp()
+    protected function setUp()
     {
         $this->validator = new ReservedKeywordsValidator(array(
             new \Doctrine\DBAL\Platforms\Keywords\MySQLKeywords()

tests/Doctrine/Tests/DBAL/Platforms/SQLAzurePlatformTest.php

@@ -11,7 +11,7 @@ class SQLAzurePlatformTest extends DbalTestCase
 {
     private $platform;
 
-    public function setUp()
+    protected function setUp()
     {
         $this->platform = new \Doctrine\DBAL\Platforms\SQLAzurePlatform();
     }

tests/Doctrine/Tests/DBAL/Portability/StatementTest.php

@@ -25,7 +25,7 @@ class StatementTest extends \Doctrine\Tests\DbalTestCase
     /**
      * {@inheritdoc}
      */
-    public function setUp()
+    protected function setUp()
     {
         $this->wrappedStmt = $this->createWrappedStatement();
         $this->conn        = $this->createConnection();

tests/Doctrine/Tests/DBAL/Query/Expression/ExpressionBuilderTest.php

@@ -12,7 +12,7 @@ class ExpressionBuilderTest extends \Doctrine\Tests\DbalTestCase
 {
     protected $expr;
 
-    public function setUp()
+    protected function setUp()
     {
         $conn = $this->getMock('Doctrine\DBAL\Connection', array(), array(), '', false);
 

tests/Doctrine/Tests/DBAL/Query/QueryBuilderTest.php

@@ -12,7 +12,7 @@ class QueryBuilderTest extends \Doctrine\Tests\DbalTestCase
 {
     protected $conn;
 
-    public function setUp()
+    protected function setUp()
     {
         $this->conn = $this->getMock('Doctrine\DBAL\Connection', array(), array(), '', false);
 

tests/Doctrine/Tests/DBAL/Schema/MySqlSchemaManagerTest.php

@@ -14,7 +14,7 @@ class MySqlSchemaManagerTest extends \PHPUnit_Framework_TestCase
      */
     private $manager;
 
-    public function setUp()
+    protected function setUp()
     {
         $eventManager = new EventManager();
         $driverMock = $this->getMock('Doctrine\DBAL\Driver');

tests/Doctrine/Tests/DBAL/Schema/Platforms/MySQLSchemaTest.php

@@ -16,7 +16,7 @@ class MySQLSchemaTest extends \PHPUnit_Framework_TestCase
      */
     private $platform;
 
-    public function setUp()
+    protected function setUp()
     {
         $this->comparator = new \Doctrine\DBAL\Schema\Comparator;
         $this->platform = new \Doctrine\DBAL\Platforms\MySqlPlatform;

tests/Doctrine/Tests/DBAL/Schema/Synchronizer/SingleDatabaseSynchronizerTest.php

@@ -28,7 +28,7 @@ class SingleDatabaseSynchronizerTest extends \PHPUnit_Framework_TestCase
     private $conn;
     private $synchronizer;
 
-    public function setUp()
+    protected function setUp()
     {
         $this->conn = DriverManager::getConnection(array(
             'driver' => 'pdo_sqlite',

tests/Doctrine/Tests/DBAL/Sharding/SQLAzure/AbstractTestCase.php

@@ -11,7 +11,7 @@ abstract class AbstractTestCase extends \PHPUnit_Framework_TestCase
     protected $conn;
     protected $sm;
 
-    public function setUp()
+    protected function setUp()
     {
         if (!isset($GLOBALS['db_type']) || strpos($GLOBALS['db_type'], "sqlsrv") === false) {
             $this->markTestSkipped('No driver or sqlserver driver specified.');

tests/Doctrine/Tests/DBAL/StatementTest.php

@@ -23,7 +23,7 @@ class StatementTest extends \Doctrine\Tests\DbalTestCase
      */
     private $pdoStatement;
 
-    public function setUp()
+    protected function setUp()
     {
         $this->pdoStatement = $this->getMock('\PDOStatement', array('execute', 'bindParam', 'bindValue'));
         $platform = new \Doctrine\Tests\DBAL\Mocks\MockPlatform();

tests/Doctrine/Tests/DBAL/Types/ArrayTest.php

@@ -17,7 +17,7 @@ class ArrayTest extends \Doctrine\Tests\DbalTestCase
         $this->_type = Type::getType('array');
     }
 
-    public function tearDown()
+    protected function tearDown()
     {
         error_reporting(-1); // reactive all error levels
     }

tests/Doctrine/Tests/DBAL/Types/ObjectTest.php

@@ -17,7 +17,7 @@ class ObjectTest extends \Doctrine\Tests\DbalTestCase
         $this->_type = Type::getType('object');
     }
 
-    public function tearDown()
+    protected function tearDown()
     {
         error_reporting(-1); // reactive all error levels
     }

tests/Doctrine/Tests/DbalTestCase.php

@@ -5,6 +5,6 @@ namespace Doctrine\Tests;
 /**
  * Base testcase class for all dbal testcases.
  */
-class DbalTestCase extends DoctrineTestCase
+abstract class DbalTestCase extends \PHPUnit_Framework_TestCase
 {
-}
\ No newline at end of file
+}

tests/Doctrine/Tests/DoctrineTestCase.php

-<?php
-
-namespace Doctrine\Tests;
-
-/**
- * Base testcase class for all Doctrine testcases.
- */
-abstract class DoctrineTestCase extends \PHPUnit_Framework_TestCase
-{
-}
\ No newline at end of file

tests/Doctrine/Tests/TestInit.php

-<?php
-/*
- * This file bootstraps the test environment.
- */
-
-error_reporting(E_ALL | E_STRICT);
-date_default_timezone_set('UTC');
-
-if (file_exists(__DIR__ . '/../../../vendor/autoload.php')) {
-    // dependencies were installed via composer - this is the main project
-    require __DIR__ . '/../../../vendor/autoload.php';
-} elseif (file_exists(__DIR__ . '/../../../../../autoload.php')) {
-    // installed as a dependency in `vendor`
-    require __DIR__ . '/../../../../../autoload.php';
-} else {
-    throw new Exception('Can\'t find autoload.php. Did you install dependencies via Composer?');
-}

tests/travis/mariadb.travis.xml

 <?xml version="1.0" encoding="utf-8"?>
-<phpunit bootstrap="../Doctrine/Tests/TestInit.php">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.8/phpunit.xsd"
+         backupGlobals="false"
+         colors="true"
+         bootstrap="../../vendor/autoload.php"
+>
     <php>
+        <ini name="error_reporting" value="-1" />
+
         <var name="db_type" value="pdo_mysql"/>
         <var name="db_host" value="localhost" />
         <var name="db_username" value="travis" />
@@ -20,12 +27,12 @@
             <directory>../Doctrine/Tests/DBAL</directory>
         </testsuite>
     </testsuites>
+
     <groups>
         <exclude>
             <group>performance</group>
             <group>locking_functional</group>
         </exclude>
     </groups>
-
 </phpunit>
 

tests/travis/mysql.travis.xml

 <?xml version="1.0" encoding="utf-8"?>
-<phpunit bootstrap="../Doctrine/Tests/TestInit.php">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.8/phpunit.xsd"
+         backupGlobals="false"
+         colors="true"
+         bootstrap="../../vendor/autoload.php"
+>
     <php>
+        <ini name="error_reporting" value="-1" />
+
         <var name="db_type" value="pdo_mysql"/>
         <var name="db_host" value="localhost" />
         <var name="db_username" value="travis" />
@@ -20,12 +27,12 @@
             <directory>../Doctrine/Tests/DBAL</directory>
         </testsuite>
     </testsuites>
+
     <groups>
         <exclude>
             <group>performance</group>
             <group>locking_functional</group>
         </exclude>
     </groups>
-
 </phpunit>
 

tests/travis/mysqli.travis.xml

 <?xml version="1.0" encoding="utf-8"?>
-<phpunit bootstrap="../Doctrine/Tests/TestInit.php">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.8/phpunit.xsd"
+         backupGlobals="false"
+         colors="true"
+         bootstrap="../../vendor/autoload.php"
+>
     <php>
+        <ini name="error_reporting" value="-1" />
+
         <var name="db_type" value="mysqli"/>
         <var name="db_host" value="localhost" />
         <var name="db_username" value="travis" />
@@ -20,12 +27,12 @@
             <directory>../Doctrine/Tests/DBAL</directory>
         </testsuite>
     </testsuites>
+
     <groups>
         <exclude>
             <group>performance</group>
             <group>locking_functional</group>
         </exclude>
     </groups>
-
 </phpunit>
 

tests/travis/pgsql.travis.xml

 <?xml version="1.0" encoding="utf-8"?>
-<phpunit bootstrap="../Doctrine/Tests/TestInit.php">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.8/phpunit.xsd"
+         backupGlobals="false"
+         colors="true"
+         bootstrap="../../vendor/autoload.php"
+>
     <php>
+        <ini name="error_reporting" value="-1" />
+
         <var name="db_type" value="pdo_pgsql"/>
         <var name="db_host" value="localhost" />
         <var name="db_username" value="postgres" />
@@ -14,11 +21,13 @@
         <var name="tmpdb_password" value="" />
         <var name="tmpdb_port" value="5432"/>
     </php>
+
     <testsuites>
         <testsuite name="Doctrine DBAL Test Suite">
             <directory>../Doctrine/Tests/DBAL</directory>
         </testsuite>
     </testsuites>
+
     <groups>
         <exclude>
             <group>performance</group>

tests/travis/sqlite.travis.xml

 <?xml version="1.0" encoding="utf-8"?>
-<phpunit bootstrap="../Doctrine/Tests/TestInit.php">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.8/phpunit.xsd"
+         backupGlobals="false"
+         colors="true"
+         bootstrap="../../vendor/autoload.php"
+>
+    <php>
+        <ini name="error_reporting" value="-1" />
+    </php>
+
     <testsuites>
         <testsuite name="Doctrine DBAL Test Suite">
             <directory>../Doctrine/Tests/DBAL</directory>
         </testsuite>
     </testsuites>
+
     <groups>
         <exclude>
             <group>performance</group>