Use .yaml instead of .yml as extension

javiereguiluz · javiereguiluz · commit a4db8b8d47a0 · 2017-11-25T11:29:24.000+01:00
diff --git a/components/config/caching.rst b/components/config/caching.rst
@@ -32,7 +32,7 @@ should be regenerated::
     $userMatcherCache = new ConfigCache($cachePath, true);
 
     if (!$userMatcherCache->isFresh()) {
-        // fill this with an array of 'users.yml' file paths
+        // fill this with an array of 'users.yaml' file paths
         $yamlUserFiles = ...;
 
         $resources = array();
diff --git a/components/config/definition.rst b/components/config/definition.rst
@@ -804,10 +804,10 @@ Otherwise the result is a clean array of configuration values::
     use Acme\DatabaseConfiguration;
 
     $config1 = Yaml::parse(
-        file_get_contents(__DIR__.'/src/Matthias/config/config.yml')
+        file_get_contents(__DIR__.'/src/Matthias/config/config.yaml')
     );
     $config2 = Yaml::parse(
-        file_get_contents(__DIR__.'/src/Matthias/config/config_extra.yml')
+        file_get_contents(__DIR__.'/src/Matthias/config/config_extra.yaml')
     );
 
     $configs = array($config1, $config2);
diff --git a/components/config/resources.rst b/components/config/resources.rst
@@ -22,7 +22,7 @@ files. This can be done with the :class:`Symfony\\Component\\Config\\FileLocator
     $configDirectories = array(__DIR__.'/app/config');
 
     $locator = new FileLocator($configDirectories);
-    $yamlUserFiles = $locator->locate('users.yml', null, false);
+    $yamlUserFiles = $locator->locate('users.yaml', null, false);
 
 The locator receives a collection of locations where it should look for
 files. The first argument of ``locate()`` is the name of the file to look
@@ -53,12 +53,12 @@ which allows for recursively importing other resources::
 
             // maybe import some other resource:
 
-            // $this->import('extra_users.yml');
+            // $this->import('extra_users.yaml');
         }
 
         public function supports($resource, $type = null)
         {
-            return is_string($resource) && 'yml' === pathinfo(
+            return is_string($resource) && 'yaml' === pathinfo(
                 $resource,
                 PATHINFO_EXTENSION
             );
@@ -88,5 +88,5 @@ the resource::
     $delegatingLoader = new DelegatingLoader($loaderResolver);
 
     // YamlUserLoader is used to load this resource because it supports
-    // files with the '.yml' extension
-    $delegatingLoader->load(__DIR__.'/users.yml');
+    // files with the '.yaml' extension
+    $delegatingLoader->load(__DIR__.'/users.yaml');
diff --git a/components/dependency_injection/_imports-parameters-note.rst.inc b/components/dependency_injection/_imports-parameters-note.rst.inc
@@ -8,25 +8,25 @@
 
         .. code-block:: yaml
 
-            # app/config/config.yml
+            # config/services.yaml
             imports:
-                - { resource: '%kernel.project_dir%/somefile.yml' }
+                - { resource: '%kernel.project_dir%/somefile.yaml' }
 
         .. code-block:: xml
 
-            <!-- app/config/config.xml -->
+            <!-- config/services.xml -->
             <?xml version="1.0" encoding="UTF-8" ?>
             <container xmlns="http://symfony.com/schema/dic/services"
                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                 xsi:schemaLocation="http://symfony.com/schema/dic/services
                     http://symfony.com/schema/dic/services/services-1.0.xsd">
 
                 <imports>
-                    <import resource="%kernel.project_dir%/somefile.yml" />
+                    <import resource="%kernel.project_dir%/somefile.yaml" />
                 </imports>
             </container>
 
         .. code-block:: php
 
-            // app/config/config.php
-            $loader->import('%kernel.project_dir%/somefile.yml');
+            // config/services.php
+            $loader->import('%kernel.project_dir%/somefile.yaml');
diff --git a/components/dependency_injection/compilation.rst b/components/dependency_injection/compilation.rst
@@ -121,7 +121,7 @@ are loaded::
     $container->registerExtension(new AcmeDemoExtension);
 
     $loader = new YamlFileLoader($container, new FileLocator(__DIR__));
-    $loader->load('config.yml');
+    $loader->load('config.yaml');
 
     // ...
     $container->compile();
diff --git a/components/http_foundation/session_configuration.rst b/components/http_foundation/session_configuration.rst
@@ -147,7 +147,7 @@ configuration:
 
 .. code-block:: yaml
 
-    # config.yml
+    # config/packages/framework.yaml
     framework:
         session:
             gc_probability: null
diff --git a/components/property_info.rst b/components/property_info.rst
@@ -355,7 +355,7 @@ It can also provide return and scalar types for PHP 7+.
 
     .. code-block:: yaml
 
-        # app/config/config.yml
+        # config/packages/framework.yaml
         framework:
             property_info:
                 enabled: true
diff --git a/components/routing.rst b/components/routing.rst
@@ -246,7 +246,7 @@ If you're using the ``YamlFileLoader``, then route definitions look like this:
 
 .. code-block:: yaml
 
-    # routes.yml
+    # routes.yaml
     route1:
         path:     /foo
         defaults: { _controller: 'MyController::fooAction' }
@@ -256,15 +256,15 @@ If you're using the ``YamlFileLoader``, then route definitions look like this:
         defaults: { _controller: 'MyController::foobarAction' }
 
 To load this file, you can use the following code. This assumes that your
-``routes.yml`` file is in the same directory as the below code::
+``routes.yaml`` file is in the same directory as the below code::
 
     use Symfony\Component\Config\FileLocator;
     use Symfony\Component\Routing\Loader\YamlFileLoader;
 
     // look inside *this* directory
     $locator = new FileLocator(array(__DIR__));
     $loader = new YamlFileLoader($locator);
-    $collection = $loader->load('routes.yml');
+    $collection = $loader->load('routes.yaml');
 
 Besides :class:`Symfony\\Component\\Routing\\Loader\\YamlFileLoader` there are two
 other loaders that work the same way:
@@ -337,7 +337,7 @@ automatically in the background if you want to use it. A basic example of the
 
     $router = new Router(
         new YamlFileLoader($locator),
-        'routes.yml',
+        'routes.yaml',
         array('cache_dir' => __DIR__.'/cache'),
         $requestContext
     );
diff --git a/components/serializer.rst b/components/serializer.rst
@@ -21,7 +21,7 @@ the middle. This way, Encoders will only deal with turning specific
 **formats** into **arrays** and vice versa. The same way, Normalizers
 will deal with turning specific **objects** into **arrays** and vice versa.
 
-Serialization is a complex topic. This component may not cover all your use cases out of the box, 
+Serialization is a complex topic. This component may not cover all your use cases out of the box,
 but it can be useful for developing tools to serialize and deserialize your objects.
 
 Installation
@@ -243,7 +243,7 @@ like the following::
     // For XML
     // $classMetadataFactory = new ClassMetadataFactory(new XmlFileLoader('/path/to/your/definition.xml'));
     // For YAML
-    // $classMetadataFactory = new ClassMetadataFactory(new YamlFileLoader('/path/to/your/definition.yml'));
+    // $classMetadataFactory = new ClassMetadataFactory(new YamlFileLoader('/path/to/your/definition.yaml'));
 
 .. _component-serializer-attributes-groups-annotations:
 
diff --git a/components/translation.rst b/components/translation.rst
@@ -128,7 +128,7 @@ file as the second argument, instead of an array::
 
     // ...
     $translator->addLoader('yaml', new YamlFileLoader());
-    $translator->addResource('yaml', 'path/to/messages.fr.yml', 'fr_FR');
+    $translator->addResource('yaml', 'path/to/messages.fr.yaml', 'fr_FR');
 
 The Translation Process
 -----------------------
diff --git a/components/translation/custom_formats.rst b/components/translation/custom_formats.rst
@@ -119,7 +119,7 @@ YAML file are dumped into a text file with the custom format::
     use Symfony\Component\Translation\Loader\YamlFileLoader;
 
     $loader = new YamlFileLoader();
-    $catalogue = $loader->load(__DIR__ . '/translations/messages.fr_FR.yml' , 'fr_FR');
+    $catalogue = $loader->load(__DIR__ . '/translations/messages.fr_FR.yaml' , 'fr_FR');
 
     $dumper = new MyFormatDumper();
     $dumper->dump($catalogue, array('path' => __DIR__.'/dumps'));
diff --git a/components/validator/resources.rst b/components/validator/resources.rst
@@ -71,7 +71,7 @@ configure the locations of these files::
     use Symfony\Component\Validator\Validation;
 
     $validator = Validation::createValidatorBuilder()
-        ->addYamlMapping('config/validation.yml')
+        ->addYamlMapping('config/validation.yaml')
         ->getValidator();
 
 .. note::
@@ -173,13 +173,13 @@ Using a Custom MetadataFactory
 ------------------------------
 
 All the loaders and the cache are passed to an instance of
-:class:`Symfony\\Component\\Validator\\Mapping\\Factory\\LazyLoadingMetadataFactory`. 
+:class:`Symfony\\Component\\Validator\\Mapping\\Factory\\LazyLoadingMetadataFactory`.
 This class is responsible for creating a ``ClassMetadata`` instance from all the
 configured resources.
 
 You can also use a custom metadata factory implementation by creating a class
 which implements
-:class:`Symfony\\Component\\Validator\\Mapping\\Factory\\MetadataFactoryInterface`. 
+:class:`Symfony\\Component\\Validator\\Mapping\\Factory\\MetadataFactoryInterface`.
 You can set this custom implementation using
 :method:`Symfony\\Component\\Validator\\ValidatorBuilder::setMetadataFactory`::
 
diff --git a/components/yaml.rst b/components/yaml.rst
@@ -128,7 +128,7 @@ contents of the given file path and converts them to a PHP value::
 
     use Symfony\Component\Yaml\Yaml;
 
-    $value = Yaml::parseFile('/path/to/file.yml');
+    $value = Yaml::parseFile('/path/to/file.yaml');
 
 If an error occurs during parsing, the parser throws a ``ParseException`` exception.
 
@@ -151,7 +151,7 @@ array to its YAML representation:
 
     $yaml = Yaml::dump($array);
 
-    file_put_contents('/path/to/file.yml', $yaml);
+    file_put_contents('/path/to/file.yaml', $yaml);
 
 If an error occurs during the dump, the parser throws a
 :class:`Symfony\\Component\\Yaml\\Exception\\DumpException` exception.
@@ -356,20 +356,20 @@ Then, execute the script for validating contents:
 .. code-block:: terminal
 
     # validates a single file
-    $ php lint.php path/to/file.yml
+    $ php lint.php path/to/file.yaml
 
     # or all the files in a directory
     $ php lint.php path/to/directory
 
     # or contents passed to STDIN
-    $ cat path/to/file.yml | php lint.php
+    $ cat path/to/file.yaml | php lint.php
 
 The result is written to STDOUT and uses a plain text format by default.
 Add the ``--format`` option to get the output in JSON format:
 
 .. code-block:: terminal
 
-    $ php lint.php path/to/file.yml --format json
+    $ php lint.php path/to/file.yaml --format json
 
 .. tip::
 
