Clean things up and update to Laravel 5.3

README.md

@@ -1,7 +1,6 @@
 Caffeinated Shinobi
 ===================
-[![Laravel 5.1](https://img.shields.io/badge/Laravel-5.1-orange.svg?style=flat-square)](http://laravel.com)
-[![Laravel 5.2](https://img.shields.io/badge/Laravel-5.2-orange.svg?style=flat-square)](http://laravel.com)
+[![Laravel 5.3](https://img.shields.io/badge/Laravel-5.3-orange.svg?style=flat-square)](http://laravel.com)
 [![Source](http://img.shields.io/badge/source-caffeinated/shinobi-blue.svg?style=flat-square)](https://github.com/caffeinated/shinobi)
 [![Build Status](http://img.shields.io/travis/caffeinated/shinobi/master.svg?style=flat-square)](https://travis-ci.org/caffeinated/shinobi)
 [![License](http://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](https://tldrlegal.com/license/mit-license)

composer.json

@@ -10,14 +10,11 @@
         }
     ],
     "require": {
-        "php": ">=5.5.9",
-        "illuminate/database": "5.1.*|5.2.*",
-        "illuminate/support": "5.1.*|5.2.*",
-        "illuminate/filesystem": "5.1.*|5.2.*",
-        "illuminate/config": "5.1.*|5.2.*"
-    },
-    "require-dev": {
-        "mockery/mockery": "~0.9"
+        "php": ">=5.6.4",
+        "illuminate/database": "5.3.*",
+        "illuminate/support": "5.3.*",
+        "illuminate/filesystem": "5.3.*",
+        "illuminate/config": "5.3.*"
     },
     "autoload": {
         "psr-4": {
@@ -26,7 +23,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.0-dev"
+            "dev-master": "3.0-dev"
         }
     },
     "minimum-stability": "dev"

src/ShinobiServiceProvider.php

@@ -39,8 +39,6 @@ public function register()
 
 			return new \Caffeinated\Shinobi\Shinobi($auth);
 		});
-
-		$this->configureTwig();
 	}
 
 	/**
@@ -84,23 +82,4 @@ public function provides()
 	{
 		return ['shinobi'];
 	}
-
-	/**
-	 * Configure Twig
-	 *
-	 * Registers the necessary Caffeinated Shinobi tags with Twig;
-	 * only if Twig is set as the template engine.
-	 *
-	 * @return null
-	 */
-	protected function configureTwig()
-	{
-		$engine = $this->app['config']->get('themes.engine');
-
-		if ($engine == 'twig') {
-			$this->app['config']->push('sapling.tags', 'Caffeinated\Shinobi\Twig\TokenParser\Twig_TokenParser_Can');
-			$this->app['config']->push('sapling.tags', 'Caffeinated\Shinobi\Twig\TokenParser\Twig_TokenParser_CanAtLeast');
-			$this->app['config']->push('sapling.tags', 'Caffeinated\Shinobi\Twig\TokenParser\Twig_TokenParser_Role');
-		}
-	}
 }