diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..cabea1b5d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,9 @@
+.idea
+.DS_Store
+build
+phpunit.xml
+Resources/doc/_build/*
+nbproject
+coverage
+composer.lock
+vendor
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 1880f2f54..f715cc231 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
language: php
+
php:
- 5.3
# - 5.4
@@ -7,7 +8,10 @@ env:
- SYMFONY_VERSION=v2.0.12
- SYMFONY_VERSION=origin/2.0
-before_script: php Tests/tests/vendors.php
+before_script:
+ - wget -nc http://getcomposer.org/composer.phar
+ - php composer.phar install
+
script: phpunit
notifications:
diff --git a/Tests/tests/autoload.php.dist b/Tests/tests/autoload.php.dist
index a14d5be75..7e36534c6 100644
--- a/Tests/tests/autoload.php.dist
+++ b/Tests/tests/autoload.php.dist
@@ -1,33 +1,22 @@
registerNamespaces(array(
- 'Symfony' => array($vendorDir.'/symfony/src'),
- 'Sonata\AdminBundle' => array($vendorDir),
- 'Knp' => array($vendorDir.'/knpmenu/src'),
- 'Gaufrette' => array($vendorDir.'/gaufrette/src'),
- 'Buzz' => array($vendorDir.'/buzz/lib'),
- 'Imagine' => array($vendorDir.'/imagine/lib'),
- ));
- $loader->register();
+wget http://getcomposer.org/composer.phar
+php composer.phar install
- spl_autoload_register(function($class) {
- if (0 === strpos($class, 'Sonata\\MediaBundle\\')) {
- $path = __DIR__.'/../../'.implode('/', array_slice(explode('\\', $class), 2)).'.php';
+Visit http://getcomposer.org/ for more information.
- if (!stream_resolve_include_path($path)) {
- return false;
- }
- require_once $path;
- return true;
- }
- });
-}
+');
+}
\ No newline at end of file
diff --git a/Tests/tests/vendors.php b/Tests/tests/vendors.php
deleted file mode 100644
index d759725af..000000000
--- a/Tests/tests/vendors.php
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env php
- Installing/Updating $name\n";
-
- $installDir = $vendorDir.'/'.$name;
- if (!is_dir($installDir)) {
- system(sprintf('git clone --quiet %s %s', escapeshellarg($url), escapeshellarg($installDir)));
- }
-
- system(sprintf('cd %s && git fetch origin && git reset --hard %s', escapeshellarg($installDir), escapeshellarg($rev)));
-}
diff --git a/build.xml b/build.xml
new file mode 100644
index 000000000..866d2f889
--- /dev/null
+++ b/build.xml
@@ -0,0 +1,232 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/composer.json b/composer.json
index 4c876c12e..d826d8adc 100644
--- a/composer.json
+++ b/composer.json
@@ -18,16 +18,20 @@
],
"require": {
"php": ">=5.3.2",
- "symfony/framework-bundle": "2.0.*",
+ "symfony/symfony": "2.0.*",
+ "sonata-project/notification-bundle": "2.0.*",
"sonata-project/admin-bundle": "2.0.*",
"sonata-project/easy-extends-bundle": "*",
"knplabs/gaufrette": "*",
"imagine/Imagine": "*",
"kriswallsmith/buzz": "*"
},
+ "require-dev": {
+ "sonata-project/formatter-bundle": "2.0.*"
+ },
"suggest": {
"sonata-project/doctrine-orm-admin-bundle": "2.0.*",
- "liip/imagine-bundle": "*"
+ "liip/imagine-bundle": "*",
"sonata-project/admin-bundle": "2.0.*"
},
"autoload": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index cc66017d6..bc624e05b 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -17,4 +17,25 @@
+
+
+
+ ./
+
+ ./Tests/
+ ./DataFixtures/
+ ./Resources/
+ ./DependencyInjection/
+ ./vendor/
+
+
+ ./Admin/Manager
+ ./**/ODM
+ ./**/ORM
+ ./**/PHPCR
+
+
+
+
+