redone goals name -> goalName

hiqdev · Jun 27, 2015 · 233d4be · 233d4be
1 parent e731acd
commit 233d4be
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 14 deletions.
diff --git a/goals/ConfigGoal.php b/goals/ConfigGoal.php
@@ -69,8 +69,8 @@ public function getItemClass($name = null, array $config = [])
     public function getItemConfig($name = null, array $config = [])
     {
         return array_merge([
-            'class' => $this->getItemClass($name, $config),
-            'name'  => $name,
+            'class'     => $this->getItemClass($name, $config),
+            'goalName'  => $name,
         ], $config);
     }
 

diff --git a/goals/DefaultGoal.php b/goals/DefaultGoal.php
@@ -21,7 +21,7 @@ class DefaultGoal extends BaseGoal
 {
     protected $_itemClass = 'hiqdev\collection\Manager';
 
-    public $goal;
+    public $goalName;
 
     public $done = false;
 
@@ -37,11 +37,6 @@ public function setFileType($type)
         $this->_fileType = $type;
     }
 
-    public function getName()
-    {
-        return (string) $this->rawItem('name');
-    }
-
     public function setDeps($deps)
     {
         $res = $this->getDeps();
@@ -68,24 +63,24 @@ public function actionDeps()
     public function actionPerform()
     {
         if ($this->done) {
-            Yii::trace("Already done: $this->name");
+            Yii::trace("Already done: $this->goalName");
 
             return;
         }
-        Yii::trace("Started: $this->name");
+        Yii::trace("Started: $this->goalName");
         $this->actionDeps();
         $this->actionMake();
         $this->done = true;
     }
 
     public function actionLoad()
     {
-        Yii::trace("Loading nothing for '$this->name'");
+        Yii::trace("Loading nothing for '$this->goalName'");
     }
 
     public function actionSave()
     {
-        Yii::trace("Saving nothing for '$this->name'");
+        Yii::trace("Saving nothing for '$this->goalName'");
     }
 
     public function actionMake()

diff --git a/goals/FileGoal.php b/goals/FileGoal.php
@@ -35,7 +35,7 @@ public function setTemplate($template)
 
     public function getTemplate()
     {
-        return Helper::file2template($this->_template ?: $this->name);
+        return Helper::file2template($this->_template ?: $this->goalName);
     }
 
     /**
@@ -49,7 +49,7 @@ public function getFile()
         if (!is_object($this->_file)) {
             if (!is_array($this->_file)) {
                 $this->_file = [
-                    'path' => $this->_file ?: $this->name,
+                    'path' => $this->_file ?: $this->goalName,
                 ];
             }
             $this->_file = Yii::createObject(array_merge([