tesztelt

csordasmarton · Jun 18, 2014 · 66102de · 66102de
1 parent 7d36d63
commit 66102de
Show file tree

Hide file tree

Showing 544 changed files with 317 additions and 740 deletions.
diff --git a/app/autoload.php b/app/autoload.php
@@ -9,7 +9,7 @@
 $loader = require __DIR__.'/../vendor/autoload.php';
 $loader->add('FOS', __DIR__.'/../vendor/bundles');
 $loader->add('Assetic', __DIR__.'/../vendor/assetic/src');
-$loader->add('Gregwar', __DIR__.'/../vendor/bundles');
+$loader->add('Gregwar', __DIR__.'/../vendor');
 AnnotationRegistry::registerLoader(array($loader, 'loadClass'));
 
 return $loader;
diff --git a/bin/doctrine b/bin/doctrine
@@ -0,0 +1,7 @@
+#!/usr/bin/env sh
+SRC_DIR="`pwd`"
+cd "`dirname "$0"`"
+cd "../vendor/doctrine/orm/bin"
+BIN_TARGET="`pwd`/doctrine"
+cd "$SRC_DIR"
+"$BIN_TARGET" "$@"
diff --git a/bin/doctrine.bat b/bin/doctrine.bat
@@ -0,0 +1,3 @@
+@ECHO OFF
+SET BIN_TARGET=%~dp0/../vendor/doctrine/orm/bin/doctrine
+php "%BIN_TARGET%" %*
diff --git a/bin/doctrine.php b/bin/doctrine.php
@@ -0,0 +1,7 @@
+#!/usr/bin/env sh
+SRC_DIR="`pwd`"
+cd "`dirname "$0"`"
+cd "../vendor/doctrine/orm/bin"
+BIN_TARGET="`pwd`/doctrine.php"
+cd "$SRC_DIR"
+"$BIN_TARGET" "$@"
diff --git a/bin/doctrine.php.bat b/bin/doctrine.php.bat
@@ -0,0 +1,3 @@
+@ECHO OFF
+SET BIN_TARGET=%~dp0/../vendor/doctrine/orm/bin/doctrine.php
+php "%BIN_TARGET%" %*
diff --git a/composer.json b/composer.json
@@ -19,8 +19,8 @@
         "sensio/framework-extra-bundle": "~3.0",
         "sensio/generator-bundle": "~2.3",
         "incenteev/composer-parameter-handler": "~2.0",
-        "cedriclombardot/admingenerator-generator-bundle": "2.3.*@dev",
-		"gregwar/image": "dev-master"
+		"friendsofsymfony/user-bundle": "~2.0@dev",
+		"gregwar/image-bundle": "dev-master"
     },
     "scripts": {
         "post-install-cmd": [