resolves conflicts

Author: alexstandiford

bootstrap.php

@@ -0,0 +1,14 @@
+<?php
+
+use Underpin\Abstracts\Underpin;
+use Underpin\Factories\Observers\Loader;
+
+if ( ! defined( 'ABSPATH' ) ) {
+exit;
+}
+
+// Add this loader.
+Underpin::attach( 'setup', new Loader('admin_bar_menus', [
+'instance' => 'Underpin\Admin_Bar_Menu\Abstracts\Admin_Bar_Menu',
+'default' => 'Underpin\Admin_Bar_Menu\Factories\Admin_Bar_Menu_Instance',
+] ) );

composer.json

@@ -10,11 +10,12 @@
  }
  ],
  "require": {
- "underpin/logger-loader": "^2.0"
+ "underpin/underpin": "^2.0"
  },
  "autoload": {
+ "psr-4": {"Underpin\\Admin_Bar_Menu\\": "lib/"},
  "files": [
- "underpin-admin-bar-menus.php"
+ "bootstrap.php"
  ]
  }
 }

Admin_Bar_Menu.php renamed to lib/Abstracts/Admin_Bar_Menu.php

@@ -7,13 +7,13 @@
  */
 
 
-namespace Underpin_Admin_Bar_Menu\Abstracts;
+namespace Underpin\Admin_Bar_Menu\Abstracts;
 
 
+use Underpin\Loaders\Logger;
 use Underpin\Traits\Feature_Extension;
 use WP_Admin_Bar;
 use WP_User;
-use function Underpin\underpin;
 
 if ( ! defined( 'ABSPATH' ) ) {
 exit;
@@ -128,7 +128,7 @@ public function add_admin_bar( WP_Admin_Bar $admin_bar ) {
 $args = $this->args;
 $args['id'] = $this->id;
 
-underpin()->logger()->log(
+Logger::log(
 'notice',
 'child_menu_added',
 'An admin bar menu item, ' . $this->id . ' was added'
@@ -142,14 +142,14 @@ public function add_admin_bar( WP_Admin_Bar $admin_bar ) {
 
 $admin_bar->add_menu( $child );
 
-underpin()->logger()->log(
+Logger::log(
 'notice',
 'child_menu_added',
 'A child menu item, ' . $id . ' was added to the ' . $this->name . ' admin bar menu.'
 );
 }
 } else {
-underpin()->logger()->log(
+Logger::log(
 'warning',
 'user_cannot_view_menu',
 'The specified user cannot view the ' . $this->name . ' menu. It will not be displayed.',

Admin_Bar_Menu_Instance.php renamed to lib/Factories/Admin_Bar_Menu_Instance.php

@@ -7,14 +7,11 @@
  */
 
 
-namespace Underpin_Admin_Bar_Menu\Factories;
+namespace Underpin\Admin_Bar_Menu\Factories;
 
 
 use Underpin\Traits\Instance_Setter;
-use Underpin_Admin_Bar_Menu\Abstracts\Admin_Bar_Menu;
-use WP_Admin_Bar;
-use WP_User;
-use function Underpin\underpin;
+use Underpin\Admin_Bar_Menu\Abstracts\Admin_Bar_Menu;
 
 if ( ! defined( 'ABSPATH' ) ) {
 exit;