Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Removed submodules and replaced them with composer dependencies.

  • Loading branch information...
commit 9075e750f7bd020f254a9ef09a3b891877716088 1 parent a28b6bd
@Spea Spea authored
View
5 .gitignore
@@ -1,2 +1,3 @@
-tests/phpunit.xml
-tests/Doctrine/Tests/Common/DataFixtures/temp/*
+phpunit.xml
+vendor/
+composer.lock
View
9 .gitmodules
@@ -1,9 +0,0 @@
-[submodule "lib/vendor/doctrine-common"]
- path = lib/vendor/doctrine-common
- url = git://github.com/doctrine/common.git
-[submodule "lib/vendor/doctrine-orm"]
- path = lib/vendor/doctrine-orm
- url = git://github.com/doctrine/doctrine2.git
-[submodule "lib/vendor/doctrine-dbal"]
- path = lib/vendor/doctrine-dbal
- url = git://github.com/doctrine/dbal.git
View
11 composer.json
@@ -9,7 +9,16 @@
{"name": "Jonathan Wage", "email": "jonwage@gmail.com"}
],
"require": {
- "php": ">=5.3.2"
+ "php": ">=5.3.2",
+ "doctrine/common": ">=2.2,<2.5-dev"
+ },
+ "require-dev": {
+ "doctrine/orm": ">=2.2,<2.5-dev"
+ },
+ "suggest": {
+ "doctrine/orm": "For loading ORM fixtures",
+ "doctrine/mongodb-odm": "For loading MongoDB ODM fixtures",
+ "doctrine/phpcr-odm": "For loading PHPCR ODM fixtures"
},
"autoload": {
"psr-0": { "Doctrine\\Common\\DataFixtures": "lib/" }
1  lib/vendor/doctrine-common
@@ -1 +0,0 @@
-Subproject commit 0281ab98b27d6f558a8fc3aab61a38507cfbe320
1  lib/vendor/doctrine-dbal
@@ -1 +0,0 @@
-Subproject commit 1a0b9de6c017cebc7cb52b30dd05d58dfe9656ba
1  lib/vendor/doctrine-orm
@@ -1 +0,0 @@
-Subproject commit 7595025f2692b1c9f50e2387623f00ddac32f5fc
View
3  phpunit.xml.dist
@@ -8,10 +8,11 @@
convertWarningsToExceptions="true"
stopOnFailure="false"
syntaxCheck="false"
+ bootstrap="tests/bootstrap.php"
>
<testsuites>
<testsuite name="Doctrine Data Fixtures Test Suite">
<directory>./tests/Doctrine/</directory>
</testsuite>
</testsuites>
-</phpunit>
+</phpunit>
View
2  tests/Doctrine/Tests/Common/DataFixtures/BaseTest.php
@@ -19,8 +19,6 @@
namespace Doctrine\Tests\Common\DataFixtures;
-require_once __DIR__.'/TestInit.php';
-
use Doctrine\ORM\EntityManager;
use Doctrine\ORM\Tools\Setup;
use PHPUnit_Framework_TestCase;
View
2  tests/Doctrine/Tests/Common/DataFixtures/Executor/ORMExecutorSharedFixtureTest.php
@@ -19,8 +19,6 @@
namespace Doctrine\Tests\Common\DataFixtures;
-require_once __DIR__.'/../TestInit.php';
-
use Doctrine\Common\DataFixtures\Executor\ORMExecutor;
use Doctrine\Common\DataFixtures\Purger\ORMPurger;
use Doctrine\ORM\Proxy\Proxy;
View
4 tests/Doctrine/Tests/Common/DataFixtures/Executor/ORMExecutorTest.php
@@ -19,8 +19,6 @@
namespace Doctrine\Tests\Common\DataFixtures\Executor;
-require_once __DIR__.'/../TestInit.php';
-
use Doctrine\ORM\EntityManager;
use Doctrine\Common\DataFixtures\Executor\ORMExecutor;
use PHPUnit_Framework_TestCase;
@@ -70,7 +68,7 @@ public function testExecuteTransaction()
$fixture = $this->getMockFixture($em);
$executor->execute(array($fixture), true);
}
-
+
private function getMockFixture($em)
{
return $this->getMock('Doctrine\Common\DataFixtures\FixtureInterface');
View
2  tests/Doctrine/Tests/Common/DataFixtures/FixtureTest.php
@@ -19,8 +19,6 @@
namespace Doctrine\Tests\Common\DataFixtures;
-require_once __DIR__.'/TestInit.php';
-
use Doctrine\Common\DataFixtures\FixtureInterface;
use Doctrine\Common\Persistence\ObjectManager;
View
2  tests/Doctrine/Tests/Common/DataFixtures/LoaderTest.php
@@ -19,8 +19,6 @@
namespace Doctrine\Tests\Common\DataFixtures;
-require_once __DIR__.'/TestInit.php';
-
use Doctrine\Common\DataFixtures\Loader;
/**
View
20 tests/Doctrine/Tests/Common/DataFixtures/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\\Common\\DataFixtures', __DIR__.'/../../../../../lib');
-$classLoader->register();
-
-$classLoader = new ClassLoader('Doctrine\\Tests\\Common\\DataFixtures', __DIR__.'/../../../../../tests');
-$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('Doctrine\\ORM', __DIR__.'/../../../../../lib/vendor/doctrine-orm/lib');
-$classLoader->register();
View
22 tests/bootstrap.php
@@ -0,0 +1,22 @@
+<?php
+
+/*
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the MIT license. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+$loader = require_once __DIR__ . "/../vendor/autoload.php";
+$loader->add('Doctrine\\Tests\\', __DIR__);
Please sign in to comment.
Something went wrong with that request. Please try again.