Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge remote-tracking branch 'upstream/master'

  • Loading branch information...
commit 01c7110eb7076ca54aadbf657904db8f4ab08747 2 parents a50cc46 + 4ca6667
Clay Loveless claylo authored
12 PHPUnit/Extensions/Database/Autoload.php
View
@@ -2,7 +2,7 @@
/**
* PHPUnit
*
- * Copyright (c) 2002-2010, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2002-2012, Sebastian Bergmann <sb@sebastian-bergmann.de>.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -42,6 +42,16 @@
* @since File available since Release 1.1.0
*/
+require_once 'Symfony/Component/Yaml/Dumper.php';
+require_once 'Symfony/Component/Yaml/Escaper.php';
+require_once 'Symfony/Component/Yaml/Exception/ExceptionInterface.php';
+require_once 'Symfony/Component/Yaml/Exception/DumpException.php';
+require_once 'Symfony/Component/Yaml/Exception/ParseException.php';
+require_once 'Symfony/Component/Yaml/Inline.php';
+require_once 'Symfony/Component/Yaml/Parser.php';
+require_once 'Symfony/Component/Yaml/Unescaper.php';
+require_once 'Symfony/Component/Yaml/Yaml.php';
+
function phpunit_dbunit_autoload($class = NULL) {
static $classes = NULL;
static $path = NULL;
12 PHPUnit/Extensions/Database/Autoload.php.in
View
@@ -2,7 +2,7 @@
/**
* PHPUnit
*
- * Copyright (c) 2002-2010, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2002-2012, Sebastian Bergmann <sb@sebastian-bergmann.de>.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -42,6 +42,16 @@
* @since File available since Release 1.1.0
*/
+require_once 'Symfony/Component/Yaml/Dumper.php';
+require_once 'Symfony/Component/Yaml/Escaper.php';
+require_once 'Symfony/Component/Yaml/Exception/ExceptionInterface.php';
+require_once 'Symfony/Component/Yaml/Exception/DumpException.php';
+require_once 'Symfony/Component/Yaml/Exception/ParseException.php';
+require_once 'Symfony/Component/Yaml/Inline.php';
+require_once 'Symfony/Component/Yaml/Parser.php';
+require_once 'Symfony/Component/Yaml/Unescaper.php';
+require_once 'Symfony/Component/Yaml/Yaml.php';
+
function phpunit_dbunit_autoload($class = NULL) {
static $classes = NULL;
static $path = NULL;
3  PHPUnit/Extensions/Database/DataSet/Persistors/Yaml.php
View
@@ -103,7 +103,8 @@ public function write(PHPUnit_Extensions_Database_DataSet_IDataSet $dataset)
}
file_put_contents(
- $this->filename, sfYaml::dump($phpArr, 3) . $emptyTablesAsString
+ $this->filename,
+ Symfony\Component\Yaml\Yaml::dump($phpArr, 3) . $emptyTablesAsString
);
}
}
6 PHPUnit/Extensions/Database/DataSet/YamlDataSet.php
View
@@ -42,10 +42,6 @@
* @since File available since Release 1.0.0
*/
-if (!class_exists('sfYaml', FALSE)) {
- require_once 'SymfonyComponents/YAML/sfYaml.php';
-}
-
/**
* Creates CsvDataSets.
*
@@ -84,7 +80,7 @@ public function __construct($yamlFile)
*/
public function addYamlFile($yamlFile)
{
- $data = sfYaml::load($yamlFile);
+ $data = Symfony\Component\Yaml\Yaml::parse($yamlFile);
foreach ($data as $tableName => $rows) {
if (!isset($rows)) {
18 package.xml
View
@@ -17,14 +17,14 @@
<email>sb@sebastian-bergmann.de</email>
<active>yes</active>
</lead>
- <date>2012-01-27</date>
+ <date>2012-08-18</date>
<version>
- <release>1.1.2</release>
- <api>1.1.0</api>
+ <release>1.2.0RC1</release>
+ <api>1.2.0</api>
</version>
<stability>
- <release>stable</release>
- <api>stable</api>
+ <release>beta</release>
+ <api>beta</api>
</stability>
<license>The BSD 3-Clause License</license>
<notes>http://github.com/sebastianbergmann/dbunit/blob/master/README.markdown</notes>
@@ -375,7 +375,7 @@
<dependencies>
<required>
<php>
- <min>5.2.7</min>
+ <min>5.3.3</min>
</php>
<pearinstaller>
<min>1.9.4</min>
@@ -383,12 +383,12 @@
<package>
<name>PHPUnit</name>
<channel>pear.phpunit.de</channel>
- <min>3.6.0</min>
+ <min>3.7.0</min>
</package>
<package>
<name>YAML</name>
- <channel>pear.symfony-project.com</channel>
- <min>1.0.2</min>
+ <channel>pear.symfony.com</channel>
+ <min>2.1.0RC1</min>
</package>
<extension>
<name>pdo</name>
Please sign in to comment.
Something went wrong with that request. Please try again.