horros / agavi2

src/core/Context.class.php

Unused Use Statements -1 removed lines

@@ -31,7 +31,6 @@
 use Agavi\Storage\Storage;
 use Agavi\Translation\TranslationManager;
 use Agavi\User\User;
-use Agavi\Util\Toolkit;
 
 /**
  * Context provides information about the current application context,

Spacing +3 added lines, -3 removed lines

@@ -384,14 +384,14 @@ 
         // We have a namespace, get the name
         if (strpos($modelName, '\\') !== false) {
             // Remove any submodel-references
-            $modelName = substr($modelName, strrpos($modelName, '\\')+1);
+            $modelName = substr($modelName, strrpos($modelName, '\\') + 1);
         }
         $file = null;
         $rc = null;
 
         // We have a namespace, get the name
         if (strpos($modelName, '\\') !== false) {
-            $modelName = substr($modelName, strrpos($modelName, '\\')+1);
+            $modelName = substr($modelName, strrpos($modelName, '\\') + 1);
         }
 
         $ns = Config::get('app.namespace');
@@ -469,7 +469,7 @@ 
         
         if (is_callable(array($model, 'initialize'))) {
             // pass the constructor params again. dual use for the win
-            $model->initialize($this, (array) $parameters);
+            $model->initialize($this, (array)$parameters);
         }
         
         return $model;

Braces +6 added lines, -4 removed lines

@@ -401,8 +401,9 @@ 
         if ($moduleName === null) {
 
             // If we have a base namespace defined, add it to the model name
-            if ($ns)
-                $class = $ns . '\\Models\\' . $origModelName . 'Model';
+            if ($ns) {
+                            $class = $ns . '\\Models\\' . $origModelName . 'Model';
+            }
 
             // global model
             // let's try to autoload that baby
@@ -421,8 +422,9 @@ 
                 // if the module is disabled.
             }
 
-            if ($ns)
-                $class = $ns . '\\Modules\\' . $moduleName . '\\Models\\' . $origModelName . 'Model';
+            if ($ns) {
+                            $class = $ns . '\\Modules\\' . $moduleName . '\\Models\\' . $origModelName . 'Model';
+            }
 
             // module model
             // let's try to autoload the baby