build(release): merge branch develop (release 1.8.7)

.php-cs-fixer.php

@@ -18,6 +18,8 @@
 		'ordered_class_elements' => array(
 			'sort_algorithm' => 'alpha'
 		),
+		'ordered_imports' => true,
+		'function_typehint_space' => true,
 		'method_argument_space' => array(
 			'on_multiline' => 'ensure_fully_multiline',
 			'after_heredoc' => true
@@ -42,14 +44,25 @@
 		'no_trailing_whitespace' => true,
 		'no_whitespace_before_comma_in_array' => true,
 		'no_whitespace_in_blank_line' => true,
-		'phpdoc_add_missing_param_annotation' => true,
+		'nullable_type_declaration_for_default_null_value' => array(
+			'use_nullable_type_declaration' => true
+		),
+		'phpdoc_add_missing_param_annotation' => array(
+			'only_untyped' => false
+		),
 		'phpdoc_align' => array(
 			'align' => 'left'
 		),
 		'phpdoc_indent' => true,
 		'phpdoc_order' => true,
+		'phpdoc_scalar' => true,
 		'phpdoc_trim' => true,
+		'phpdoc_trim_consecutive_blank_line_separation' => true,
 		'return_type_declaration' => true,
+		'phpdoc_types' => true,
+		'phpdoc_types_order' => array(
+			'null_adjustment' => 'always_last'
+		),
 		'single_blank_line_before_namespace' => true,
 		'single_blank_line_at_eof' => true,
 		'single_line_after_imports' => true,

automad/console

@@ -35,6 +35,8 @@
  * http://automad.org/license
  */
 
+use Automad\Autoload;
+use Automad\Core\Config;
 use Automad\UI\Console;
 
 if (http_response_code() || !defined('STDIN')) {
@@ -45,7 +47,10 @@ define('AUTOMAD', true);
 define('AUTOMAD_CONSOLE', true);
 define('AM_BASE_DIR', dirname(dirname(__FILE__)));
 
-require AM_BASE_DIR . '/automad/autoload.php';
-require AM_BASE_DIR . '/automad/const.php';
+require_once AM_BASE_DIR . '/automad/src/Autoload.php';
+
+Autoload::init();
+Config::overrides();
+Config::defaults();
 
 $console = new Console($argv);