standardized YAML files indentation to 4 spaces (#389)

- done manually - violations were found by regex searching "^( {4})* {1,3}[^ ]" in *.yml files - can be done in CLI by `find 2>/dev/null | grep -v -E "\/(vendor|node_modules)\/" | grep "\.yml" | xargs grep -l -E -e "^( {4})* {1,3}[^ ]"` - also fixed missing EOLs at the end of files and whitespace on blank lines
shopsys · Aug 10, 2018 · 457d7ad · 457d7ad
1 parent 08124c9
commit 457d7ad
Show file tree

Hide file tree

Showing 70 changed files with 2,035 additions and 2,028 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,6 +23,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### [shopsys/shopsys]
+- [#389 - Standardized YAML files indentation to 4 spaces](https://github.com/shopsys/shopsys/pull/389)
+
 ### [shopsys/framework]
 #### Added
 - [#354 - Product search in elasticsearch](https://github.com/shopsys/shopsys/pull/354)

diff --git a/UPGRADE.md b/UPGRADE.md
@@ -23,6 +23,10 @@ There is a list of all the repositories maintained by monorepo, changes in log b
     - create Elasticsearch indexes by running `php phing elasticsearch-indexes-create`
     - export products into Elasticsearch by `php phing elasticsearch-products-export`
 
+### [shopsys/project-base]
+- standardize indentation in your yaml files
+    - you can find yaml files with wrong indentation with regexp `^( {4})* {1,3}[^ ]`
+
 ## [From 7.0.0-alpha3 to 7.0.0-alpha4]
 
 ### [shopsys/framework]

diff --git a/docker/conf/docker-compose.yml.dist b/docker/conf/docker-compose.yml.dist
@@ -97,5 +97,5 @@ services:
             - discovery.type=single-node
 
 volumes:
-  elasticsearch-data:
-    driver: local
+    elasticsearch-data:
+        driver: local
diff --git a/packages/coding-standards/.travis.yml b/packages/coding-standards/.travis.yml
@@ -1,20 +1,20 @@
 language: php
 
 php:
-  - 7.1
-  - 7.2
+    - 7.1
+    - 7.2
 
 cache:
-  directories:
-    - ~/.composer/cache
+    directories:
+        - ~/.composer/cache
 
 before_install:
-  - composer config github-oauth.github.com $GITHUB_TOKEN
+    - composer config github-oauth.github.com $GITHUB_TOKEN
 
 install:
-  - composer install
+    - composer install
 
 script:
-  - php vendor/bin/parallel-lint ./src ./tests ./examples
-  - php vendor/bin/ecs check --verbose ./src ./tests ./examples
-  - php vendor/bin/phpunit
+    - php vendor/bin/parallel-lint ./src ./tests ./examples
+    - php vendor/bin/ecs check --verbose ./src ./tests ./examples
+    - php vendor/bin/phpunit
diff --git a/packages/form-types-bundle/.travis.yml b/packages/form-types-bundle/.travis.yml
@@ -1,12 +1,12 @@
 language: php
 
 php:
-  - 7.1
-  - 7.2
+    - 7.1
+    - 7.2
 
 install:
-  - composer install
+    - composer install
 
 script:
-  - php vendor/bin/parallel-lint ./src
-  - php vendor/bin/ecs check --verbose ./src
+    - php vendor/bin/parallel-lint ./src
+    - php vendor/bin/ecs check --verbose ./src
diff --git a/packages/form-types-bundle/easy-coding-standard.yml b/packages/form-types-bundle/easy-coding-standard.yml
@@ -4,4 +4,4 @@ imports:
 parameters:
     skip:
         Shopsys\CodingStandards\Sniffs\ObjectIsCreatedByFactorySniff:
-          - '*/tests/*'
+            - '*/tests/*'
diff --git a/packages/form-types-bundle/src/Resources/config/services.yml b/packages/form-types-bundle/src/Resources/config/services.yml
@@ -1,8 +1,8 @@
 services:
-  _defaults:
-    autowire: true
-    autoconfigure: true
-    public: false
+    _defaults:
+        autowire: true
+        autoconfigure: true
+        public: false
 
-  Shopsys\FormTypesBundle\:
-    resource: '../../*'
+    Shopsys\FormTypesBundle\:
+        resource: '../../*'
diff --git a/packages/framework/.travis.yml b/packages/framework/.travis.yml
@@ -1,22 +1,22 @@
 language: php
 
 php:
-  - 7.1
-  - 7.2
+    - 7.1
+    - 7.2
 
 cache:
-  directories:
-    - ~/.composer/cache
+    directories:
+        - ~/.composer/cache
 
 before_install:
-  - composer config github-oauth.github.com $GITHUB_TOKEN
-  - echo "extension = redis.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+    - composer config github-oauth.github.com $GITHUB_TOKEN
+    - echo "extension = redis.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
 
 install:
-  - composer install
+    - composer install
 
 script:
-  - php vendor/bin/parallel-lint ./src
-  - php vendor/bin/ecs check --verbose ./src ./tests
-  - php vendor/bin/phpstan analyze -c ./phpstan.neon ./src --level=0
-  - php vendor/bin/phpunit
+    - php vendor/bin/parallel-lint ./src
+    - php vendor/bin/ecs check --verbose ./src ./tests
+    - php vendor/bin/phpstan analyze -c ./phpstan.neon ./src --level=0
+    - php vendor/bin/phpunit
diff --git a/packages/framework/easy-coding-standard.yml b/packages/framework/easy-coding-standard.yml
@@ -31,23 +31,23 @@ parameters:
             - '*/src/Model/Product/Pricing/ProductPriceRecalculator.php'
 
         Shopsys\CodingStandards\Sniffs\ObjectIsCreatedByFactorySniff:
-          - '*/tests/*'
-          - '*/src/DataFixtures/Demo/ArticleDataFixture.php'
-          - '*/src/DataFixtures/Demo/CategoryDataFixture.php'
-          - '*/src/DataFixtures/Demo/PaymentDataFixture.php'
-          - '*/src/DataFixtures/Demo/PersonalDataAccessRequestDataFixture.php'
-          - '*/src/DataFixtures/Demo/TransportDataFixture.php'
-          - '*/src/DataFixtures/DemoMultidomain/ArticleDataFixture.php'
-          - '*/src/DataFixtures/Performance/CategoryDataFixture.php'
-          - '*/src/Component/Domain/DomainFactoryOverwritingDomainUrl.php'
-          - '*/src/Controller/Admin/BrandController.php'
-          - '*/src/Model/Customer/CustomerData.php'
-          - '*/src/Model/Feed/FeedCronModule.php'
-          - '*/src/Model/Feed/FeedFacade.php'
-          - '*/src/Model/Order/Preview/OrderPreviewCalculation.php'
+            - '*/tests/*'
+            - '*/src/DataFixtures/Demo/ArticleDataFixture.php'
+            - '*/src/DataFixtures/Demo/CategoryDataFixture.php'
+            - '*/src/DataFixtures/Demo/PaymentDataFixture.php'
+            - '*/src/DataFixtures/Demo/PersonalDataAccessRequestDataFixture.php'
+            - '*/src/DataFixtures/Demo/TransportDataFixture.php'
+            - '*/src/DataFixtures/DemoMultidomain/ArticleDataFixture.php'
+            - '*/src/DataFixtures/Performance/CategoryDataFixture.php'
+            - '*/src/Component/Domain/DomainFactoryOverwritingDomainUrl.php'
+            - '*/src/Controller/Admin/BrandController.php'
+            - '*/src/Model/Customer/CustomerData.php'
+            - '*/src/Model/Feed/FeedCronModule.php'
+            - '*/src/Model/Feed/FeedFacade.php'
+            - '*/src/Model/Order/Preview/OrderPreviewCalculation.php'
 
         Shopsys\CodingStandards\Sniffs\ForbiddenDumpSniff:
-          - '*/src/Component/DateTimeHelper/Exception/CannotParseDateTimeException.php'
-          - '*/src/Component/Doctrine/Cache/PermanentPhpFileCache.php'
-          - '*/src/Twig/VarDumperExtension.php'
-          - '*/src/Resources/views/Migration/migration.php.twig'
+            - '*/src/Component/DateTimeHelper/Exception/CannotParseDateTimeException.php'
+            - '*/src/Component/Doctrine/Cache/PermanentPhpFileCache.php'
+            - '*/src/Twig/VarDumperExtension.php'
+            - '*/src/Resources/views/Migration/migration.php.twig'
diff --git a/packages/framework/src/Resources/config/paths.yml b/packages/framework/src/Resources/config/paths.yml
@@ -1,4 +1,4 @@
 parameters:
-  shopsys.framework.resources_dir: "%shopsys.framework.root_dir%/src/Resources"
-  shopsys.framework.javascript_sources_dir: "%shopsys.framework.resources_dir%/scripts"
-  shopsys.framework.elasticsearch_sources_dir: "%shopsys.framework.resources_dir%/elasticsearch/definitions"
+    shopsys.framework.resources_dir: "%shopsys.framework.root_dir%/src/Resources"
+    shopsys.framework.javascript_sources_dir: "%shopsys.framework.resources_dir%/scripts"
+    shopsys.framework.elasticsearch_sources_dir: "%shopsys.framework.resources_dir%/elasticsearch/definitions"
diff --git a/packages/framework/src/Resources/config/routing.yml b/packages/framework/src/Resources/config/routing.yml
@@ -1,4 +1,4 @@
 shopsys_framework_admin:
-  resource: "@ShopsysFrameworkBundle/Controller"
-  prefix: /admin
-  type: annotation
+    resource: "@ShopsysFrameworkBundle/Controller"
+    prefix: /admin
+    type: annotation