Skip to content

Commit 288bff7

Browse files
Depend on Symfony Yaml 2.2
1 parent 1e680d4 commit 288bff7

File tree

7 files changed

+4
-8
lines changed

7 files changed

+4
-8
lines changed

PHPUnit/Autoload.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
require_once 'PHP/Timer/Autoload.php';
4848
require_once 'PHPUnit/Framework/MockObject/Autoload.php';
4949
require_once 'Text/Template/Autoload.php';
50+
require_once 'Symfony/Component/Yaml/autoloader.php';
5051

5152
spl_autoload_register(
5253
function ($class)

PHPUnit/Autoload.php.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ require_once 'PHP/CodeCoverage/Autoload.php';
4747
require_once 'PHP/Timer/Autoload.php';
4848
require_once 'PHPUnit/Framework/MockObject/Autoload.php';
4949
require_once 'Text/Template/Autoload.php';
50+
require_once 'Symfony/Component/Yaml/autoloader.php';
5051

5152
spl_autoload_register(
5253
function ($class)

PHPUnit/Util/Log/TAP.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,6 @@
4343
* @since File available since Release 3.0.0
4444
*/
4545

46-
if (!class_exists('Symfony\\Component\\Yaml\\Dumper') &&
47-
stream_resolve_include_path('Symfony/Component/Yaml/Dumper.php')) {
48-
require_once 'Symfony/Component/Yaml/Dumper.php';
49-
}
50-
5146
/**
5247
* A TestListener that generates a logfile of the
5348
* test execution using the Test Anything Protocol (TAP).

build/dependencies/Yaml-2.1.2.tgz

-37.5 KB
Binary file not shown.

build/dependencies/Yaml-2.2.0.tgz

39 KB
Binary file not shown.

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"phpunit/php-code-coverage": ">=1.2.1,<1.3.0",
2828
"phpunit/php-timer": ">=1.0.2,<1.1.0",
2929
"phpunit/phpunit-mock-objects": ">=1.2.0,<1.3.0",
30-
"symfony/yaml": ">=2.1.0,<2.2.0",
30+
"symfony/yaml": ">=2.2.0",
3131
"ext-dom": "*",
3232
"ext-pcre": "*",
3333
"ext-reflection": "*",

package.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,8 +245,7 @@
245245
<package>
246246
<name>Yaml</name>
247247
<channel>pear.symfony.com</channel>
248-
<min>2.1.0</min>
249-
<max>2.1.99</max>
248+
<min>2.2.0</min>
250249
</package>
251250
<extension>
252251
<name>dom</name>

0 commit comments

Comments
 (0)