forked from bakome/entrust
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Improved EntrustTest.php. Committed git's auto-normalization of line endings to LF resulting from addition of .gitattributes in Zizaco#165. Also, added 3 fixes matching those in pending PR Zizaco#166: 1. Entrust.php: $_app array access to $app prop access 2. git mv src/Zizaco/Entrust to src/Entrust 3. composer.json autoload to psr-4
- Loading branch information
Showing
10 changed files
with
836 additions
and
240 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,14 @@ | ||
| language: php | ||
|
|
||
| php: | ||
| - 5.4 | ||
| - 5.5 | ||
| - 5.6 | ||
| - hhvm | ||
|
|
||
| before_script: | ||
| - travis_retry composer self-update | ||
| - travis_retry composer install --no-interaction --prefer-source --dev | ||
|
|
||
| script: | ||
| - vendor/bin/phpunit --verbose | ||
| language: php | ||
|
|
||
| php: | ||
| - 5.4 | ||
| - 5.5 | ||
| - 5.6 | ||
| - hhvm | ||
|
|
||
| before_script: | ||
| - travis_retry composer self-update | ||
| - travis_retry composer install --no-interaction --prefer-source --dev | ||
|
|
||
| script: | ||
| - vendor/bin/phpunit --verbose |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,62 +1,62 @@ | ||
| { | ||
| "name": "zizaco/entrust", | ||
| "description": "This package provides a flexible way to add Role-based Permissions to Laravel 4", | ||
| "keywords": ["laravel","illuminate","auth","roles"], | ||
| "license": "MIT", | ||
| "authors": [ | ||
| { | ||
| "name": "Zizaco Zizuini", | ||
| "email": "[email protected]" | ||
| }, | ||
| { | ||
| "name": "Andrew Elkins", | ||
| "homepage": "http://www.andrewelkins.com" | ||
| } | ||
| ], | ||
| "require": { | ||
| "php": ">=5.4.0", | ||
| "illuminate/support": "~4.0", | ||
| "laravelbook/ardent": "~2.4" | ||
| }, | ||
| "require-dev": { | ||
| "phpunit/phpunit": "~4.0", | ||
| "mockery/mockery": "~0.8", | ||
| "illuminate/database": "~4.0", | ||
| "league/factory-muffin": "~1.5" | ||
| }, | ||
| "repositories": [ | ||
| { | ||
| "type": "package", | ||
| "package": { | ||
| "name": "laravelbook/ardent", | ||
| "version": "2.4.2", | ||
| "source": { | ||
| "type": "git", | ||
| "url": "https://github.com/bexarcreativeinc/ardent.git", | ||
| "reference": "master" | ||
| }, | ||
| "autoload": { | ||
| "psr-0": { | ||
| "LaravelBook\\Ardent": "src/" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| ], | ||
| "suggest": { | ||
| "zizaco/confide":"Confide is an authentication solution for Laravel 4 that couples very well with Entrust" | ||
| }, | ||
| "autoload": { | ||
| "classmap": [ | ||
| "src/commands" | ||
| ], | ||
| "psr-0": { | ||
| "Zizaco\\Entrust": "src/" | ||
| } | ||
| }, | ||
| "extra": { | ||
| "branch-alias": { | ||
| "dev-master": "1.2-dev" | ||
| } | ||
| } | ||
| } | ||
| { | ||
| "name": "zizaco/entrust", | ||
| "description": "This package provides a flexible way to add Role-based Permissions to Laravel 4", | ||
| "keywords": ["laravel","illuminate","auth","roles"], | ||
| "license": "MIT", | ||
| "authors": [ | ||
| { | ||
| "name": "Zizaco Zizuini", | ||
| "email": "[email protected]" | ||
| }, | ||
| { | ||
| "name": "Andrew Elkins", | ||
| "homepage": "http://www.andrewelkins.com" | ||
| } | ||
| ], | ||
| "require": { | ||
| "php": ">=5.4.0", | ||
| "illuminate/support": "~4.0", | ||
| "laravelbook/ardent": "~2.4" | ||
| }, | ||
| "require-dev": { | ||
| "phpunit/phpunit": "~4.0", | ||
| "mockery/mockery": "~0.8", | ||
| "illuminate/database": "~4.0", | ||
| "league/factory-muffin": "~1.5" | ||
| }, | ||
| "repositories": [ | ||
| { | ||
| "type": "package", | ||
| "package": { | ||
| "name": "laravelbook/ardent", | ||
| "version": "2.4.2", | ||
| "source": { | ||
| "type": "git", | ||
| "url": "https://github.com/bexarcreativeinc/ardent.git", | ||
| "reference": "master" | ||
| }, | ||
| "autoload": { | ||
| "psr-0": { | ||
| "LaravelBook\\Ardent": "src/" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| ], | ||
| "suggest": { | ||
| "zizaco/confide":"Confide is an authentication solution for Laravel 4 that couples very well with Entrust" | ||
| }, | ||
| "autoload": { | ||
| "classmap": [ | ||
| "src/commands" | ||
| ], | ||
| "psr-4": { | ||
| "Zizaco\\Entrust\\": "src/Entrust/" | ||
| } | ||
| }, | ||
| "extra": { | ||
| "branch-alias": { | ||
| "dev-master": "1.2-dev" | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,18 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <phpunit backupGlobals="false" | ||
| backupStaticAttributes="false" | ||
| bootstrap="vendor/autoload.php" | ||
| colors="true" | ||
| convertErrorsToExceptions="true" | ||
| convertNoticesToExceptions="true" | ||
| convertWarningsToExceptions="true" | ||
| processIsolation="false" | ||
| stopOnFailure="false" | ||
| syntaxCheck="false" | ||
| > | ||
| <testsuites> | ||
| <testsuite name="Package Test Suite"> | ||
| <directory suffix=".php">./tests/</directory> | ||
| </testsuite> | ||
| </testsuites> | ||
| </phpunit> | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <phpunit backupGlobals="false" | ||
| backupStaticAttributes="false" | ||
| bootstrap="vendor/autoload.php" | ||
| colors="true" | ||
| convertErrorsToExceptions="true" | ||
| convertNoticesToExceptions="true" | ||
| convertWarningsToExceptions="true" | ||
| processIsolation="false" | ||
| stopOnFailure="false" | ||
| syntaxCheck="false" | ||
| > | ||
| <testsuites> | ||
| <testsuite name="Package Test Suite"> | ||
| <directory suffix=".php">./tests/</directory> | ||
| </testsuite> | ||
| </testsuites> | ||
| </phpunit> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
130 changes: 65 additions & 65 deletions
130
...Zizaco/Entrust/EntrustServiceProvider.php → src/Entrust/EntrustServiceProvider.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,65 +1,65 @@ | ||
| <?php namespace Zizaco\Entrust; | ||
|
|
||
| use Illuminate\Support\ServiceProvider; | ||
|
|
||
| class EntrustServiceProvider extends ServiceProvider { | ||
|
|
||
| /** | ||
| * Indicates if loading of the provider is deferred. | ||
| * | ||
| * @var bool | ||
| */ | ||
| protected $defer = false; | ||
|
|
||
| /** | ||
| * Bootstrap the application events. | ||
| * | ||
| * @return void | ||
| */ | ||
| public function boot() | ||
| { | ||
| $this->package('zizaco/entrust'); | ||
| } | ||
|
|
||
| /** | ||
| * Register the service provider. | ||
| * | ||
| * @return void | ||
| */ | ||
| public function register() | ||
| { | ||
| $this->registerEntrust(); | ||
|
|
||
| $this->registerCommands(); | ||
| } | ||
|
|
||
| /** | ||
| * Register the application bindings. | ||
| * | ||
| * @return void | ||
| */ | ||
| private function registerEntrust() | ||
| { | ||
| $this->app->bind('entrust', function($app) | ||
| { | ||
| return new Entrust($app); | ||
| }); | ||
| } | ||
|
|
||
| /** | ||
| * Register the artisan commands. | ||
| * | ||
| * @return void | ||
| */ | ||
| private function registerCommands() | ||
| { | ||
| $this->app['command.entrust.migration'] = $this->app->share(function($app) | ||
| { | ||
| return new MigrationCommand($app); | ||
| }); | ||
|
|
||
| $this->commands( | ||
| 'command.entrust.migration' | ||
| ); | ||
| } | ||
| } | ||
| <?php namespace Zizaco\Entrust; | ||
|
|
||
| use Illuminate\Support\ServiceProvider; | ||
|
|
||
| class EntrustServiceProvider extends ServiceProvider { | ||
|
|
||
| /** | ||
| * Indicates if loading of the provider is deferred. | ||
| * | ||
| * @var bool | ||
| */ | ||
| protected $defer = false; | ||
|
|
||
| /** | ||
| * Bootstrap the application events. | ||
| * | ||
| * @return void | ||
| */ | ||
| public function boot() | ||
| { | ||
| $this->package('zizaco/entrust'); | ||
| } | ||
|
|
||
| /** | ||
| * Register the service provider. | ||
| * | ||
| * @return void | ||
| */ | ||
| public function register() | ||
| { | ||
| $this->registerEntrust(); | ||
|
|
||
| $this->registerCommands(); | ||
| } | ||
|
|
||
| /** | ||
| * Register the application bindings. | ||
| * | ||
| * @return void | ||
| */ | ||
| private function registerEntrust() | ||
| { | ||
| $this->app->bind('entrust', function($app) | ||
| { | ||
| return new Entrust($app); | ||
| }); | ||
| } | ||
|
|
||
| /** | ||
| * Register the artisan commands. | ||
| * | ||
| * @return void | ||
| */ | ||
| private function registerCommands() | ||
| { | ||
| $this->app['command.entrust.migration'] = $this->app->share(function($app) | ||
| { | ||
| return new MigrationCommand($app); | ||
| }); | ||
|
|
||
| $this->commands( | ||
| 'command.entrust.migration' | ||
| ); | ||
| } | ||
| } |
File renamed without changes.
Oops, something went wrong.