Update for release

sjdaws · Feb 16, 2015 · 108902d · 108902d
1 parent 06413d2
commit 108902d
Show file tree

Hide file tree

Showing 9 changed files with 47 additions and 633 deletions.
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "sjdaws/vocal",
     "description": "Recursive functionality for Eloquent in Laravel 4 and 5",
-    "version": "2.0.0-dev",
+    "version": "2.0.0",
     "type": "library",
     "license": "MIT",
     "keywords": ["laravel", "laravel4", "laravel5", "eloquent", "recursive", "hydration", "validation"],

diff --git a/examples/with-angular/controllers/UserController.php b/examples/with-angular/controllers/UserController.php
@@ -38,7 +38,7 @@ public function save()
         $result = $user->saveRecursive();
 
         // Capture errors to return via JSON model if we have some
-        if ( ! $result) $user->errors = $user->errors();
+        if ( ! $result) $user->errors = $user->getErrors();
 
         return $user;
     }

diff --git a/examples/with-angular/models/User.php b/examples/with-angular/models/User.php
@@ -21,18 +21,6 @@ class User extends Vocal
         'email'    => array('required', 'unique', 'email')
     );
 
-    /**
-     * Enable soft deletions for this model
-     *
-     * @var bool
-     */
-    protected $softDelete = true;
-
-
-    /*********************************************************************************************
-     * Relationships
-     ********************************************************************************************/
-
     /**
      * Join addresses
      *

diff --git a/examples/with-angular/models/UserAddress.php b/examples/with-angular/models/UserAddress.php
@@ -21,18 +21,6 @@ class UserAddress extends Vocal
         'city'    => array('required')
     );
 
-    /**
-     * Enable soft deletions for this model
-     *
-     * @var bool
-     */
-    protected $softDelete = true;
-
-
-    /*********************************************************************************************
-     * Relationships
-     ********************************************************************************************/
-
     /**
      * Join parent record (not really needed)
      *

diff --git a/examples/without-angular/controllers/UserController.php b/examples/without-angular/controllers/UserController.php
@@ -22,7 +22,7 @@ public function save()
         $user = (Input::get('id')) ? User::find(Input::get('id')) : new User;
         $result = $user->saveRecursive();
 
-        if ( ! $result) return Redirect::back()->withInput()->with('errors', $user->errors());
+        if ( ! $result) return Redirect::back()->withInput()->with('errors', $user->getErrors());
 
         return View::make('addressbook')->with('user', $user)->with('success', true);
     }

diff --git a/examples/without-angular/models/User.php b/examples/without-angular/models/User.php
@@ -21,18 +21,6 @@ class User extends Vocal
         'email'    => array('required', 'unique', 'email')
     );
 
-    /**
-     * Enable soft deletions for this model
-     *
-     * @var bool
-     */
-    protected $softDelete = true;
-
-
-    /*********************************************************************************************
-     * Relationships
-     ********************************************************************************************/
-
     /**
      * Join addresses
      *

diff --git a/examples/without-angular/models/UserAddress.php b/examples/without-angular/models/UserAddress.php
@@ -21,18 +21,6 @@ class UserAddress extends Vocal
         'city'    => array('required')
     );
 
-    /**
-     * Enable soft deletions for this model
-     *
-     * @var bool
-     */
-    protected $softDelete = true;
-
-
-    /*********************************************************************************************
-     * Relationships
-     ********************************************************************************************/
-
     /**
      * Join parent record (not really needed)
      *