Skip to content

Commit

Permalink
EZP-30574: Renamed all *.yml files to *.yaml
Browse files Browse the repository at this point in the history
  • Loading branch information
webhdx committed Jun 5, 2019
1 parent 4a62cfe commit f28d756
Show file tree
Hide file tree
Showing 21 changed files with 21 additions and 21 deletions.
22 changes: 11 additions & 11 deletions src/bundle/DependencyInjection/EzPlatformRichTextExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,21 +45,21 @@ public function load(array $configs, ContainerBuilder $container)
$container,
new FileLocator(__DIR__ . '/../../lib/eZ/settings')
);
$ezLoader->load('fieldtypes.yml');
$ezLoader->load('fieldtype_services.yml');
$ezLoader->load('fieldtype_external_storages.yml');
$ezLoader->load('indexable_fieldtypes.yml');
$ezLoader->load('storage_engines/legacy/external_storage_gateways.yml');
$ezLoader->load('storage_engines/legacy/field_value_converters.yml');
$ezLoader->load('fieldtypes.yaml');
$ezLoader->load('fieldtype_services.yaml');
$ezLoader->load('fieldtype_external_storages.yaml');
$ezLoader->load('indexable_fieldtypes.yaml');
$ezLoader->load('storage_engines/legacy/external_storage_gateways.yaml');
$ezLoader->load('storage_engines/legacy/field_value_converters.yaml');

$loader = new Loader\YamlFileLoader(
$container,
new FileLocator(__DIR__ . '/../Resources/config')
);
$loader->load('fieldtype_services.yml');
$loader->load('rest.yml');
$loader->load('templating.yml');
$loader->load('form.yml');
$loader->load('fieldtype_services.yaml');
$loader->load('rest.yaml');
$loader->load('templating.yaml');
$loader->load('form.yaml');

$configuration = $this->getConfiguration($configs, $container);
$config = $this->processConfiguration($configuration, $configs);
Expand Down Expand Up @@ -111,7 +111,7 @@ private function registerRichTextConfiguration(array $config, ContainerBuilder $
*/
public function prepend(ContainerBuilder $container)
{
$coreExtensionConfigFile = realpath(__DIR__ . '/../Resources/config/prepend/ezpublish.yml');
$coreExtensionConfigFile = realpath(__DIR__ . '/../Resources/config/prepend/ezpublish.yaml');
$container->prependExtensionConfig('ezpublish', Yaml::parseFile($coreExtensionConfigFile));
$container->addResource(new FileResource($coreExtensionConfigFile));
}
Expand Down
2 changes: 1 addition & 1 deletion src/bundle/EzPlatformRichTextBundle.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public function build(ContainerBuilder $container)

/** @var \eZ\Bundle\EzPublishCoreBundle\DependencyInjection\EzPublishCoreExtension $core */
$core = $container->getExtension('ezpublish');
$core->addDefaultSettings(__DIR__ . '/Resources/config', ['default_settings.yml']);
$core->addDefaultSettings(__DIR__ . '/Resources/config', ['default_settings.yaml']);

$container->addCompilerPass(new RichTextHtml5ConverterPass());
$this->registerConfigParser($container);
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ private function getExtensionsConfig(): array
if (null === $this->extensionsConfig) {
foreach (['ezrichtext', 'ezpublish'] as $extensionName) {
$this->extensionsConfig[$extensionName] = Yaml::parseFile(
__DIR__ . "/../../../Fixtures/{$extensionName}.yml"
__DIR__ . "/../../../Fixtures/{$extensionName}.yaml"
);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ protected function getContainerExtensions()
public function testRichTextConfiguration()
{
$config = Yaml::parse(
file_get_contents(__DIR__ . '/Fixtures/ezrichtext.yml')
file_get_contents(__DIR__ . '/Fixtures/ezrichtext.yaml')
);
$this->load($config);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ protected function loadRichTextSettings(ContainerBuilder $containerBuilder)
}

$loader = new YamlFileLoader($containerBuilder, new FileLocator($settingsPath));
$loader->load('fieldtypes.yml');
$loader->load('fieldtype_services.yml');
$loader->load('fieldtype_external_storages.yml');
$loader->load('indexable_fieldtypes.yml');
$loader->load('storage_engines/legacy/external_storage_gateways.yml');
$loader->load('storage_engines/legacy/field_value_converters.yml');
$loader->load('fieldtypes.yaml');
$loader->load('fieldtype_services.yaml');
$loader->load('fieldtype_external_storages.yaml');
$loader->load('indexable_fieldtypes.yaml');
$loader->load('storage_engines/legacy/external_storage_gateways.yaml');
$loader->load('storage_engines/legacy/field_value_converters.yaml');

$containerBuilder->addCompilerPass(new Compiler\RichTextHtml5ConverterPass());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class CustomTagsValidatorTest extends TestCase
public function setUp()
{
// reuse Custom Tags configuration from common test settings
$commonSettings = Yaml::parseFile(__DIR__ . '/../../settings/common.yml');
$commonSettings = Yaml::parseFile(__DIR__ . '/../../settings/common.yaml');
$customTagsConfiguration = $commonSettings['parameters']['ezplatform.ezrichtext.custom_tags'];

$this->validator = new CustomTagsValidator($customTagsConfiguration);
Expand Down
File renamed without changes.

0 comments on commit f28d756

Please sign in to comment.