Merge pull request #241 from skaut/dependabot/composer/phan/phan-3.2.0

Bump phan/phan from 3.1.1 to 3.2.0
skaut · Aug 26, 2020 · 87cd71f · 87cd71f
2 parents f88a703 + eca8004
commit 87cd71f
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 31 deletions.
diff --git a/.phan/config.php b/.phan/config.php
@@ -6,7 +6,8 @@
  */
 
 return array(
-	'target_php_version'                        => '7.3',
+	'target_php_version'                        => '7.4',
+	'minimum_target_php_version'                => '7.0',
 	'backward_compatibility_checks'             => false, // Covered by PHPCS.
 	'warn_about_undocumented_throw_statements'  => true,
 	'strict_method_checking'                    => true,

diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
 		"source": "https://github.com/skaut/crdm-modern"
 	},
 	"require": {
-		"php": "^7.2"
+		"php": "^7.0"
 	},
 	"require-dev": {
 		"squizlabs/php_codesniffer": "^3.4",

diff --git a/composer.lock b/composer.lock
diff --git a/phpcs.xml b/phpcs.xml
@@ -12,7 +12,7 @@
 	<arg name="extensions" value="php"/>
 	<arg name="parallel" value="8"/>
 
-	<config name="testVersion" value="7.2-"/>
+	<config name="testVersion" value="7.0-"/>
 	<rule ref="PHPCompatibilityWP"/>
 
 	<config name="minimum_supported_wp_version" value="5.0.0"/>

diff --git a/src/php/admin/customizer/controls/class-preset-customize-control.php b/src/php/admin/customizer/controls/class-preset-customize-control.php
@@ -80,7 +80,7 @@ class Preset_Customize_Control extends \WP_Customize_Control {
 	 *
 	 * @SuppressWarnings(PHPMD.ShortVariable)
 	 */
-	public function __construct( \WP_Customize_Manager $manager, string $id, array $args, ?\CrdmModern\Admin\Customizer\Preset_Registry $presets = null ) {
+	public function __construct( \WP_Customize_Manager $manager, string $id, array $args, $presets = null ) {
 		parent::__construct( $manager, $id, $args );
 		$this->presets = $presets;
 	}