Merge branch 'master' into type_error

Author: yssambare12

.distignore

@@ -1,34 +1,34 @@
-# A set of files you probably don't want in your WordPress.org distribution
-.distignore
-.editorconfig
-.git
-.gitignore
-.gitlab-ci.yml
-.travis.yml
-.DS_Store
-Thumbs.db
-behat.yml
-bin
-circle.yml
-composer.json
-composer.lock
-Gruntfile.js
-package.json
-phpunit.xml
-phpunit.xml.dist
-multisite.xml
-multisite.xml.dist
-phpcs.xml
-phpcs.xml.dist
-README.md
-wp-cli.local.yml
-yarn.lock
-tests
-vendor
-node_modules
-*.sql
-*.tar.gz
-*.zip
-package-lock.json
-.github
-.wordpress-org
+# A set of files you probably don't want in your WordPress.org distribution
+.distignore
+.editorconfig
+.git
+.gitignore
+.gitlab-ci.yml
+.travis.yml
+.DS_Store
+Thumbs.db
+behat.yml
+bin
+circle.yml
+composer.json
+composer.lock
+Gruntfile.js
+package.json
+phpunit.xml
+phpunit.xml.dist
+multisite.xml
+multisite.xml.dist
+phpcs.xml
+phpcs.xml.dist
+README.md
+wp-cli.local.yml
+yarn.lock
+tests
+vendor
+node_modules
+*.sql
+*.tar.gz
+*.zip
+package-lock.json
+.github
+.wordpress-org

.gitignore

@@ -1,36 +1,37 @@
-# ignore PHPStorm extra directories
-.idea/
-
-# Leave node_modules from git
-node_modules/
-
-# sass cache
-.sass-cache
-
-# map files
-*.map
-
-# Skip package file from versoning
-*.zip
-*.sql
-*.tar.gz
-
-# ignore git inside subproject
-admin/bsf-core/.git
-
-# ignore PHPCS report files
-phpcs-summary.log
-phpcs-full.log
-
-# Exclude OS specific files
-.DS_Store
-
-# Exclude composer's directories
-vendor/
-
-# Exclude exported settings
-borders-for-default-menu.json
-defaults.json
-no-toggle-border-fix.json
-cghooks.lock
-wp-cli.local.yml
+# ignore PHPStorm extra directories
+.idea/
+
+# Leave node_modules from git
+node_modules/
+
+# sass cache
+.sass-cache
+
+# map files
+*.map
+
+# Skip package file from versoning
+*.zip
+*.sql
+*.tar.gz
+
+# ignore git inside subproject
+admin/bsf-core/.git
+
+# ignore PHPCS report files
+phpcs-summary.log
+phpcs-full.log
+
+# Exclude OS specific files
+.DS_Store
+
+# Exclude composer's directories
+vendor/
+
+# Exclude exported settings
+borders-for-default-menu.json
+defaults.json
+no-toggle-border-fix.json
+cghooks.lock
+wp-cli.local.yml
+config.bat