Merge pull request #31 from esensi/0.6-soft-delete-fix

Fix Issue #30

.php_cs

@@ -14,7 +14,7 @@ return Config::create()
         'not_operator_with_space' => true,
         'ordered_imports' => true,
         'phpdoc_order' => true,
-        'phpdoc_var_to_type' => true,
+        'phpdoc_type_to_var' => true,
         'psr0' => false,
         'short_array_syntax' => true,
         'unalign_double_arrow' => false,

src/Contracts/SoftDeletingModelInterface.php

@@ -13,11 +13,6 @@
  */
 interface SoftDeletingModelInterface
 {
-    /**
-     * Boot the soft deleting trait for a model.
-     */
-    public static function bootSoftDeletingTrait();
-
     /**
      * Force a hard delete on a soft deleted model.
      */
@@ -37,20 +32,6 @@ public function restore();
      */
     public function trashed();
 
-    /**
-     * Get a new query builder that includes soft deletes.
-     *
-     * @return Illuminate\Database\Eloquent\Builder|static
-     */
-    public static function withTrashed();
-
-    /**
-     * Get a new query builder that only includes soft deletes.
-     *
-     * @return Illuminate\Database\Eloquent\Builder|static
-     */
-    public static function onlyTrashed();
-
     /**
      * Register a restoring model event with the dispatcher.
      *

src/Model.php

@@ -93,14 +93,14 @@ abstract class Model extends Eloquent implements
     /**
      * The attributes that should be mutated to dates.
      *
-     * @type array
+     * @var array
      */
     protected $dates = [];
 
     /**
      * The default rules that the model will validate against.
      *
-     * @type array
+     * @var array
      */
     protected $rules = [];
 
@@ -109,50 +109,50 @@ abstract class Model extends Eloquent implements
      *
      * @deprecated watson/validating 0.10.9
      *
-     * @type array
+     * @var array
      */
     protected $rulesets = [];
 
     /**
      * The attributes to encrypt when set and
      * decrypt when gotten.
      *
-     * @type array
+     * @var array
      */
     protected $encryptable = [];
 
     /**
      * The attributes to hash before saving.
      *
-     * @type array
+     * @var array
      */
     protected $hashable = [];
 
     /**
      * Attributes to cast to a different type.
      *
-     * @type array
+     * @var array
      */
     protected $jugglable = [];
 
     /**
      * The attributes to purge before saving.
      *
-     * @type array
+     * @var array
      */
     protected $purgeable = [];
 
     /**
      * Relationships that the model should set up.
      *
-     * @type array
+     * @var array
      */
     protected $relationships = [];
 
     /**
      * Extra attributes to be added to pivot relationships.
      *
-     * @type array
+     * @var array
      */
     protected $relationshipPivots = [];
 

src/Traits/EncryptingModelTrait.php

@@ -21,14 +21,14 @@ trait EncryptingModelTrait
     /**
      * Whether the model is encrypting or not.
      *
-     * @type bool
+     * @var bool
      */
     protected $encrypting = true;
 
     /**
      * The Encrypter to use for encryption.
      *
-     * @type Illuminate\Encryption\Encrypter
+     * @var Illuminate\Encryption\Encrypter
      */
     protected $encrypter;
 

src/Traits/HashingModelTrait.php

@@ -21,14 +21,14 @@ trait HashingModelTrait
     /**
      * Whether the model is hashing or not.
      *
-     * @type bool
+     * @var bool
      */
     protected $hashing = true;
 
     /**
      * The Hasher to use for hashing.
      *
-     * @type Illuminate\Contracts\Hashing\Hasher
+     * @var Illuminate\Contracts\Hashing\Hasher
      */
     protected $hasher;
 
@@ -162,7 +162,7 @@ public function isHashed($attribute)
             return false;
         }
 
-        $info = password_get_info($this->attributes[ $attribute ]);
+        $info = password_get_info($this->attributes[$attribute]);
 
         return (bool) ($info['algo'] !== 0);
     }
@@ -213,11 +213,11 @@ public function checkHash($value, $hash)
     public function setHashingAttribute($attribute, $value)
     {
         // Set the value which is presumably plain text
-        $this->attributes[ $attribute ] = $value;
+        $this->attributes[$attribute] = $value;
 
         // Do the hashing if it needs it
         if ( ! empty($value) && ($this->isDirty($attribute) || ! $this->isHashed($attribute))) {
-            $this->attributes[ $attribute ] = $this->hash($value);
+            $this->attributes[$attribute] = $this->hash($value);
         }
     }
 

src/Traits/JugglingModelTrait.php

@@ -21,7 +21,7 @@ trait JugglingModelTrait
     /**
      * Whether the model is type juggling attributes or not.
      *
-     * @type bool
+     * @var bool
      */
     protected $juggling = true;
 
@@ -53,7 +53,7 @@ public function __set($key, $value)
         parent::__set($key, $value);
 
         // Dynamically set the juggled value
