Merge pull request #54 from Zizaco/psr2-fixes

PSR-2 Standards
thephpleague · Jul 6, 2014 · ff6fb6f · ff6fb6f
2 parents 7b9cf07 + d727538
commit ff6fb6f
Show file tree

Hide file tree

Showing 8 changed files with 64 additions and 60 deletions.
diff --git a/src/Zizaco/FactoryMuff/Facade/FactoryMuff.php b/src/Zizaco/FactoryMuff/Facade/FactoryMuff.php
@@ -47,9 +47,9 @@ private static function fmInstance()
      *
      * @return mixed Returns the model instance.
      */
-    public static function create( $model, $attr = array() )
+    public static function create($model, $attr = array())
     {
-        return static::fmInstance()->create( $model, $attr );
+        return static::fmInstance()->create($model, $attr);
     }
 
     /**
@@ -63,9 +63,9 @@ public static function create( $model, $attr = array() )
      *
      * @return mixed Returns the model instance.
      */
-    public static function instance( $model, $attr = array() )
+    public static function instance($model, $attr = array())
     {
-        return static::fmInstance()->instance( $model, $attr );
+        return static::fmInstance()->instance($model, $attr);
     }
 
     /**
@@ -80,8 +80,8 @@ public static function instance( $model, $attr = array() )
      *
      * @return array Returns an attributes array.
      */
-    public static function attributesFor( $model, $attr = array() )
+    public static function attributesFor($model, $attr = array())
     {
-        return static::fmInstance()->attributesFor( $model, $attr );
+        return static::fmInstance()->attributesFor($model, $attr);
     }
 }
diff --git a/src/Zizaco/FactoryMuff/FactoryMuff.php b/src/Zizaco/FactoryMuff/FactoryMuff.php
@@ -144,7 +144,7 @@ private function getFactoryAttrs($model)
      *
      * @return mixed String or an instance of related model.
      */
-    public function generateAttr($kind, $model = NULL)
+    public function generateAttr($kind, $model = null)
     {
         $kind = Kind::detect($kind, $model);
 

diff --git a/src/Zizaco/FactoryMuff/Kind/Closure.php b/src/Zizaco/FactoryMuff/Kind/Closure.php
@@ -6,10 +6,10 @@
 
 class Closure extends Kind
 {
-  public function generate()
-  {
-    $kind = $this->kind;
+    public function generate()
+    {
+        $kind = $this->kind;
 
-    return $kind();
-  }
+        return $kind();
+    }
 }
diff --git a/src/Zizaco/FactoryMuff/Kind/Factory.php b/src/Zizaco/FactoryMuff/Kind/Factory.php
@@ -6,40 +6,40 @@
 
 class Factory extends Kind
 {
-  private $methods = array(
-    'getKey',
-    'pk',
-  );
-
-  private $properties = array(
-    'id',
-    '_id'
-  );
-
-  public function generate()
-  {
-    $factory = new \Zizaco\FactoryMuff\FactoryMuff;
-    $model = $factory->create(substr($this->kind, 8));
-    return $this->getId($model);
-  }
-
-  private function getId($model)
-  {
-    // Check to see if we can get an ID via our defined methods
-    foreach ($this->methods as $method) {
-      if (method_exists($model, $method)) {
-        return $model->$method();
-      }
+    private $methods = array(
+        'getKey',
+        'pk',
+    );
+
+    private $properties = array(
+      'id',
+      '_id'
+    );
+
+    public function generate()
+    {
+        $factory = new \Zizaco\FactoryMuff\FactoryMuff;
+        $model = $factory->create(substr($this->kind, 8));
+        return $this->getId($model);
     }
 
-    // Check to see if we can get an ID via our defined methods
-    foreach ($this->properties as $property) {
-      if (isset($model->$property)) {
-        return $model->$property;
-      }
+    private function getId($model)
+    {
+        // Check to see if we can get an ID via our defined methods
+        foreach ($this->methods as $method) {
+            if (method_exists($model, $method)) {
+                return $model->$method();
+            }
+        }
+
+        // Check to see if we can get an ID via our defined methods
+        foreach ($this->properties as $property) {
+            if (isset($model->$property)) {
+                return $model->$property;
+            }
+        }
+
+        // We cannot find an ID
+        return null;
     }
-
-    // We cannot find an ID
-    return null;
-  }
 }
diff --git a/src/Zizaco/FactoryMuff/Kind/Name.php b/src/Zizaco/FactoryMuff/Kind/Name.php
@@ -6,10 +6,10 @@
 
 class Name extends Kind
 {
-  public function generate()
-  {
-    $gender = $this->getOption(0, null);
+    public function generate()
+    {
+        $gender = $this->getOption(0, null);
 
-    return $this->faker->name($gender);
-  }
+        return $this->faker->name($gender);
+    }
 }
diff --git a/src/Zizaco/FactoryMuff/Kind/Text.php b/src/Zizaco/FactoryMuff/Kind/Text.php
@@ -6,14 +6,14 @@
 
 class Text extends Kind
 {
-  public function generate()
-  {
-    $length = $this->getOption(0, 100);
+    public function generate()
+    {
+        $length = $this->getOption(0, 100);
 
-    // Generate a large amount of text. The reason for this is that
-    // faker uses a maximum length, and not an exact length. We then substr this
-    $text = $this->faker->text($length * 3);
+        // Generate a large amount of text. The reason for this is that
+        // faker uses a maximum length, and not an exact length. We then substr this
+        $text = $this->faker->text($length * 3);
 
-    return substr($text, 0, $length);
-  }
+        return substr($text, 0, $length);
+    }
 }
diff --git a/src/Zizaco/FactoryMuff/NoDefinedFactoryException.php b/src/Zizaco/FactoryMuff/NoDefinedFactoryException.php
@@ -1,4 +1,6 @@
-<?php namespace Zizaco\FactoryMuff;
+<?php
+
+namespace Zizaco\FactoryMuff;
 
 class NoDefinedFactoryException extends \Exception
 {

diff --git a/src/Zizaco/FactoryMuff/SaveException.php b/src/Zizaco/FactoryMuff/SaveException.php
@@ -1,4 +1,6 @@
-<?php namespace Zizaco\FactoryMuff;
+<?php
+
+namespace Zizaco\FactoryMuff;
 
 class SaveException extends \Exception
 {