Merge branch 'master' into feature/v5.0

Author: firestar300

grumphp.yml

@@ -15,12 +15,6 @@ grumphp:
     phpcs:
       standard: ['phpcs.xml']
       triggered_by: [php]
-    securitychecker:
-      lockfile: ./composer.lock
-      format: ~
-      end_point: ~
-      timeout: ~
-      run_always: false
     composer:
       no_check_all: true
       no_check_publish: true

inc/Helpers/Accessible_Menu_Walker.php

@@ -2,14 +2,16 @@
 
 namespace BEA\Theme\Framework\Helpers;
 
+use Walker_Nav_Menu;
+
 class Accessible_Menu_Walker extends Walker_Nav_Menu {
 
 	/**
 	 * @param       $output
 	 * @param int   $depth
 	 * @param array $args
 	 */
-	public function start_lvl( &$output, $depth = 0, $args = [] ) {
+	public function start_lvl( &$output, $depth = 0, $args = null ): void {
 		$indent  = str_repeat( "\t", $depth );
 		$output .= "\n$indent<div class='amenu__panel'><ul class='sub-menu amenu__sub-menu'>\n";
 	}
@@ -19,7 +21,7 @@ public function start_lvl( &$output, $depth = 0, $args = [] ) {
 	 * @param int   $depth
 	 * @param array $args
 	 */
-	public function end_lvl( &$output, $depth = 0, $args = [] ) {
+	public function end_lvl( &$output, $depth = 0, $args = null ): void {
 		$indent  = str_repeat( "\t", $depth );
 		$output .= "$indent</ul></div>\n";
 	}

inc/Services/Assets.php

@@ -5,6 +5,8 @@
 use BEA\Theme\Framework\Service;
 use BEA\Theme\Framework\Service_Container;
 use BEA\Theme\Framework\Tools\Assets as Assets_Tools;
+use function json_last_error;
+use const JSON_ERROR_NONE;
 
 /**
  * Class Assets
@@ -113,22 +115,22 @@ public function stylesheet_uri( string $stylesheet_uri ): string {
 	 *
 	 * @param string $type
 	 *
-	 * @return bool|null
+	 * @return string
 	 */
-	public function get_min_file( string $type ): ?bool {
+	public function get_min_file( string $type ): string {
 		if ( empty( $type ) ) {
-			return false;
+			return '';
 		}
 
 		if ( ! file_exists( \get_theme_file_path( '/dist/assets.json' ) ) ) {
-			return false;
+			return '';
 		}
 
 		$json   = file_get_contents( \get_theme_file_path( '/dist/assets.json' ) ); //phpcs:ignore WordPress.WP.AlternativeFunctions.file_get_contents_file_get_contents
 		$assets = json_decode( $json, true );
 
-		if ( empty( $assets ) ) {
-			return false;
+		if ( empty( $assets ) || JSON_ERROR_NONE !== json_last_error() ) {
+			return '';
 		}
 
 		switch ( $type ) {
@@ -155,7 +157,7 @@ public function get_min_file( string $type ): ?bool {
 		}
 
 		if ( empty( $file ) ) {
-			return false;
+			return '';
 		}
 
 		return $file;