-        $this->setDynamicJuggle($key, $this->attribute[ $key ]);
+        $this->setDynamicJuggle($key, $this->attribute[$key]);
     }
 
     /**
@@ -320,7 +320,7 @@ public function getJuggleType($attribute)
     {
         $jugglable = $this->getJugglable();
 
-        return $jugglable[ $attribute ];
+        return $jugglable[$attribute];
     }
 
     /**
@@ -331,8 +331,8 @@ public function juggleAttributes()
         // Iterate the juggable fields, and if the field is present
         // cast the attribute and replace within the attributes array.
         foreach ($this->getJugglable() as $attribute => $type) {
-            if (isset($this->attributes[ $attribute ])) {
-                $this->juggleAttribute($attribute, $this->attributes[ $attribute ]);
+            if (isset($this->attributes[$attribute])) {
+                $this->juggleAttribute($attribute, $this->attributes[$attribute]);
             }
         }
     }
@@ -347,7 +347,7 @@ public function juggleAttributes()
     public function juggleAttribute($attribute, $value)
     {
         $type = $this->getJuggleType($attribute);
-        $this->attributes[ $attribute ] = $this->juggle($value, $type);
+        $this->attributes[$attribute] = $this->juggle($value, $type);
     }
 
     /**

src/Traits/PurgingModelTrait.php

@@ -20,7 +20,7 @@ trait PurgingModelTrait
     /**
      * Whether the model is purging or not.
      *
-     * @type bool
+     * @var bool
      */
     protected $purging = true;
 

src/Traits/RelatingModelTrait.php

@@ -120,7 +120,7 @@ public function getRelationship($name)
             throw $exception;
         }
 
-        return $this->relationships[ $name ];
+        return $this->relationships[$name];
     }
 
     /**
@@ -132,7 +132,7 @@ public function getRelationship($name)
      */
     public function getPivotAttributes($name)
     {
-        return $this->relationshipPivots[ $name ] ?: [];
+        return $this->relationshipPivots[$name] ?: [];
     }
 
     /**

src/Traits/SoftDeletingModelTrait.php

@@ -28,7 +28,7 @@ trait SoftDeletingModelTrait
      * We want to boot our own observer so we stub out this
      * boot method. This renders this function void.
      */
-    public static function bootSoftDeletingTrait()
+    public static function bootSoftDeletes()
     {
     }
 

tests/EncryptingModelTraitTest.php

@@ -506,7 +506,7 @@ class ModelEncryptingStub extends Model
      * The attributes to encrypt when set and
      * decrypt when gotten.
      *
-     * @type array
+     * @var array
      */
     protected $encryptable = ['foo'];
 

tests/HashingModelTraitTest.php

@@ -516,7 +516,7 @@ class ModelHashingStub extends Model
     /**
      * The attributes to hash before saving.
      *
-     * @type array
+     * @var array
      */
     protected $hashable = ['foo'];
 

tests/JugglingModelTraitTest.php

@@ -569,14 +569,14 @@ class ModelJugglingStub extends Model
     /**
      * Indicates if the model exists.
      *
-     * @type bool
+     * @var bool
      */
     public $exists = false;
 
     /**
      * The attributes to type juggle.
      *
-     * @type array
+     * @var array
      */
     protected $jugglable = [
         'myString'    => 'string',
@@ -597,7 +597,7 @@ class ModelJugglingStub extends Model
      * in the tests to set the attributes in the object.
      * Make sure the keys align with $jugglabe property on this stub.
      *
-     * @type array
+     * @var array
      */
     public $tmpAttributes = [
         'myString'    => 'Hello world',

tests/PurgingModelTraitTest.php

@@ -401,7 +401,7 @@ class ModelPurgingStub extends Model
     /**
      * The attributes to purge before saving.
      *
-     * @type array
+     * @var array
      */
     protected $purgeable = ['foo'];
 }

tests/RelatingModelTraitTest.php

@@ -169,14 +169,14 @@ class ModelRelatingStub extends Model
     /**
      * Indicates if the model exists.
      *
-     * @type bool
+     * @var bool
      */
     public $exists = false;
 
     /**
      * Relationships that the model should set up.
      *
-     * @type array
+     * @var array
      */
     protected $relationships = [
 
@@ -199,7 +199,7 @@ class ModelRelatingStub extends Model
     /**
      * Extra attributes to be added to pivot relationships.
      *
-     * @type array
+     * @var array
      */
     protected $relationshipPivots = [
 
@@ -215,7 +215,7 @@ class FooModelStub extends Model
     /**
      * Relationships that the model should set up.
      *
-     * @type array
+     * @var array
      */
     protected $relationships = [
 

tests/SoftModelTest.php

@@ -95,7 +95,7 @@ class SoftModelStub extends SoftModel
     /**
      * The attributes that should be mutated to dates.
      *
-     * @type array
+     * @var array
      */
     protected $dates = ['foo'];
 }