commit e5ce4d688650ccb41b83c5a7001d63586fd6bfbc
parent da0c3eceddaad59a88d4d35279c0cbbab50924b8
Author: Felicitus <felicitus@felicitus.org>
Date: Tue, 5 Jul 2011 10:38:03 +0200
Revert "Added migrations (hopefully?)"
This reverts commit 4a5351c7cc09f936b3d9f49de8272624be58fcff.
Diffstat:
7 files changed, 10 insertions(+), 61 deletions(-)
diff --git a/.gitmodules b/.gitmodules
@@ -13,6 +13,3 @@
[submodule "frontend/resources/fugue-icons"]
path = frontend/resources/fugue-icons
url = git://github.com/yusukekamiyamane/fugue-icons.git
-[submodule "3rdparty/doctrine-migrations"]
- path = 3rdparty/doctrine-migrations
- url = git://github.com/doctrine/migrations.git
diff --git a/3rdparty/doctrine-migrations b/3rdparty/doctrine-migrations
@@ -1 +0,0 @@
-Subproject commit 652fed5124b16039b58f479c89e80e8e3188303b
diff --git a/cli-config.php b/cli-config.php
@@ -1,28 +1,17 @@
<?php
+use de\RaumZeitLabor\PartKeepr\Service\ServiceManager;
use de\RaumZeitLabor\PartKeepr\PartKeepr;
+use Doctrine\Common\ClassLoader;
-include_once("src/de/RaumZeitLabor/PartKeepr/PartKeepr.php");
-
-PartKeepr::initialize(""); // Classloaders are initialized here
+include("src/de/RaumZeitLabor/PartKeepr/PartKeepr.php");
+PartKeepr::initialize("");
$em = PartKeepr::getEM();
-$classes = PartKeepr::getEntityClasses(); // Seems to be necessary for the doctrine CLI
-
-$cli = new \Symfony\Component\Console\Application('Doctrine Command Line Interface', Doctrine\Common\Version::VERSION);
+$classes = PartKeepr::getEntityClasses();
-$cli->addCommands(array(
- new \Doctrine\DBAL\Migrations\Tools\Console\Command\DiffCommand(),
- new \Doctrine\DBAL\Migrations\Tools\Console\Command\ExecuteCommand(),
- new \Doctrine\DBAL\Migrations\Tools\Console\Command\GenerateCommand(),
- new \Doctrine\DBAL\Migrations\Tools\Console\Command\MigrateCommand(),
- new \Doctrine\DBAL\Migrations\Tools\Console\Command\StatusCommand(),
- new \Doctrine\DBAL\Migrations\Tools\Console\Command\VersionCommand()
-));
$helperSet = new \Symfony\Component\Console\Helper\HelperSet(array(
'db' => new \Doctrine\DBAL\Tools\Console\Helper\ConnectionHelper($em->getConnection()),
'em' => new \Doctrine\ORM\Tools\Console\Helper\EntityManagerHelper($em)
-));
-
-$cli->run();
+));+
\ No newline at end of file
diff --git a/migrations-db.php b/migrations-db.php
@@ -1,6 +0,0 @@
-<?php
-use de\RaumZeitLabor\PartKeepr\PartKeepr;
-
-include_once("cli-config.php");
-
-return PartKeepr::getEM()->getConnection()->getParams();
diff --git a/migrations.yml b/migrations.yml
@@ -1,5 +0,0 @@
----
-name: PartKeepr Migrations
-migrations_namespace: PartKeepr\Migrations
-table_name: partkeepr_versions
-migrations_directory: src/de/RaumZeitLabor/PartKeepr/Migrations
diff --git a/src/de/RaumZeitLabor/PartKeepr/Migrations/Version20110705100524.php b/src/de/RaumZeitLabor/PartKeepr/Migrations/Version20110705100524.php
@@ -1,24 +0,0 @@
-<?php
-
-namespace PartKeepr\Migrations;
-
-use Doctrine\DBAL\Migrations\AbstractMigration,
- Doctrine\DBAL\Schema\Schema;
-
-/**
- * Auto-generated Migration: Please modify to your need!
- */
-class Version20110705100524 extends AbstractMigration
-{
- public function up(Schema $schema)
- {
- // this up() migration is autogenerated, please modify it to your needs
-
- }
-
- public function down(Schema $schema)
- {
- // this down() migration is autogenerated, please modify it to your needs
-
- }
-}
diff --git a/src/de/RaumZeitLabor/PartKeepr/PartKeepr.php b/src/de/RaumZeitLabor/PartKeepr/PartKeepr.php
@@ -49,10 +49,7 @@ class PartKeepr {
$classLoader = new ClassLoader('Doctrine\ORM');
$classLoader->register(); // register on SPL autoload stack
-
- $classLoader = new ClassLoader('Doctrine\DBAL\Migrations', dirname(dirname(dirname(dirname(__DIR__)))) ."/3rdparty/doctrine-migrations/lib");
- $classLoader->register();
-
+
$classLoader = new ClassLoader('Doctrine\DBAL');
$classLoader->register(); // register on SPL autoload stack
@@ -246,4 +243,4 @@ class PartKeepr {
);
}
}
-?>
+?>+
\ No newline at end of file
