Skip to content

Commit aa055df

Browse files
committed
[Composer] Stwitch to composer vendors management
Bug fix: no Feature addition: yes Backwards compatibility break: ? Symfony2 tests pass: yes Fixes the following tickets: - Todo: - This speeds up Travis CI builds to `~2 min` also makes vendor management a lot easier.
1 parent d694858 commit aa055df

File tree

8 files changed

+49
-108
lines changed

8 files changed

+49
-108
lines changed

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ php:
55
- 5.3
66
- 5.4
77

8-
before_script: php vendors.php
8+
before_script: wget http://getcomposer.org/composer.phar && php composer.phar --install-suggests install

autoload.php.dist

-40
This file was deleted.

composer.autoload.php.dist

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?php
2+
3+
$loader = require_once __DIR__.'/vendor/.composer/autoload.php';
4+
$loader->add('Symfony\\Tests', __DIR__.'/tests');
5+
6+
use Doctrine\Common\Annotations\AnnotationRegistry;
7+
8+
if (!function_exists('intl_get_error_code')) {
9+
require_once __DIR__.'/src/Symfony/Component/Locale/Resources/stubs/functions.php';
10+
11+
$loader->add('IntlDateFormatter', __DIR__.'/src/Symfony/Component/Locale/Resources/stubs');
12+
$loader->add('Collator', __DIR__.'/src/Symfony/Component/Locale/Resources/stubs');
13+
$loader->add('Locale', __DIR__.'/src/Symfony/Component/Locale/Resources/stubs');
14+
$loader->add('NumberFormatter', __DIR__.'/src/Symfony/Component/Locale/Resources/stubs');
15+
}
16+
17+
AnnotationRegistry::registerLoader(array($loader, 'loadClass'));
18+
AnnotationRegistry::registerFile(__DIR__.'/vendor/doctrine/orm/lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php');
19+
20+
if (is_file(__DIR__.'/vendor/swiftmailer/swiftmailer/lib/classes/Swift.php')) {
21+
require_once __DIR__.'/vendor/swiftmailer/swiftmailer/lib/classes/Swift.php';
22+
Swift::registerAutoload(__DIR__.'/vendor/swiftmailer/swiftmailer/lib/swift_init.php');
23+
}
24+
25+
if (is_file($file = __DIR__.'/vendor/propel/propel/runtime/lib/Propel.php')) {
26+
require_once $file;
27+
}

composer.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,10 @@
5252
"symfony/yaml": "self.version"
5353
},
5454
"suggest": {
55-
"doctrine/data-fixtures": "1.0.*"
55+
"doctrine/dbal": "2.2.*",
56+
"doctrine/orm": "2.2.*",
57+
"doctrine/data-fixtures": "1.0.*",
58+
"propel/propel1": "dev-master"
5659
},
5760
"autoload": {
5861
"psr-0": {

phpunit.xml.dist

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
processIsolation="false"
1010
stopOnFailure="false"
1111
syntaxCheck="false"
12-
bootstrap="autoload.php.dist"
12+
bootstrap="composer.autoload.php.dist"
1313
>
1414
<testsuites>
1515
<testsuite name="Symfony Test Suite">

src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/AppKernel.php

+8
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,14 @@
2222
break;
2323
}
2424

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+
2533
if (file_exists($dir.'/autoload.php.dist')) {
2634
require_once $dir.'/autoload.php.dist';
2735
break;

src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/AppKernel.php

+8
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,14 @@
2222
break;
2323
}
2424

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+
2533
if (is_file($dir.'/autoload.php.dist')) {
2634
require_once $dir.'/autoload.php.dist';
2735
break;

vendors.php

-65
This file was deleted.

0 commit comments

Comments
 (0)