caffeina-core / core

classes/Module.php

Spacing +3 added lines, -3 removed lines

@@ -13,7 +13,7 @@ 
 trait Module {
     static protected $__PROTOTYPE = array();
 
-    final public function __call($name, $args){
+    final public function __call($name, $args) {
       if (isset(static::$__PROTOTYPE[$name]) && static::$__PROTOTYPE[$name] instanceof \Closure)
         return call_user_func_array(static::$__PROTOTYPE[$name]->bindTo($this, $this), $args);
       if (get_parent_class())
@@ -21,14 +21,14 @@ 
       else throw new \BadMethodCallException;
     }
 
-    final public static function __callStatic($name, $args){
+    final public static function __callStatic($name, $args) {
       if (isset(static::$__PROTOTYPE[$name]) && static::$__PROTOTYPE[$name] instanceof \Closure)
         return forward_static_call_array(static::$__PROTOTYPE[$name], $args);
       if (get_parent_class()) return parent::__callStatic($name, $args);
       else throw new \BadMethodCallException;
     }
 
-    public static function extend($methods = []){
+    public static function extend($methods = []) {
       if ($methods) foreach ($methods as $name => $method) {
         if ($method && $method instanceof \Closure)
           static::$__PROTOTYPE[$name] = $method;

Braces +24 added lines, -14 removed lines

@@ -13,26 +13,36 @@
 trait Module {
     static protected $__PROTOTYPE = array();
 
-    final public function __call($name, $args){
-      if (isset(static::$__PROTOTYPE[$name]) && static::$__PROTOTYPE[$name] instanceof \Closure)
-        return call_user_func_array(static::$__PROTOTYPE[$name]->bindTo($this, $this), $args);
-      if (get_parent_class())
-        return parent::__call($name, $args);
-      else throw new \BadMethodCallException;
+    final public function __call($name, $args) {
+      if (isset(static::$__PROTOTYPE[$name]) && static::$__PROTOTYPE[$name] instanceof \Closure) {
+              return call_user_func_array(static::$__PROTOTYPE[$name]->bindTo($this, $this), $args);
+      }
+      if (get_parent_class()) {
+              return parent::__call($name, $args);
+      } else {
+        throw new \BadMethodCallException;
+      }
     }
 
-    final public static function __callStatic($name, $args){
-      if (isset(static::$__PROTOTYPE[$name]) && static::$__PROTOTYPE[$name] instanceof \Closure)
-        return forward_static_call_array(static::$__PROTOTYPE[$name], $args);
-      if (get_parent_class()) return parent::__callStatic($name, $args);
-      else throw new \BadMethodCallException;
+    final public static function __callStatic($name, $args) {
+      if (isset(static::$__PROTOTYPE[$name]) && static::$__PROTOTYPE[$name] instanceof \Closure) {
+              return forward_static_call_array(static::$__PROTOTYPE[$name], $args);
+      }
+      if (get_parent_class()) {
+        return parent::__callStatic($name, $args);
+      } else {
+        throw new \BadMethodCallException;
+      }
     }
 
-    public static function extend($methods = []){
-      if ($methods) foreach ($methods as $name => $method) {
+    public static function extend($methods = []) {
+      if ($methods) {
+        foreach ($methods as $name => $method) {
         if ($method && $method instanceof \Closure)
           static::$__PROTOTYPE[$name] = $method;
-        else throw new \BadMethodCallException;
+      } else {
+          throw new \BadMethodCallException;
+        }
       }
     }
 

classes/Model.php

Indentation +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
     public static function create($data){
       $tmp = new static;
       foreach ((array)$data as $key => $value) {
-         $tmp->$key = $value;
+          $tmp->$key = $value;
       }
       $tmp->save();
       return $tmp;

Spacing +7 added lines, -7 removed lines

@@ -13,13 +13,13 @@ 
 abstract class Model {
     use Module, Persistence;
 
-    public static function where($where_sql = false){
+    public static function where($where_sql = false) {
       // Forward persistence calls to caller class, not Model
       $self  = get_called_class();
       $table = $self::persistenceOptions('table');
       $key   = $self::persistenceOptions('key');
 
-      $sql   = "select $key from $table" . ($where_sql ? " where $where_sql" : '');
+      $sql   = "select $key from $table".($where_sql ? " where $where_sql" : '');
 
       $results = [];
       SQL::each($sql, function($row) use ($self, &$results, $key){
@@ -28,20 +28,20 @@ 
       return $results;
     }
 
-    public static function all($page=1, $limit=-1){
-      $offset = max(1,$page)-1;
+    public static function all($page = 1, $limit = -1) {
+      $offset = max(1, $page) - 1;
       return static::where($limit < 1 ? "" : "1 limit $limit offset $offset");
     }
 
-    public function primaryKey(){
+    public function primaryKey() {
       $self = get_called_class();
       $key  = $self::persistenceOptions('key');
       return $this->$key;
     }
 
-    public static function create($data){
+    public static function create($data) {
       $tmp = new static;
-      foreach ((array)$data as $key => $value) {
+      foreach ((array) $data as $key => $value) {
          $tmp->$key = $value;
       }
       $tmp->save();

Braces +5 added lines, -5 removed lines

@@ -13,7 +13,7 @@ 
 abstract class Model {
     use Module, Persistence;
 
-    public static function where($where_sql = false){
+    public static function where($where_sql = false) {
       // Forward persistence calls to caller class, not Model
       $self  = get_called_class();
       $table = $self::persistenceOptions('table');
@@ -22,24 +22,24 @@ 
       $sql   = "select $key from $table" . ($where_sql ? " where $where_sql" : '');
 
       $results = [];
-      SQL::each($sql, function($row) use ($self, &$results, $key){
+      SQL::each($sql, function($row) use ($self, &$results, $key) {
           $results[] = $self::load($row->$key);
       });
       return $results;
     }
 
-    public static function all($page=1, $limit=-1){
+    public static function all($page=1, $limit=-1) {
       $offset = max(1,$page)-1;
       return static::where($limit < 1 ? "" : "1 limit $limit offset $offset");
     }
 
-    public function primaryKey(){
+    public function primaryKey() {
       $self = get_called_class();
       $key  = $self::persistenceOptions('key');
       return $this->$key;
     }
 
-    public static function create($data){
+    public static function create($data) {
       $tmp = new static;
       foreach ((array)$data as $key => $value) {
          $tmp->$key = $value;