Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Updated the composer.json and converted the testsuite to composer

  • Loading branch information...
commit c776e06019f230c1c195501fb95860e36e06e0a3 1 parent ff84c7f
@stof stof authored
View
3  .gitignore
@@ -4,4 +4,5 @@ logs/
reports/
dist/
tests/phpunit.xml
-
+vendor/
+composer.lock
View
12 .gitmodules
@@ -1,12 +0,0 @@
-[submodule "lib/vendor/doctrine-common"]
- path = lib/vendor/doctrine-common
- url = git://github.com/doctrine/common.git
-[submodule "lib/vendor/doctrine-dbal"]
- path = lib/vendor/doctrine-dbal
- url = git://github.com/doctrine/dbal.git
-[submodule "lib/vendor/Symfony/Component/Console"]
- path = lib/vendor/Symfony/Component/Console
- url = git://github.com/symfony/Console.git
-[submodule "lib/vendor/Symfony/Component/Yaml"]
- path = lib/vendor/Symfony/Component/Yaml
- url = git://github.com/symfony/Yaml.git
View
4 .travis.yml
@@ -1,5 +1,7 @@
-before_script: "git submodule update --init"
language: php
+
php:
- 5.3
- 5.4
+
+before_script: "composer install --dev"
View
13 composer.json
@@ -4,16 +4,21 @@
"description": "Database Schema migrations using Doctrine DBAL",
"keywords": ["migrations", "database"],
"homepage": "http://www.doctrine-project.org",
- "license": "MIT",
+ "license": "LGPL",
"authors": [
{"name": "Benjamin Eberlei", "email": "kontakt@beberlei.de"},
{"name": "Jonathan Wage", "email": "jonwage@gmail.com"}
],
"require": {
"php": ">=5.3.2",
- "ext-pdo": "*",
- "doctrine/common": ">=2.0",
- "doctrine/dbal": ">=2.0"
+ "doctrine/dbal": ">=2.0,<2.5.x-dev"
+ },
+ "require-dev": {
+ "symfony/console": "2.*",
+ "symfony/yaml": "2.*"
+ },
+ "suggest": {
+ "symfony/console": "to run the migration from the console"
},
"autoload": {
"psr-0": {
1  lib/vendor/Symfony/Component/Console
@@ -1 +0,0 @@
-Subproject commit 0828343d0ab4513e1a1efb880b4bcab85dfa2c0c
1  lib/vendor/Symfony/Component/Yaml
@@ -1 +0,0 @@
-Subproject commit 2b858b077d1e6748569fd143ae16da44b541d3f3
1  lib/vendor/doctrine-common
@@ -1 +0,0 @@
-Subproject commit b385ca770888248241bd3086a40d5b3bd082a706
1  lib/vendor/doctrine-dbal
@@ -1 +0,0 @@
-Subproject commit e0b69790ab1ffd646fd70a04fdb91e5dfbb3ccf1
View
17 phpunit.xml.dist
@@ -1,18 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
- backupStaticAttributes="false"
- colors="false"
- convertErrorsToExceptions="true"
- convertNoticesToExceptions="true"
- convertWarningsToExceptions="true"
- stopOnFailure="false"
- syntaxCheck="false"
- bootstrap="tests/bootstrap.php"
->
+<phpunit colors="true" bootstrap="tests/bootstrap.php">
<testsuites>
<testsuite name="Doctrine2 Database Migrations Test Suite">
<directory>./tests/Doctrine/</directory>
</testsuite>
</testsuites>
+
+ <filter>
+ <whitelist>
+ <directory>./lib/</directory>
+ </whitelist>
+ </filter>
</phpunit>
View
20 tests/TestInit.php
@@ -1,20 +0,0 @@
-<?php
-
-require_once __DIR__ . '/../lib/vendor/doctrine-common/lib/Doctrine/Common/ClassLoader.php';
-
-use Doctrine\Common\ClassLoader;
-
-$classLoader = new ClassLoader('Doctrine\DBAL\Migrations\Tests', __DIR__ . '/');
-$classLoader->register();
-
-$classLoader = new ClassLoader('Doctrine\DBAL\Migrations', __DIR__ . '/../lib');
-$classLoader->register();
-
-$classLoader = new ClassLoader('Doctrine\Common', __DIR__ . '/../lib/vendor/doctrine-common/lib');
-$classLoader->register();
-
-$classLoader = new ClassLoader('Doctrine\DBAL', __DIR__ . '/../lib/vendor/doctrine-dbal/lib');
-$classLoader->register();
-
-$classLoader = new ClassLoader('Symfony\Component\Yaml', __DIR__ . '/../lib/vendor');
-$classLoader->register();
View
20 tests/bootstrap.php
@@ -1,20 +1,4 @@
<?php
-require_once __DIR__ . '/../lib/vendor/doctrine-common/lib/Doctrine/Common/ClassLoader.php';
-
-use Doctrine\Common\ClassLoader;
-
-$classLoader = new ClassLoader('Doctrine\DBAL\Migrations\Tests', __DIR__ . '/../tests');
-$classLoader->register();
-
-$classLoader = new ClassLoader('Doctrine\DBAL\Migrations', __DIR__ . '/../lib');
-$classLoader->register();
-
-$classLoader = new ClassLoader('Doctrine\DBAL', __DIR__ . '/../lib/vendor/doctrine-dbal/lib');
-$classLoader->register();
-
-$classLoader = new ClassLoader('Doctrine', __DIR__ . '/../lib/vendor/doctrine-common/lib');
-$classLoader->register();
-
-$classLoader = new ClassLoader('Symfony\Component\Yaml', __DIR__ . '/../lib/vendor');
-$classLoader->register();
+$loader = require_once __DIR__ . '/../vendor/autoload.php';
+$loader->add('Doctrine\DBAL\Migrations\Tests', __DIR__);
Please sign in to comment.
Something went wrong with that request. Please try again.