From 8c2925b76da6ff84653ae0f9f316ac8d210d5d3e Mon Sep 17 00:00:00 2001 From: Igor Santos Date: Sun, 1 Nov 2015 19:00:10 -0200 Subject: [PATCH] Updating to Laravel 5.1, updating package info and using PSR-4. closes #261 --- composer.json | 28 ++++++++++--------- src/{LaravelBook => }/Ardent/Ardent.php | 6 ++-- src/{LaravelBook => }/Ardent/Builder.php | 2 +- .../Ardent/Facades/Ardent.php | 4 +-- .../Ardent/InvalidModelException.php | 6 ++-- .../Providers/ArdentServiceProvider.php | 8 +++--- src/{LaravelBook => }/lang/en/validation.php | 0 .../lang/pt-br/validation.php | 0 8 files changed, 28 insertions(+), 26 deletions(-) rename src/{LaravelBook => }/Ardent/Ardent.php (99%) rename src/{LaravelBook => }/Ardent/Builder.php (96%) rename src/{LaravelBook => }/Ardent/Facades/Ardent.php (81%) rename src/{LaravelBook => }/Ardent/InvalidModelException.php (89%) rename src/{LaravelBook => }/Ardent/Providers/ArdentServiceProvider.php (81%) rename src/{LaravelBook => }/lang/en/validation.php (100%) rename src/{LaravelBook => }/lang/pt-br/validation.php (100%) diff --git a/composer.json b/composer.json index feffc6b..889d8f3 100644 --- a/composer.json +++ b/composer.json @@ -1,31 +1,33 @@ { - "name": "laravelbook/ardent", - "description": "Self-validating smart models for Laravel 4's Eloquent O/RM", + "name": "laravel-ardent/ardent", + "description": "Self-validating smart models for Laravel 5's Eloquent ORM", "keywords": ["validation", "laravel", "framework", "eloquent", "database", "sql", "orm", "activerecord", "active record"], "type": "library", - "homepage": "http://laravelbook.com/", "license": "BSD-3-Clause", "authors": [ { "name": "Igor Santos", - "homepage": "http://www.igorsantos.com.br", + "homepage": "http://igorsantos.com.br", "email": "igorsantos07@gmail.com", - "role": "Developer" + "role": "Maintainer" + }, + { + "name": "Max Ehsan", + "role": "Original developer" } ], "support": { - "issues": "https://github.com/laravelbook/ardent/issues", - "email": "contact@laravelbook.com" + "issues": "https://github.com/laravelbook/ardent/issues" }, "require": { - "php": ">=5.3.0", - "illuminate/support": "~4.1", - "illuminate/database": "~4.1", - "illuminate/validation": "~4.1" + "illuminate/support": "~5.1", + "illuminate/database": "~5.1", + "illuminate/validation": "~5.1", + "illuminate/events": "~5.1" }, "autoload": { - "psr-0": { - "LaravelBook\\Ardent": "src/" + "psr-4": { + "LaravelArdent\\Ardent": "src/" } }, "minimum-stability": "dev" diff --git a/src/LaravelBook/Ardent/Ardent.php b/src/Ardent/Ardent.php similarity index 99% rename from src/LaravelBook/Ardent/Ardent.php rename to src/Ardent/Ardent.php index f062029..6d35cdc 100755 --- a/src/LaravelBook/Ardent/Ardent.php +++ b/src/Ardent/Ardent.php @@ -1,9 +1,9 @@ - + * (c) Max Ehsan * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -222,7 +222,7 @@ abstract class Ardent extends Model { * Create a new Ardent model instance. * * @param array $attributes - * @return \LaravelBook\Ardent\Ardent + * @return \LaravelArdent\Ardent\Ardent */ public function __construct(array $attributes = array()) { parent::__construct($attributes); diff --git a/src/LaravelBook/Ardent/Builder.php b/src/Ardent/Builder.php similarity index 96% rename from src/LaravelBook/Ardent/Builder.php rename to src/Ardent/Builder.php index 241d15a..fe78f20 100644 --- a/src/LaravelBook/Ardent/Builder.php +++ b/src/Ardent/Builder.php @@ -1,5 +1,5 @@ + * (c) Max Ehsan * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/src/LaravelBook/Ardent/InvalidModelException.php b/src/Ardent/InvalidModelException.php similarity index 89% rename from src/LaravelBook/Ardent/InvalidModelException.php rename to src/Ardent/InvalidModelException.php index 649e67e..b2d7b10 100644 --- a/src/LaravelBook/Ardent/InvalidModelException.php +++ b/src/Ardent/InvalidModelException.php @@ -1,15 +1,15 @@ - + * (c) Max Ehsan * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ use Illuminate\Support\ServiceProvider; -use LaravelBook\Ardent\Ardent; +use LaravelArdent\Ardent\Ardent; class ArdentServiceProvider extends ServiceProvider { @@ -28,7 +28,7 @@ class ArdentServiceProvider extends ServiceProvider { */ public function boot() { - $this->package('laravelbook/ardent'); + $this->package('LaravelArdent/ardent'); } /** diff --git a/src/LaravelBook/lang/en/validation.php b/src/lang/en/validation.php similarity index 100% rename from src/LaravelBook/lang/en/validation.php rename to src/lang/en/validation.php diff --git a/src/LaravelBook/lang/pt-br/validation.php b/src/lang/pt-br/validation.php similarity index 100% rename from src/LaravelBook/lang/pt-br/validation.php rename to src/lang/pt-br/validation.php