Merge pull request #370 from TomasVotruba/composer-tweaks

Composer tweaks
doctrine · Oct 21, 2015 · 7eb674d · 7eb674d
2 parents 089dbbc + d263c7b
commit 7eb674d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/composer.json b/composer.json
@@ -24,14 +24,16 @@
         "mockery/mockery": "^0.9.4",
         "johnkary/phpunit-speedtrap": "~1.0@dev"
     },
-    "suggest": {
-        "symfony/console": "to run the migration from the console"
-    },
     "autoload": {
         "psr-4": {
             "Doctrine\\DBAL\\Migrations\\": "lib/Doctrine/DBAL/Migrations"
         }
     },
+    "autoload-dev": {
+        "psr-4": {
+            "Doctrine\\DBAL\\Migrations\\Tests\\": "tests/Doctrine/DBAL/Migrations/Tests"
+        }
+    },
     "extra": {
         "branch-alias": {
             "dev-master": "v1.1.x-dev"

diff --git a/lib/Doctrine/DBAL/Migrations/Configuration/ArrayConfiguration.php b/lib/Doctrine/DBAL/Migrations/Configuration/ArrayConfiguration.php
@@ -18,7 +18,6 @@
 */
 
 namespace Doctrine\DBAL\Migrations\Configuration;
-use Doctrine\Common\Proxy\Exception\InvalidArgumentException;
 
 /**
  * Load migration configuration information from a PHP configuration file.

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit colors="true" bootstrap="tests/bootstrap.php">
+<phpunit colors="true" bootstrap="vendor/autoload.php">
     <testsuites>
         <testsuite name="Doctrine2 Database Migrations Test Suite">
             <directory>./tests/Doctrine/</directory>

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,6 @@ @@
     */
     namespace Doctrine\DBAL\Migrations\Configuration;
-    use Doctrine\Common\Proxy\Exception\InvalidArgumentException;
     /**
      * Load migration configuration information from a PHP configuration file.
@@ Expand Down @@