Cleanup

Author: GrahamCampbell

composer.json

@@ -16,7 +16,9 @@
         "illuminate/support": "5.0.*|5.1.*"
     },
     "require-dev": {
-        "graham-campbell/testbench": "~2.1"
+        "graham-campbell/testbench": "~3.0",
+        "mockery/mockery": "^0.9.4",
+        "phpunit/phpunit": "^4.7.6"
     },
     "autoload": {
         "psr-4": {

src/NavigationServiceProvider.php

@@ -60,7 +60,7 @@ protected function registerNavigation()
             return $navigation;
         });
 
-        $this->app->alias('navigation', 'GrahamCampbell\Navigation\Navigation');
+        $this->app->alias('navigation', Navigation::class);
     }
 
     /**

tests/AbstractTestCase.php

@@ -12,6 +12,7 @@
 namespace GrahamCampbell\Tests\Navigation;
 
 use GrahamCampbell\TestBench\AbstractPackageTestCase;
+use GrahamCampbell\Navigation\NavigationServiceProvider;
 
 /**
  * This is the abstract test case class.
@@ -29,6 +30,6 @@ abstract class AbstractTestCase extends AbstractPackageTestCase
      */
     protected function getServiceProviderClass($app)
     {
-        return 'GrahamCampbell\Navigation\NavigationServiceProvider';
+        return NavigationServiceProvider::class;
     }
 }

tests/Facades/NavigationTest.php

@@ -11,8 +11,10 @@
 
 namespace GrahamCampbell\Tests\Navigation\Facades;
 
-use GrahamCampbell\TestBench\Traits\FacadeTestCaseTrait;
+use GrahamCampbell\TestBenchCore\FacadeTrait;
 use GrahamCampbell\Tests\Navigation\AbstractTestCase;
+use GrahamCampbell\Navigation\Facades\Navigation as NavigationFacade;
+use GrahamCampbell\Navigation\Navigation;
 
 /**
  * This is the navigation facade test class.
@@ -21,7 +23,7 @@
  */
 class NavigationTest extends AbstractTestCase
 {
-    use FacadeTestCaseTrait;
+    use FacadeTrait;
 
     /**
      * Get the facade accessor.
@@ -40,7 +42,7 @@ protected function getFacadeAccessor()
      */
     protected function getFacadeClass()
     {
-        return 'GrahamCampbell\Navigation\Facades\Navigation';
+        return NavigationFacade::class;
     }
 
     /**
@@ -50,6 +52,6 @@ protected function getFacadeClass()
      */
     protected function getFacadeRoot()
     {
-        return 'GrahamCampbell\Navigation\Navigation';
+        return Navigation::class;
     }
 }

tests/ServiceProviderTest.php

@@ -11,7 +11,8 @@
 
 namespace GrahamCampbell\Tests\Navigation;
 
-use GrahamCampbell\TestBench\Traits\ServiceProviderTestCaseTrait;
+use GrahamCampbell\TestBenchCore\ServiceProviderTrait;
+use GrahamCampbell\Navigation\Navigation;
 
 /**
  * This is the service provider test class.
@@ -20,10 +21,10 @@
  */
 class ServiceProviderTest extends AbstractTestCase
 {
-    use ServiceProviderTestCaseTrait;
+    use ServiceProviderTrait;
 
     public function testNavigationIsInjectable()
     {
-        $this->assertIsInjectable('GrahamCampbell\Navigation\Navigation');
+        $this->assertIsInjectable(Navigation::class);
     }
 }