Fixes

offtza01 · Mar 20, 2014 · e28c463 · e28c463
1 parent 68ea0dd
commit e28c463
Show file tree

Hide file tree

Showing 23 changed files with 2,960 additions and 19 deletions.
diff --git a/.gitignore b/.gitignore
@@ -229,4 +229,3 @@ pip-log.txt
 
 /vendor
 doc
-*ServiceContainer.php
diff --git a/application/Gekosale/Core/Console.php b/application/Gekosale/Core/Console.php
@@ -27,7 +27,6 @@ public function __construct()
         parent::__construct('Welcome to Gekosale CLI Tool', '1.0');
 
         $this->addCommands([
-            new Console\Command\Assets\Combine(),
             new Console\Command\Documentation\Generate(),
             new Console\Command\Routes\Dump(),
             new Console\Command\Migration\Add(),
@@ -44,8 +43,6 @@ public function __construct()
      */
     public function getContainer()
     {
-        $request = Request::createFromGlobals();
-
         return new ServiceContainer();
     }
 }
diff --git a/application/Gekosale/Core/Form/Condition.php b/application/Gekosale/Core/Form/Condition.php
@@ -52,11 +52,9 @@ public function renderJs()
     /**
      * Evaluates condition value
      *
-     * @param $value
-     *
      * @return bool
      */
-    public function evaluate($value)
+    public function evaluate()
     {
         return true;
     }

diff --git a/application/Gekosale/Core/Form/Dependency.php b/application/Gekosale/Core/Form/Dependency.php
@@ -73,7 +73,7 @@ public function __construct($type, $field, $condition, $argument = null)
 
     public function evaluate($value = '', $i = null)
     {
-        if (!is_subclass_of($this->_condition, 'FormEngine\Condition')) {
+        if (!$this->_condition instanceof Condition) {
             return false;
         }
 

diff --git a/application/Gekosale/Core/Form/Elements/ColourSchemePicker.php b/application/Gekosale/Core/Form/Elements/ColourSchemePicker.php
@@ -68,7 +68,7 @@ public function __construct($attributes)
         );
     }
 
-    protected function prepareAttributesJs()
+    public function prepareAttributesJs()
     {
         $attributes = Array(
             $this->formatAttributeJs('name', 'sName'),
Original file line number	Diff line number	Diff line change
Expand Up		@@ -229,4 +229,3 @@ pip-log.txt

		/vendor
		doc
		*ServiceContainer.php