From 97d6f766337dadb8d0e3e695a16cc6c92fb5a3d0 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 11 Feb 2010 19:24:23 +0100 Subject: [PATCH] [Yaml] finished the renaming of YAML to Yaml --- src/Symfony/Components/Yaml/Dumper.php | 2 +- src/Symfony/Components/Yaml/Inline.php | 10 +++++----- src/Symfony/Components/Yaml/Parser.php | 2 +- src/Symfony/Components/Yaml/{YAML.php => Yaml.php} | 4 ++-- .../Components/{YAML => Yaml}/YtsAnchorAlias.yml | 0 .../Components/{YAML => Yaml}/YtsBasicTests.yml | 0 .../Components/{YAML => Yaml}/YtsBlockMapping.yml | 0 .../Components/{YAML => Yaml}/YtsDocumentSeparator.yml | 0 .../Components/{YAML => Yaml}/YtsErrorTests.yml | 0 .../Components/{YAML => Yaml}/YtsFlowCollections.yml | 0 .../Components/{YAML => Yaml}/YtsFoldedScalars.yml | 0 .../Components/{YAML => Yaml}/YtsNullsAndEmpties.yml | 0 .../{YAML => Yaml}/YtsSpecificationExamples.yml | 0 .../Components/{YAML => Yaml}/YtsTypeTransfers.yml | 0 .../Symfony/Components/{YAML => Yaml}/index.yml | 0 .../Symfony/Components/{YAML => Yaml}/sfComments.yml | 0 .../Symfony/Components/{YAML => Yaml}/sfMergeKey.yml | 0 .../Symfony/Components/{YAML => Yaml}/sfObjects.yml | 0 .../Symfony/Components/{YAML => Yaml}/sfQuotes.yml | 0 .../Symfony/Components/{YAML => Yaml}/sfTests.yml | 0 .../Symfony/Components/{YAML => Yaml}/DumperTest.php | 10 +++++----- .../Symfony/Components/{YAML => Yaml}/InlineTest.php | 6 +++--- .../Symfony/Components/{YAML => Yaml}/ParserTest.php | 8 ++++---- 23 files changed, 21 insertions(+), 21 deletions(-) rename src/Symfony/Components/Yaml/{YAML.php => Yaml.php} (98%) rename tests/fixtures/Symfony/Components/{YAML => Yaml}/YtsAnchorAlias.yml (100%) rename tests/fixtures/Symfony/Components/{YAML => Yaml}/YtsBasicTests.yml (100%) rename tests/fixtures/Symfony/Components/{YAML => Yaml}/YtsBlockMapping.yml (100%) rename tests/fixtures/Symfony/Components/{YAML => Yaml}/YtsDocumentSeparator.yml (100%) rename tests/fixtures/Symfony/Components/{YAML => Yaml}/YtsErrorTests.yml (100%) rename tests/fixtures/Symfony/Components/{YAML => Yaml}/YtsFlowCollections.yml (100%) rename tests/fixtures/Symfony/Components/{YAML => Yaml}/YtsFoldedScalars.yml (100%) rename tests/fixtures/Symfony/Components/{YAML => Yaml}/YtsNullsAndEmpties.yml (100%) rename tests/fixtures/Symfony/Components/{YAML => Yaml}/YtsSpecificationExamples.yml (100%) rename tests/fixtures/Symfony/Components/{YAML => Yaml}/YtsTypeTransfers.yml (100%) rename tests/fixtures/Symfony/Components/{YAML => Yaml}/index.yml (100%) rename tests/fixtures/Symfony/Components/{YAML => Yaml}/sfComments.yml (100%) rename tests/fixtures/Symfony/Components/{YAML => Yaml}/sfMergeKey.yml (100%) rename tests/fixtures/Symfony/Components/{YAML => Yaml}/sfObjects.yml (100%) rename tests/fixtures/Symfony/Components/{YAML => Yaml}/sfQuotes.yml (100%) rename tests/fixtures/Symfony/Components/{YAML => Yaml}/sfTests.yml (100%) rename tests/unit/Symfony/Components/{YAML => Yaml}/DumperTest.php (93%) rename tests/unit/Symfony/Components/{YAML => Yaml}/InlineTest.php (98%) rename tests/unit/Symfony/Components/{YAML => Yaml}/ParserTest.php (90%) diff --git a/src/Symfony/Components/Yaml/Dumper.php b/src/Symfony/Components/Yaml/Dumper.php index f50291a3ec..2db3f6cf1e 100644 --- a/src/Symfony/Components/Yaml/Dumper.php +++ b/src/Symfony/Components/Yaml/Dumper.php @@ -1,6 +1,6 @@ */ -class YAML +class Yaml { static protected $spec = '1.2'; diff --git a/tests/fixtures/Symfony/Components/YAML/YtsAnchorAlias.yml b/tests/fixtures/Symfony/Components/Yaml/YtsAnchorAlias.yml similarity index 100% rename from tests/fixtures/Symfony/Components/YAML/YtsAnchorAlias.yml rename to tests/fixtures/Symfony/Components/Yaml/YtsAnchorAlias.yml diff --git a/tests/fixtures/Symfony/Components/YAML/YtsBasicTests.yml b/tests/fixtures/Symfony/Components/Yaml/YtsBasicTests.yml similarity index 100% rename from tests/fixtures/Symfony/Components/YAML/YtsBasicTests.yml rename to tests/fixtures/Symfony/Components/Yaml/YtsBasicTests.yml diff --git a/tests/fixtures/Symfony/Components/YAML/YtsBlockMapping.yml b/tests/fixtures/Symfony/Components/Yaml/YtsBlockMapping.yml similarity index 100% rename from tests/fixtures/Symfony/Components/YAML/YtsBlockMapping.yml rename to tests/fixtures/Symfony/Components/Yaml/YtsBlockMapping.yml diff --git a/tests/fixtures/Symfony/Components/YAML/YtsDocumentSeparator.yml b/tests/fixtures/Symfony/Components/Yaml/YtsDocumentSeparator.yml similarity index 100% rename from tests/fixtures/Symfony/Components/YAML/YtsDocumentSeparator.yml rename to tests/fixtures/Symfony/Components/Yaml/YtsDocumentSeparator.yml diff --git a/tests/fixtures/Symfony/Components/YAML/YtsErrorTests.yml b/tests/fixtures/Symfony/Components/Yaml/YtsErrorTests.yml similarity index 100% rename from tests/fixtures/Symfony/Components/YAML/YtsErrorTests.yml rename to tests/fixtures/Symfony/Components/Yaml/YtsErrorTests.yml diff --git a/tests/fixtures/Symfony/Components/YAML/YtsFlowCollections.yml b/tests/fixtures/Symfony/Components/Yaml/YtsFlowCollections.yml similarity index 100% rename from tests/fixtures/Symfony/Components/YAML/YtsFlowCollections.yml rename to tests/fixtures/Symfony/Components/Yaml/YtsFlowCollections.yml diff --git a/tests/fixtures/Symfony/Components/YAML/YtsFoldedScalars.yml b/tests/fixtures/Symfony/Components/Yaml/YtsFoldedScalars.yml similarity index 100% rename from tests/fixtures/Symfony/Components/YAML/YtsFoldedScalars.yml rename to tests/fixtures/Symfony/Components/Yaml/YtsFoldedScalars.yml diff --git a/tests/fixtures/Symfony/Components/YAML/YtsNullsAndEmpties.yml b/tests/fixtures/Symfony/Components/Yaml/YtsNullsAndEmpties.yml similarity index 100% rename from tests/fixtures/Symfony/Components/YAML/YtsNullsAndEmpties.yml rename to tests/fixtures/Symfony/Components/Yaml/YtsNullsAndEmpties.yml diff --git a/tests/fixtures/Symfony/Components/YAML/YtsSpecificationExamples.yml b/tests/fixtures/Symfony/Components/Yaml/YtsSpecificationExamples.yml similarity index 100% rename from tests/fixtures/Symfony/Components/YAML/YtsSpecificationExamples.yml rename to tests/fixtures/Symfony/Components/Yaml/YtsSpecificationExamples.yml diff --git a/tests/fixtures/Symfony/Components/YAML/YtsTypeTransfers.yml b/tests/fixtures/Symfony/Components/Yaml/YtsTypeTransfers.yml similarity index 100% rename from tests/fixtures/Symfony/Components/YAML/YtsTypeTransfers.yml rename to tests/fixtures/Symfony/Components/Yaml/YtsTypeTransfers.yml diff --git a/tests/fixtures/Symfony/Components/YAML/index.yml b/tests/fixtures/Symfony/Components/Yaml/index.yml similarity index 100% rename from tests/fixtures/Symfony/Components/YAML/index.yml rename to tests/fixtures/Symfony/Components/Yaml/index.yml diff --git a/tests/fixtures/Symfony/Components/YAML/sfComments.yml b/tests/fixtures/Symfony/Components/Yaml/sfComments.yml similarity index 100% rename from tests/fixtures/Symfony/Components/YAML/sfComments.yml rename to tests/fixtures/Symfony/Components/Yaml/sfComments.yml diff --git a/tests/fixtures/Symfony/Components/YAML/sfMergeKey.yml b/tests/fixtures/Symfony/Components/Yaml/sfMergeKey.yml similarity index 100% rename from tests/fixtures/Symfony/Components/YAML/sfMergeKey.yml rename to tests/fixtures/Symfony/Components/Yaml/sfMergeKey.yml diff --git a/tests/fixtures/Symfony/Components/YAML/sfObjects.yml b/tests/fixtures/Symfony/Components/Yaml/sfObjects.yml similarity index 100% rename from tests/fixtures/Symfony/Components/YAML/sfObjects.yml rename to tests/fixtures/Symfony/Components/Yaml/sfObjects.yml diff --git a/tests/fixtures/Symfony/Components/YAML/sfQuotes.yml b/tests/fixtures/Symfony/Components/Yaml/sfQuotes.yml similarity index 100% rename from tests/fixtures/Symfony/Components/YAML/sfQuotes.yml rename to tests/fixtures/Symfony/Components/Yaml/sfQuotes.yml diff --git a/tests/fixtures/Symfony/Components/YAML/sfTests.yml b/tests/fixtures/Symfony/Components/Yaml/sfTests.yml similarity index 100% rename from tests/fixtures/Symfony/Components/YAML/sfTests.yml rename to tests/fixtures/Symfony/Components/Yaml/sfTests.yml diff --git a/tests/unit/Symfony/Components/YAML/DumperTest.php b/tests/unit/Symfony/Components/Yaml/DumperTest.php similarity index 93% rename from tests/unit/Symfony/Components/YAML/DumperTest.php rename to tests/unit/Symfony/Components/Yaml/DumperTest.php index dceaebdece..7e78a99d13 100644 --- a/tests/unit/Symfony/Components/YAML/DumperTest.php +++ b/tests/unit/Symfony/Components/Yaml/DumperTest.php @@ -10,18 +10,18 @@ require_once __DIR__.'/../../../bootstrap.php'; -use Symfony\Components\YAML\YAML; -use Symfony\Components\YAML\Parser; -use Symfony\Components\YAML\Dumper; +use Symfony\Components\Yaml\Yaml; +use Symfony\Components\Yaml\Parser; +use Symfony\Components\Yaml\Dumper; -YAML::setSpecVersion('1.1'); +Yaml::setSpecVersion('1.1'); $t = new LimeTest(148); $parser = new Parser(); $dumper = new Dumper(); -$path = __DIR__.'/../../../../fixtures/Symfony/Components/YAML'; +$path = __DIR__.'/../../../../fixtures/Symfony/Components/Yaml'; $files = $parser->parse(file_get_contents($path.'/index.yml')); foreach ($files as $file) { diff --git a/tests/unit/Symfony/Components/YAML/InlineTest.php b/tests/unit/Symfony/Components/Yaml/InlineTest.php similarity index 98% rename from tests/unit/Symfony/Components/YAML/InlineTest.php rename to tests/unit/Symfony/Components/Yaml/InlineTest.php index 72842ee0c8..3a591c8f29 100644 --- a/tests/unit/Symfony/Components/YAML/InlineTest.php +++ b/tests/unit/Symfony/Components/Yaml/InlineTest.php @@ -10,10 +10,10 @@ require_once __DIR__.'/../../../bootstrap.php'; -use Symfony\Components\YAML\YAML; -use Symfony\Components\YAML\Inline; +use Symfony\Components\Yaml\Yaml; +use Symfony\Components\Yaml\Inline; -YAML::setSpecVersion('1.1'); +Yaml::setSpecVersion('1.1'); $t = new LimeTest(124); diff --git a/tests/unit/Symfony/Components/YAML/ParserTest.php b/tests/unit/Symfony/Components/Yaml/ParserTest.php similarity index 90% rename from tests/unit/Symfony/Components/YAML/ParserTest.php rename to tests/unit/Symfony/Components/Yaml/ParserTest.php index 34ccc5bef6..200dd5c6d8 100644 --- a/tests/unit/Symfony/Components/YAML/ParserTest.php +++ b/tests/unit/Symfony/Components/Yaml/ParserTest.php @@ -10,16 +10,16 @@ require_once __DIR__.'/../../../bootstrap.php'; -use Symfony\Components\YAML\YAML; -use Symfony\Components\YAML\Parser; +use Symfony\Components\Yaml\Yaml; +use Symfony\Components\Yaml\Parser; -YAML::setSpecVersion('1.1'); +Yaml::setSpecVersion('1.1'); $t = new LimeTest(148); $parser = new Parser(); -$path = __DIR__.'/../../../../fixtures/Symfony/Components/YAML'; +$path = __DIR__.'/../../../../fixtures/Symfony/Components/Yaml'; $files = $parser->parse(file_get_contents($path.'/index.yml')); foreach ($files as $file) {