Updating dependencies to laravel 6.0.

Updating tests for phpunit 8 & laravel compatibility
dineshsailor · Oct 1, 2019 · e3b63d6 · e3b63d6
1 parent e6a97cf
commit e3b63d6
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 18 deletions.
diff --git a/Tests/MenuItemTest.php b/Tests/MenuItemTest.php
@@ -2,6 +2,7 @@
 
 namespace Nwidart\Menus\Tests;
 
+use Illuminate\Support\Arr;
 use Nwidart\Menus\Menu;
 use Nwidart\Menus\MenuItem;
 
@@ -123,7 +124,7 @@ public function it_can_make_a_simple_route_menu_item()
         $children = $menuItem->getChilds()[0]->getChilds();
 
         $this->assertCount(1, $children);
-        $childMenuItem = array_first($children);
+        $childMenuItem = Arr::first($children);
         $this->assertEquals('settings.account', $childMenuItem->route[0]);
         $this->assertEquals(['user_id' => 1], $childMenuItem->route[1]);
     }
@@ -138,7 +139,7 @@ public function it_can_make_a_route_menu_item()
         $children = $menuItem->getChilds()[0]->getChilds();
 
         $this->assertCount(1, $children);
-        $childMenuItem = array_first($children);
+        $childMenuItem = Arr::first($children);
         $this->assertEquals('settings.account', $childMenuItem->route[0]);
         $this->assertEquals(['user_id' => 1], $childMenuItem->route[1]);
         $this->assertSame(1, $childMenuItem->order);
@@ -155,7 +156,7 @@ public function it_can_make_a_simple_url_menu_item()
         $children = $menuItem->getChilds()[0]->getChilds();
 
         $this->assertCount(1, $children);
-        $childMenuItem = array_first($children);
+        $childMenuItem = Arr::first($children);
         $this->assertEquals('settings/account', $childMenuItem->url);
         $this->assertEquals('Account', $childMenuItem->title);
     }
@@ -170,7 +171,7 @@ public function it_can_make_a_url_menu_item()
         $children = $menuItem->getChilds()[0]->getChilds();
 
         $this->assertCount(1, $children);
-        $childMenuItem = array_first($children);
+        $childMenuItem = Arr::first($children);
         $this->assertEquals('settings/account', $childMenuItem->url);
         $this->assertEquals('Account', $childMenuItem->title);
         $this->assertSame(1, $childMenuItem->order);
@@ -229,7 +230,7 @@ public function it_can_get_the_correct_url_for_route_type()
             $sub->route('settings.account', 'Account');
         });
         $children = $menuItem->getChilds()[0]->getChilds();
-        $childMenuItem = array_first($children);
+        $childMenuItem = Arr::first($children);
 
         $this->assertEquals('http://localhost/settings/account', $childMenuItem->getUrl());
     }

diff --git a/Tests/MenuTest.php b/Tests/MenuTest.php
@@ -96,7 +96,7 @@ public function it_gets_a_partial_for_dropdown_styles()
         $this->menu->create('test', function (MenuBuilder $menu) {
         });
 
-        $this->assertContains('.dropdown-submenu', $this->menu->style());
+        $this->assertStringContainsString('.dropdown-submenu', $this->menu->style());
     }
 
     /** @test */

diff --git a/composer.json b/composer.json
@@ -21,16 +21,16 @@
   ],
   "require": {
     "php": ">=7.1",
-    "illuminate/support": "5.8.*",
-    "illuminate/config": "5.8.*",
-    "illuminate/view": "5.8.*",
-    "laravelcollective/html": "5.8.*.*"
+    "illuminate/support": "^6.0",
+    "illuminate/config": "^6.0",
+    "illuminate/view": "^6.0",
+    "laravelcollective/html": "6.0.*"
   },
   "require-dev": {
-    "phpunit/phpunit": "^7.3",
-    "mockery/mockery": "^1.0",
-    "orchestra/testbench": "3.8.*",
-    "friendsofphp/php-cs-fixer": "^2.10"
+    "phpunit/phpunit": "^8.0",
+    "mockery/mockery": "~1.0",
+    "orchestra/testbench": "^4.0",
+    "friendsofphp/php-cs-fixer": "^2.15"
   },
   "autoload": {
     "psr-4": {
@@ -44,7 +44,7 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-master": "4.0-dev"
+      "dev-master": "5.0-dev"
     },
     "laravel": {
       "providers": [

diff --git a/src/MenuItem.php b/src/MenuItem.php
@@ -5,6 +5,7 @@
 use Closure;
 use Collective\Html\HtmlFacade as HTML;
 use Illuminate\Contracts\Support\Arrayable as ArrayableContract;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Request;
 
 /**
@@ -79,11 +80,11 @@ public function __construct($properties = array())
      */
     protected static function setIconAttribute(array $properties)
     {
-        $icon = array_get($properties, 'attributes.icon');
+        $icon = Arr::get($properties, 'attributes.icon');
         if (!is_null($icon)) {
             $properties['icon'] = $icon;
 
-            array_forget($properties, 'attributes.icon');
+            Arr::forget($properties, 'attributes.icon');
 
             return $properties;
         }
@@ -381,7 +382,7 @@ public function getAttributes()
     {
         $attributes = $this->attributes ? $this->attributes : [];
 
-        array_forget($attributes, ['active', 'icon']);
+        Arr::forget($attributes, ['active', 'icon']);
 
         return HTML::attributes($attributes);
     }