From 0c0199aac5104dbf1b558c6fcea45e7fe5beb0de Mon Sep 17 00:00:00 2001 From: Florian Date: Tue, 31 Mar 2015 14:45:25 +1100 Subject: [PATCH 1/5] Update just the specific package --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 67c4b6ca..183c3e21 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ In the `require` key of `composer.json` file add the following Run the Composer update comand - $ composer update + $ composer update zizaco/entrust In your `config/app.php` add `'Zizaco\Entrust\EntrustServiceProvider'` to the end of the `$providers` array From 5bbfe9d1d089e2a71767371f8ec49248597ab610 Mon Sep 17 00:00:00 2001 From: Zizaco Date: Sun, 24 May 2015 23:37:43 -0300 Subject: [PATCH 2/5] Added php7 to travis.yml and remove --dev from composer install --- .travis.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 14cf1c41..f6b67931 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,11 +4,17 @@ php: - 5.4 - 5.5 - 5.6 + - 7.0 - hhvm +matrix: + fast_finish: true + allow_failures: + - php: 7.0 + before_script: - travis_retry composer self-update - - travis_retry composer install --no-interaction --prefer-source --dev + - travis_retry composer install --no-interaction --prefer-source script: - vendor/bin/phpunit --verbose From 55223d762bc281ee67144937173c50a234b26649 Mon Sep 17 00:00:00 2001 From: Zizaco Date: Sun, 24 May 2015 23:38:28 -0300 Subject: [PATCH 3/5] Added MIT license file --- LICENSE | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..72dc60d8 --- /dev/null +++ b/LICENSE @@ -0,0 +1,19 @@ +The MIT License (MIT) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. From 5dc29690cbf026d274c51526052b77aef8a39307 Mon Sep 17 00:00:00 2001 From: Zizaco Date: Sun, 24 May 2015 23:41:39 -0300 Subject: [PATCH 4/5] Updated dependencies and information in composer.json --- composer.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index c48903f3..7e8fe9b8 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "zizaco/entrust", - "description": "This package provides a flexible way to add Role-based Permissions to Laravel 4", - "keywords": ["laravel","illuminate","auth","roles","acl","permission"], + "description": "This package provides a flexible way to add Role-based Permissions to Laravel", + "keywords": ["laravel","illuminate","auth","roles","acl","permission","rbac"], "license": "MIT", "authors": [ { @@ -15,16 +15,16 @@ ], "require": { "php": ">=5.4.0", - "illuminate/support": "~4.2" + "illuminate/support": "~5.0" }, "require-dev": { - "phpunit/phpunit": "~4.0", + "phpunit/phpunit": "~4.6", "mockery/mockery": "~0.9", - "illuminate/database": "~4.0", + "illuminate/database": "~5.0", "symfony/process": "~2.3" }, "suggest": { - "zizaco/confide":"Confide is an authentication solution for Laravel 4 that couples very well with Entrust" + "zizaco/confide":"Confide is an authentication solution for Laravel that couples very well with Entrust" }, "autoload": { "classmap": [ From 3e95f2e295428f6baa407f221ff23519d085ee5b Mon Sep 17 00:00:00 2001 From: Zizaco Date: Mon, 25 May 2015 00:09:16 -0300 Subject: [PATCH 5/5] Removed specific OS files from .gitignore. If you feel that you need this files in .gitignore, try adding then to the global .gitignore of your system --- .gitignore | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 6619d571..f601efe9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,17 +1,4 @@ -### Docs ### -build/ -cache/ - -### PHP ### - -/bootstrap/compiled.php +/build +/cache /vendor -composer.phar -.DS_Store -Thumbs.db - -/conf -.idea -/.settings -.env.*.php -.env.php +composer.lock