added and used package.namespace for composer.json autoload

used package/vendor instead of config->package/vendor
hiqdev · May 29, 2015 · 7817ae0 · 7817ae0
1 parent 43150ff
commit 7817ae0
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 27 deletions.
diff --git a/.hidev/config.json b/.hidev/config.json
@@ -1,6 +1,7 @@
 {
     "package": {
         "name":         "hidev",
+        "namespace":    "hidev",
         "label":        "HiDev",
         "title":        "HiDev - integrate your development",
         "type":         "project",
@@ -57,14 +58,9 @@
     },
     "composer.json": {
         "require": {
-            "yiisoft/yii2":             "2.*",
+            "yiisoft/yii2":             "~2.0",
             "hiqdev/yii2-collection":   "*@dev"
         },
-        "autoload": {
-            "psr-4": {
-                "hiqdev\\hidev\\": ""
-            }
-        },
         "bin": ["hidev"]
     }
 }
diff --git a/composer.json b/composer.json
@@ -45,12 +45,12 @@
         }
     ],
     "require": {
-        "yiisoft/yii2": "2.*",
+        "yiisoft/yii2": "~2.0",
         "hiqdev/yii2-collection": "*@dev"
     },
     "autoload": {
         "psr-4": {
-            "hiqdev\\hidev\\": ""
+            "hidev\\": ""
         }
     },
     "bin": [

diff --git a/goals/Base.php b/goals/Base.php
@@ -77,13 +77,11 @@ public function make()
         /// throw new InvalidParamException("Don't know how to make '$this->name'");
     }
 
-
     public function getConfig()
     {
         return Yii::$app->get('config');
     }
 
-/* XXX makes loops
     public function getPackage()
     {
         return $this->getConfig()->getItem('package');
@@ -93,6 +91,5 @@ public function getVendor()
     {
         return $this->getConfig()->getItem('vendor');
     }
-*/
 
 }
diff --git a/goals/ComposerJson.php b/goals/ComposerJson.php
@@ -23,14 +23,13 @@ class ComposerJson extends Template
 
     public function init()
     {
-        $package = $this->config->package;
         $sets = [
             'name'          => $this->fullName,
             'type'          => $this->type,
-            'description'   => $package->title,
-            'keywords'      => $package->keywords,
-            'homepage'      => $package->homepage,
-            'license'       => $package->license,
+            'description'   => $this->package->title,
+            'keywords'      => $this->package->keywords,
+            'homepage'      => $this->package->homepage,
+            'license'       => $this->package->license,
             'support'       => $this->support,
             'authors'       => $this->authors,
             'require'       => $this->require,
@@ -45,36 +44,47 @@ public function init()
      */
     public function getType()
     {
-        return $this->rawItem('type') ?: $this->config->package->type;
+        return $this->rawItem('type') ?: $this->package->type;
     }
 
     public function getFullName()
     {
-        return $this->config->package->fullName;
+        return $this->package->fullName;
     }
 
     public function getSupport()
     {
         $support = $this->getItem('support');
-        $package = $this->config->package;
         $support->smartAdd([
-            'email'     => $this->config->vendor->email,
-            'source'    => $package->source,
-            'issues'    => $package->issues,
-            'wiki'      => $package->wiki,
-            'forum'     => $package->forum,
+            'email'     => $this->vendor->email,
+            'source'    => $this->package->source,
+            'issues'    => $this->package->issues,
+            'wiki'      => $this->package->wiki,
+            'forum'     => $this->package->forum,
         ],'first');
         return $support;
     }
 
     public function getAuthors()
     {
         $res = [];
-        foreach ($this->config->package->authors->getItems() as $name => $data) {
+        foreach ($this->package->authors->getItems() as $name => $data) {
             $data['name'] = $name;
             $res[] = array_merge(compact('name'), $data);
         }
         return $res;
     }
 
+    public function getAutoload()
+    {
+        if (!$this->rawItem('autoload')) {
+            $this->setItem('autoload', [
+                'psr-4' => [
+                    $this->package->namespace . '\\' => $this->package->src
+                ]
+            ]);
+        }
+
+        return $this->getItem('autoload');
+    }
 }
diff --git a/goals/License.php b/goals/License.php
@@ -20,6 +20,6 @@ class License extends Template
 {
     public function getTemplate()
     {
-        return 'licenses/' . $this->config->package->license;
+        return 'licenses/' . $this->package->license;
     }
 }
diff --git a/goals/Package.php b/goals/Package.php
@@ -75,6 +75,11 @@ public function getNamespace()
         return $this->getItem('namespace') ?: ($this->getVendor()->name . '\\' . $this->name);
     }
 
+    public function getSrc()
+    {
+        return $this->rawItem('src') ?: '';
+    }
+
     public function getHomepage()
     {
         return $this->getItem('homepage') ?: ($this->vendor->homepage . $this->name);
@@ -92,7 +97,7 @@ public function getAuthors()
 
     public function getVendor()
     {
-        return $this->getConfig()->vendor;
+        return $this->getConfig()->getVendor();
     }
 
 }