Skip to content
Browse files

tweaked previous merge

  • Loading branch information...
1 parent 0669b61 commit ee0be6c408d60e03195e2940bc7b5a7877b9484d @fabpot fabpot committed Apr 18, 2012
View
4 .travis.yml
@@ -5,4 +5,6 @@ php:
- 5.3
- 5.4
-before_script: wget http://getcomposer.org/composer.phar && php composer.phar --install-suggests install
+before_script:
+ - curl -s http://getcomposer.org/installer | php
+ - php composer.phar --dev install
View
1 composer.autoload.php.dist → autoload.php.dist
@@ -1,7 +1,6 @@
<?php
$loader = require_once __DIR__.'/vendor/.composer/autoload.php';
-$loader->add('Symfony\\Tests', __DIR__.'/tests');
use Doctrine\Common\Annotations\AnnotationRegistry;
View
2 composer.json
@@ -52,7 +52,7 @@
"symfony/validator": "self.version",
"symfony/yaml": "self.version"
},
- "suggest": {
+ "require-dev": {
"doctrine/dbal": "2.2.*",
"doctrine/orm": "2.2.*",
"doctrine/data-fixtures": "1.0.*",
View
2 phpunit.xml.dist
@@ -9,7 +9,7 @@
processIsolation="false"
stopOnFailure="false"
syntaxCheck="false"
- bootstrap="composer.autoload.php.dist"
+ bootstrap="autoload.php.dist"
>
<testsuites>
<testsuite name="Symfony Test Suite">
View
8 src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/AppKernel.php
@@ -22,14 +22,6 @@
break;
}
- if (
- file_exists($dir.'/vendor/.composer/autoload.php')
- && file_exists($dir.'/composer.autoload.php.dist')
- ) {
- require_once $dir.'/composer.autoload.php.dist';
- break;
- }
-
if (file_exists($dir.'/autoload.php.dist')) {
require_once $dir.'/autoload.php.dist';
break;
View
8 src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/AppKernel.php
@@ -22,14 +22,6 @@
break;
}
- if (
- file_exists($dir.'/vendor/.composer/autoload.php')
- && file_exists($dir.'/composer.autoload.php.dist')
- ) {
- require_once $dir.'/composer.autoload.php.dist';
- break;
- }
-
if (is_file($dir.'/autoload.php.dist')) {
require_once $dir.'/autoload.php.dist';
break;

0 comments on commit ee0be6c

Please sign in to comment.
Something went wrong with that request. Please try again.