Merge pull request #2 from dsdevbe/dev

Added support for 4.2.x
SaschaDens · Oct 28, 2014 · 4d50fcc · 4d50fcc
2 parents f50f3b9 + 8d31971
commit 4d50fcc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # Ldap-connector
-Provides an solution for authentication users with LDAP for Laravel 4.1
+Provides an solution for authentication users with LDAP for Laravel 4.2.x
 
 ## Installation
 1. Install this package through Composer:
@@ -34,9 +34,9 @@ Provides an solution for authentication users with LDAP for Laravel 4.1
 
 ## Usage
 The LDAP plugin is an extension of the AUTH class and will act the same as normal usage with Eloquent driver.
-
+    
     ```php
-    if (Auth::attempt(array('email' => $email, 'password' => $password)))
+    if (Auth::attempt(array('username' => $email, 'password' => $password)))
     {
         return Redirect::intended('dashboard');
     }

diff --git a/composer.json b/composer.json
@@ -12,11 +12,8 @@
     ],
     "require": {
         "php": ">=5.3.0",
-        "illuminate/support": "4.1.*",
-        "adldap/adldap": "v4.0-stable"
-    },
-    "require-dev": {
-        "mockery/mockery": "dev-master"
+        "illuminate/support": "4.2.*",
+        "adldap/adldap": "4.0-stable"
     },
     "autoload": {
         "psr-0": {

diff --git a/tests/AuthLdapUserProviderTest.php b/tests/AuthLdapUserProviderTest.php