Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

tweaked previous merge

  • Loading branch information...
commit ee0be6c408d60e03195e2940bc7b5a7877b9484d 1 parent 0669b61
Fabien Potencier fabpot authored
4 .travis.yml
@@ -5,4 +5,6 @@ php:
5 5 - 5.3
6 6 - 5.4
7 7
8   -before_script: wget http://getcomposer.org/composer.phar && php composer.phar --install-suggests install
  8 +before_script:
  9 + - curl -s http://getcomposer.org/installer | php
  10 + - php composer.phar --dev install
1  composer.autoload.php.dist → autoload.php.dist
... ... @@ -1,7 +1,6 @@
1 1 <?php
2 2
3 3 $loader = require_once __DIR__.'/vendor/.composer/autoload.php';
4   -$loader->add('Symfony\\Tests', __DIR__.'/tests');
5 4
6 5 use Doctrine\Common\Annotations\AnnotationRegistry;
7 6
2  composer.json
@@ -52,7 +52,7 @@
52 52 "symfony/validator": "self.version",
53 53 "symfony/yaml": "self.version"
54 54 },
55   - "suggest": {
  55 + "require-dev": {
56 56 "doctrine/dbal": "2.2.*",
57 57 "doctrine/orm": "2.2.*",
58 58 "doctrine/data-fixtures": "1.0.*",
2  phpunit.xml.dist
@@ -9,7 +9,7 @@
9 9 processIsolation="false"
10 10 stopOnFailure="false"
11 11 syntaxCheck="false"
12   - bootstrap="composer.autoload.php.dist"
  12 + bootstrap="autoload.php.dist"
13 13 >
14 14 <testsuites>
15 15 <testsuite name="Symfony Test Suite">
8 src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/AppKernel.php
@@ -22,14 +22,6 @@
22 22 break;
23 23 }
24 24
25   - if (
26   - file_exists($dir.'/vendor/.composer/autoload.php')
27   - && file_exists($dir.'/composer.autoload.php.dist')
28   - ) {
29   - require_once $dir.'/composer.autoload.php.dist';
30   - break;
31   - }
32   -
33 25 if (file_exists($dir.'/autoload.php.dist')) {
34 26 require_once $dir.'/autoload.php.dist';
35 27 break;
8 src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/AppKernel.php
@@ -22,14 +22,6 @@
22 22 break;
23 23 }
24 24
25   - if (
26   - file_exists($dir.'/vendor/.composer/autoload.php')
27   - && file_exists($dir.'/composer.autoload.php.dist')
28   - ) {
29   - require_once $dir.'/composer.autoload.php.dist';
30   - break;
31   - }
32   -
33 25 if (is_file($dir.'/autoload.php.dist')) {
34 26 require_once $dir.'/autoload.php.dist';
35 27 break;

0 comments on commit ee0be6c

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