瀏覽代碼

Merge pull request #44 from igorw/autoload

[autoload] add installAs field for use with autoloading
Jordi Boggiano 13 年之前
父節點
當前提交
0b6db2766f

+ 4 - 0
src/Packagist/WebBundle/Command/UpdatePackagesCommand.php

@@ -214,6 +214,10 @@ EOF
             }
         }
 
+        if (isset($data['target-dir'])) {
+            $version->setTargetDir($data['target-dir']);
+        }
+
         if (isset($data['extra']) && is_array($data['extra'])) {
             $version->setExtra($data['extra']);
         }

+ 6 - 6
src/Packagist/WebBundle/Entity/Author.php

@@ -34,17 +34,17 @@ class Author
     /**
      * Unique package name
      *
-     * @ORM\Column(type="text", nullable="true")
+     * @ORM\Column(type="text", nullable=true)
      */
     private $name;
 
     /**
-     * @ORM\Column(type="text", nullable="true")
+     * @ORM\Column(type="text", nullable=true)
      */
     private $email;
 
     /**
-     * @ORM\Column(type="text", nullable="true")
+     * @ORM\Column(type="text", nullable=true)
      */
     private $homepage;
 
@@ -64,7 +64,7 @@ class Author
     private $createdAt;
 
     /**
-     * @ORM\Column(type="datetime", nullable="true")
+     * @ORM\Column(type="datetime", nullable=true)
      */
     private $updatedAt;
 
@@ -176,7 +176,7 @@ class Author
     /**
      * Set email
      *
-     * @param text $email
+     * @param string $email
      */
     public function setEmail($email)
     {
@@ -196,7 +196,7 @@ class Author
     /**
      * Set homepage
      *
-     * @param text $homepage
+     * @param string $homepage
      */
     public function setHomepage($homepage)
     {

+ 6 - 6
src/Packagist/WebBundle/Entity/Package.php

@@ -44,12 +44,12 @@ class Package
     private $name;
 
     /**
-     * @ORM\Column(nullable="true")
+     * @ORM\Column(nullable=true)
      */
     private $type;
 
     /**
-     * @ORM\Column(type="text", nullable="true")
+     * @ORM\Column(type="text", nullable=true)
      */
     private $description;
 
@@ -78,12 +78,12 @@ class Package
     private $createdAt;
 
     /**
-     * @ORM\Column(type="datetime", nullable="true")
+     * @ORM\Column(type="datetime", nullable=true)
      */
     private $updatedAt;
 
     /**
-     * @ORM\Column(type="datetime", nullable="true")
+     * @ORM\Column(type="datetime", nullable=true)
      */
     private $crawledAt;
 
@@ -182,7 +182,7 @@ class Package
     /**
      * Set description
      *
-     * @param text $description
+     * @param string $description
      */
     public function setDescription($description)
     {
@@ -332,7 +332,7 @@ class Package
     /**
      * Set type
      *
-     * @param text $type
+     * @param string $type
      */
     public function setType($type)
     {

+ 34 - 8
src/Packagist/WebBundle/Entity/Version.php

@@ -39,17 +39,22 @@ class Version
     private $name;
 
     /**
-     * @ORM\Column(type="text", nullable="true")
+     * @ORM\Column(type="text", nullable=true)
      */
     private $description;
 
     /**
-     * @ORM\Column(nullable="true")
+     * @ORM\Column(nullable=true)
      */
     private $type;
 
     /**
-     * @ORM\Column(type="array", nullable="true")
+     * @ORM\Column(nullable=true)
+     */
+    private $targetDir;
+
+    /**
+     * @ORM\Column(type="array", nullable=true)
      */
     private $extra = array();
 
@@ -69,7 +74,7 @@ class Version
     private $package;
 
     /**
-     * @ORM\Column(nullable="true")
+     * @ORM\Column(nullable=true)
      * @Assert\Url()
      */
     private $homepage;
@@ -93,7 +98,7 @@ class Version
     private $development;
 
     /**
-     * @ORM\Column(type="text", nullable="true")
+     * @ORM\Column(type="text", nullable=true)
      */
     private $license;
 
@@ -199,6 +204,7 @@ class Version
             'time' => $this->getReleasedAt() ? $this->getReleasedAt()->format('Y-m-d\TH:i:sP') : null,
             'dist' => $this->getDist(),
             'type' => $this->getType(),
+            'target-dir' => $this->getTargetDir(),
             'extra' => $this->getExtra(),
         );
 
@@ -260,7 +266,7 @@ class Version
     /**
      * Set description
      *
-     * @param text $description
+     * @param string $description
      */
     public function setDescription($description)
     {
@@ -360,7 +366,7 @@ class Version
     /**
      * Set source
      *
-     * @param text $source
+     * @param string $source
      */
     public function setSource($source)
     {
@@ -380,7 +386,7 @@ class Version
     /**
      * Set dist
      *
-     * @param text $dist
+     * @param string $dist
      */
     public function setDist($dist)
     {
@@ -566,6 +572,26 @@ class Version
         return $this->type;
     }
 
+    /**
+     * Set targetDir
+     *
+     * @param string $targetDir
+     */
+    public function setTargetDir($targetDir)
+    {
+        $this->targetDir = $targetDir;
+    }
+
+    /**
+     * Get targetDir
+     *
+     * @return string
+     */
+    public function getTargetDir()
+    {
+        return $this->targetDir;
+    }
+
     /**
      * Set extra
      *