Skip to content
This repository has been archived by the owner on Jul 10, 2019. It is now read-only.

Commit

Permalink
Merge pull request #4 from GrahamCampbell/master
Browse files Browse the repository at this point in the history
Tweaks And Improvements merged in, cheers.
  • Loading branch information
Ollie Read committed Jan 1, 2014
2 parents 49de798 + 56a9fab commit f033b02
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 13 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
language: php

php:
php:
- 5.3
- 5.4
- 5.5

before_script:
- curl -s http://getcomposer.org/installer | php
- php composer.phar install --dev
- composer self-update
- composer install --no-interaction --prefer-source --dev

script: phpunit
script: phpunit
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,4 +96,4 @@ There we go, done! Enjoy yourselves.

## Known Bugs ##

Reminders don't currently work.
Reminders don't currently work.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
}
},
"minimum-stability": "dev"
}
}
2 changes: 1 addition & 1 deletion phpunit.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
<directory suffix=".php">./tests/</directory>
</testsuite>
</testsuites>
</phpunit>
</phpunit>
11 changes: 8 additions & 3 deletions src/Ollieread/Multiauth/AuthManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,13 @@ protected function createEloquentProvider() {
return new EloquentUserProvider($this->app['hash'], $model);
}

protected function getDefaultDriver() {
public function getDefaultDriver() {
return $this->config['driver'];
}

}

public function setDefaultDriver($name)
{
$this->config['driver'] = $name;
}

}
2 changes: 1 addition & 1 deletion src/Ollieread/Multiauth/Guard.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ public function getRecallerName() {
return 'remember_' . $this->name . '_' . md5(get_class($this));
}

}
}
2 changes: 1 addition & 1 deletion src/Ollieread/Multiauth/MultiManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ public function __call($name, $arguments) {
}
}

}
}
2 changes: 1 addition & 1 deletion src/Ollieread/Multiauth/MultiauthServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ public function register() {
});
}

}
}

0 comments on commit f033b02

Please sign in to comment.