Forráskód Böngészése

Using setField method instead magic __set method

Replacing deprecated methods by new methods

Adding some comment for Code Inspection
Removing unused variables

Updating variables types and class uses

Updating DocBlocks

Adding missing semicolons

Replacing deprecated  unescape function by encodeURI function

Adding PHPStorm directory in ignore list
Jérôme poskin 12 éve
szülő
commit
4989ac9497

+ 2 - 1
.gitignore

@@ -9,4 +9,5 @@ vendor/
 /.settings
 /.settings
 /.buildpath
 /.buildpath
 /.project
 /.project
-composer.phar
+/.idea
+composer.phar

+ 4 - 4
src/Packagist/WebBundle/Command/IndexPackagesCommand.php

@@ -114,9 +114,9 @@ class IndexPackagesCommand extends ContainerAwareCommand
 
 
     private function updateDocumentFromPackage(\Solarium_Document_ReadWrite $document, Package $package)
     private function updateDocumentFromPackage(\Solarium_Document_ReadWrite $document, Package $package)
     {
     {
-        $document->id = $package->getId();
-        $document->name = $package->getName();
-        $document->description = $package->getDescription();
+        $document->setField('id', $package->getId());
+        $document->setField('name', $package->getName());
+        $document->setField('description', $package->getDescription());
 
 
         $tags = array();
         $tags = array();
         foreach ($package->getVersions() as $version) {
         foreach ($package->getVersions() as $version) {
@@ -124,6 +124,6 @@ class IndexPackagesCommand extends ContainerAwareCommand
                 $tags[mb_strtolower($tag->getName(), 'UTF-8')] = true;
                 $tags[mb_strtolower($tag->getName(), 'UTF-8')] = true;
             }
             }
         }
         }
-        $document->tags = array_keys($tags);
+        $document->setField('tags', array_keys($tags));
     }
     }
 }
 }

+ 4 - 2
src/Packagist/WebBundle/Controller/PackageController.php

@@ -29,7 +29,9 @@ class PackageController extends Controller
      */
      */
     public function editAction(Request $req, $name)
     public function editAction(Request $req, $name)
     {
     {
+        /** @var $packageRepo \Packagist\WebBundle\Entity\PackageRepository */
         $packageRepo = $this->getDoctrine()->getRepository('PackagistWebBundle:Package');
         $packageRepo = $this->getDoctrine()->getRepository('PackagistWebBundle:Package');
+        /** @var $package Package */
         $package = $packageRepo->findOneByName($name);
         $package = $packageRepo->findOneByName($name);
 
 
         if (!$package) {
         if (!$package) {
@@ -47,13 +49,13 @@ class PackageController extends Controller
         if ($req->isMethod("POST")) {
         if ($req->isMethod("POST")) {
             $package->setEntityRepository($packageRepo);
             $package->setEntityRepository($packageRepo);
 
 
-            $form->bindRequest($req);
+            $form->bind($req);
 
 
             if ($form->isValid()) {
             if ($form->isValid()) {
                 // Force updating of packages once the package is viewed after the redirect.
                 // Force updating of packages once the package is viewed after the redirect.
                 $package->setCrawledAt(null);
                 $package->setCrawledAt(null);
 
 
-                $em = $this->getDoctrine()->getEntityManager();
+                $em = $this->getDoctrine()->getManager();
                 $em->persist($package);
                 $em->persist($package);
                 $em->flush();
                 $em->flush();
 
 

+ 20 - 16
src/Packagist/WebBundle/Controller/WebController.php

@@ -58,8 +58,6 @@ class WebController extends Controller
      */
      */
     public function browseAction(Request $req)
     public function browseAction(Request $req)
     {
     {
-        $repository = $this->getDoctrine()->getRepository('PackagistWebBundle:Package');
-
         $filters = array(
         $filters = array(
             'type' => $req->query->get('type'),
             'type' => $req->query->get('type'),
             'tag' => $req->query->get('tag'),
             'tag' => $req->query->get('tag'),
@@ -110,8 +108,9 @@ class WebController extends Controller
         }
         }
 
 
         if ($req->query->has('search_query')) {
         if ($req->query->has('search_query')) {
-            $form->bindRequest($req);
+            $form->bind($req);
             if ($form->isValid()) {
             if ($form->isValid()) {
+                /** @var $solarium \Solarium_Client */
                 $solarium = $this->get('solarium.client');
                 $solarium = $this->get('solarium.client');
 
 
                 $select = $solarium->createSelect();
                 $select = $solarium->createSelect();
@@ -178,12 +177,12 @@ class WebController extends Controller
         $form = $this->createForm(new PackageType, $package);
         $form = $this->createForm(new PackageType, $package);
 
 
         if ('POST' === $req->getMethod()) {
         if ('POST' === $req->getMethod()) {
-            $form->bindRequest($req);
+            $form->bind($req);
             if ($form->isValid()) {
             if ($form->isValid()) {
                 try {
                 try {
                     $user = $this->getUser();
                     $user = $this->getUser();
                     $package->addMaintainer($user);
                     $package->addMaintainer($user);
-                    $em = $this->getDoctrine()->getEntityManager();
+                    $em = $this->getDoctrine()->getManager();
                     $em->persist($package);
                     $em->persist($package);
                     $em->flush();
                     $em->flush();
 
 
@@ -212,12 +211,12 @@ class WebController extends Controller
         $response = array('status' => 'error', 'reason' => 'No data posted.');
         $response = array('status' => 'error', 'reason' => 'No data posted.');
         $req = $this->getRequest();
         $req = $this->getRequest();
         if ('POST' === $req->getMethod()) {
         if ('POST' === $req->getMethod()) {
-            $form->bindRequest($req);
+            $form->bind($req);
             if ($form->isValid()) {
             if ($form->isValid()) {
                 $response = array('status' => 'success', 'name' => $package->getName());
                 $response = array('status' => 'success', 'name' => $package->getName());
             } else {
             } else {
                 $errors = array();
                 $errors = array();
-                foreach ($form->getChildren() as $child) {
+                foreach ($form->all() as $child) {
                     if ($child->hasErrors()) {
                     if ($child->hasErrors()) {
                         foreach ($child->getErrors() as $error) {
                         foreach ($child->getErrors() as $error) {
                             $errors[] = $error->getMessageTemplate();
                             $errors[] = $error->getMessageTemplate();
@@ -265,6 +264,7 @@ class WebController extends Controller
     public function viewPackageAction(Request $req, $name)
     public function viewPackageAction(Request $req, $name)
     {
     {
         try {
         try {
+            /** @var $package Package */
             $package = $this->getDoctrine()
             $package = $this->getDoctrine()
                 ->getRepository('PackagistWebBundle:Package')
                 ->getRepository('PackagistWebBundle:Package')
                 ->getFullPackageByName($name);
                 ->getFullPackageByName($name);
@@ -281,6 +281,7 @@ class WebController extends Controller
         $id = $package->getId();
         $id = $package->getId();
 
 
         try {
         try {
+            /** @var $redis Redis */
             $redis = $this->get('snc_redis.default');
             $redis = $this->get('snc_redis.default');
             $counts = $redis->mget('dl:'.$id, 'dl:'.$id.':'.date('Ym'), 'dl:'.$id.':'.date('Ymd'));
             $counts = $redis->mget('dl:'.$id, 'dl:'.$id.':'.date('Ym'), 'dl:'.$id.':'.date('Ymd'));
             $data['downloads'] = array(
             $data['downloads'] = array(
@@ -314,7 +315,7 @@ class WebController extends Controller
      * @Route("/packages/{name}", name="update_package", requirements={"name"="[A-Za-z0-9_.-]+/[A-Za-z0-9_.-]+"}, defaults={"_format" = "json"})
      * @Route("/packages/{name}", name="update_package", requirements={"name"="[A-Za-z0-9_.-]+/[A-Za-z0-9_.-]+"}, defaults={"_format" = "json"})
      * @Method({"PUT"})
      * @Method({"PUT"})
      */
      */
-    public function updatePackageAction(Request $req, $name)
+    public function updatePackageAction($name)
     {
     {
         $doctrine = $this->getDoctrine();
         $doctrine = $this->getDoctrine();
 
 
@@ -350,7 +351,7 @@ class WebController extends Controller
         if ($package->getMaintainers()->contains($user) || $this->get('security.context')->isGranted('ROLE_UPDATE_PACKAGES')) {
         if ($package->getMaintainers()->contains($user) || $this->get('security.context')->isGranted('ROLE_UPDATE_PACKAGES')) {
             if (null !== $autoUpdated) {
             if (null !== $autoUpdated) {
                 $package->setAutoUpdated((Boolean) $autoUpdated);
                 $package->setAutoUpdated((Boolean) $autoUpdated);
-                $doctrine->getEntityManager()->flush();
+                $doctrine->getManager()->flush();
             }
             }
 
 
             if ($update) {
             if ($update) {
@@ -397,7 +398,7 @@ class WebController extends Controller
                 $versionRepo->remove($version);
                 $versionRepo->remove($version);
             }
             }
 
 
-            $em = $doctrine->getEntityManager();
+            $em = $doctrine->getManager();
             $em->remove($package);
             $em->remove($package);
             $em->flush();
             $em->flush();
 
 
@@ -409,9 +410,11 @@ class WebController extends Controller
 
 
     protected function createDeletePackageForm()
     protected function createDeletePackageForm()
     {
     {
-        if ($this->get('security.context')->isGranted('ROLE_DELETE_PACKAGES')) {
-            return $this->createFormBuilder(array())->getForm();
+        if (!$this->get('security.context')->isGranted('ROLE_DELETE_PACKAGES')) {
+            throw new AccessDeniedException;
         }
         }
+
+        return $this->createFormBuilder(array())->getForm();
     }
     }
 
 
     /**
     /**
@@ -420,6 +423,7 @@ class WebController extends Controller
      */
      */
     public function createMaintainerAction(Request $req, $name)
     public function createMaintainerAction(Request $req, $name)
     {
     {
+        /** @var $package Package */
         $package = $this->getDoctrine()
         $package = $this->getDoctrine()
             ->getRepository('PackagistWebBundle:Package')
             ->getRepository('PackagistWebBundle:Package')
             ->findOneByName($name);
             ->findOneByName($name);
@@ -440,10 +444,10 @@ class WebController extends Controller
         );
         );
 
 
         if ('POST' === $req->getMethod()) {
         if ('POST' === $req->getMethod()) {
-            $form->bindRequest($req);
+            $form->bind($req);
             if ($form->isValid()) {
             if ($form->isValid()) {
                 try {
                 try {
-                    $em = $this->getDoctrine()->getEntityManager();
+                    $em = $this->getDoctrine()->getManager();
                     $user = $form->getData()->getUser();
                     $user = $form->getData()->getUser();
 
 
                     if (!empty($user)) {
                     if (!empty($user)) {
@@ -496,13 +500,13 @@ class WebController extends Controller
 
 
         // prepare data
         // prepare data
         $count = 0;
         $count = 0;
-        foreach ($packages as $key => $dataPoint) {
+        foreach ($packages as $dataPoint) {
             $count += $dataPoint['count'];
             $count += $dataPoint['count'];
             $chart['packages'][$dataPoint['month']] = $count;
             $chart['packages'][$dataPoint['month']] = $count;
         }
         }
 
 
         $count = 0;
         $count = 0;
-        foreach ($versions as $key => $dataPoint) {
+        foreach ($versions as $dataPoint) {
             $count += $dataPoint['count'];
             $count += $dataPoint['count'];
             if (in_array($dataPoint['month'], $chart['months'])) {
             if (in_array($dataPoint['month'], $chart['months'])) {
                 $chart['versions'][$dataPoint['month']] = $count;
                 $chart['versions'][$dataPoint['month']] = $count;

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

@@ -122,7 +122,7 @@ class Author
     /**
     /**
      * Set createdAt
      * Set createdAt
      *
      *
-     * @param datetime $createdAt
+     * @param \DateTime $createdAt
      */
      */
     public function setCreatedAt($createdAt)
     public function setCreatedAt($createdAt)
     {
     {
@@ -132,7 +132,7 @@ class Author
     /**
     /**
      * Get createdAt
      * Get createdAt
      *
      *
-     * @return datetime $createdAt
+     * @return \DateTime $createdAt
      */
      */
     public function getCreatedAt()
     public function getCreatedAt()
     {
     {
@@ -142,7 +142,7 @@ class Author
     /**
     /**
      * Add versions
      * Add versions
      *
      *
-     * @param Packagist\WebBundle\Entity\Version $version
+     * @param \Packagist\WebBundle\Entity\Version $version
      */
      */
     public function addVersion(Version $version)
     public function addVersion(Version $version)
     {
     {
@@ -162,9 +162,9 @@ class Author
     /**
     /**
      * Set updatedAt
      * Set updatedAt
      *
      *
-     * @param datetime $updatedAt
+     * @param \DateTime $updatedAt
      */
      */
-    public function setUpdatedAt($updatedAt)
+    public function setUpdatedAt(\DateTime $updatedAt)
     {
     {
         $this->updatedAt = $updatedAt;
         $this->updatedAt = $updatedAt;
     }
     }
@@ -172,7 +172,7 @@ class Author
     /**
     /**
      * Get updatedAt
      * Get updatedAt
      *
      *
-     * @return datetime $updatedAt
+     * @return \DateTime $updatedAt
      */
      */
     public function getUpdatedAt()
     public function getUpdatedAt()
     {
     {
@@ -192,7 +192,7 @@ class Author
     /**
     /**
      * Get email
      * Get email
      *
      *
-     * @return text
+     * @return string
      */
      */
     public function getEmail()
     public function getEmail()
     {
     {
@@ -212,7 +212,7 @@ class Author
     /**
     /**
      * Get homepage
      * Get homepage
      *
      *
-     * @return text
+     * @return string
      */
      */
     public function getHomepage()
     public function getHomepage()
     {
     {
@@ -242,7 +242,7 @@ class Author
     /**
     /**
      * Set owner
      * Set owner
      *
      *
-     * @param Packagist\WebBundle\Entity\User $owner
+     * @param \Packagist\WebBundle\Entity\User $owner
      */
      */
     public function setOwner(User $owner)
     public function setOwner(User $owner)
     {
     {
@@ -252,7 +252,7 @@ class Author
     /**
     /**
      * Get owner
      * Get owner
      *
      *
-     * @return Packagist\WebBundle\Entity\User
+     * @return \Packagist\WebBundle\Entity\User
      */
      */
     public function getOwner()
     public function getOwner()
     {
     {

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

@@ -111,6 +111,9 @@ class Package
     private $autoUpdated = false;
     private $autoUpdated = false;
 
 
     private $entityRepository;
     private $entityRepository;
+    /**
+     * @var \Composer\Repository\RepositoryInterface
+     */
     private $repositoryClass;
     private $repositoryClass;
 
 
     public function __construct()
     public function __construct()
@@ -123,10 +126,12 @@ class Package
     {
     {
         $versions = array();
         $versions = array();
         foreach ($this->getVersions() as $version) {
         foreach ($this->getVersions() as $version) {
+            /** @var $version Version */
             $versions[$version->getVersion()] = $version->toArray();
             $versions[$version->getVersion()] = $version->toArray();
         }
         }
         $maintainers = array();
         $maintainers = array();
         foreach ($this->getMaintainers() as $maintainer) {
         foreach ($this->getMaintainers() as $maintainer) {
+            /** @var $maintainer Maintainer */
             $maintainers[] = $maintainer->toArray();
             $maintainers[] = $maintainer->toArray();
         }
         }
         $data = array(
         $data = array(
@@ -362,7 +367,7 @@ class Package
     /**
     /**
      * Set crawledAt
      * Set crawledAt
      *
      *
-     * @param \DateTime $crawledAt
+     * @param \DateTime|null $crawledAt
      */
      */
     public function setCrawledAt($crawledAt)
     public function setCrawledAt($crawledAt)
     {
     {

+ 5 - 3
src/Packagist/WebBundle/Entity/PackageLink.php

@@ -38,6 +38,8 @@ abstract class PackageLink
      */
      */
     private $packageVersion;
     private $packageVersion;
 
 
+    protected $version;
+
     public function toArray()
     public function toArray()
     {
     {
         return array($this->getPackageName() => $this->getPackageVersion());
         return array($this->getPackageName() => $this->getPackageVersion());
@@ -96,9 +98,9 @@ abstract class PackageLink
     /**
     /**
      * Set version
      * Set version
      *
      *
-     * @param Packagist\WebBundle\Entity\Version $version
+     * @param \Packagist\WebBundle\Entity\Version $version
      */
      */
-    public function setVersion(\Packagist\WebBundle\Entity\Version $version)
+    public function setVersion(Version $version)
     {
     {
         $this->version = $version;
         $this->version = $version;
     }
     }
@@ -106,7 +108,7 @@ abstract class PackageLink
     /**
     /**
      * Get version
      * Get version
      *
      *
-     * @return Packagist\WebBundle\Entity\Version
+     * @return \Packagist\WebBundle\Entity\Version
      */
      */
     public function getVersion()
     public function getVersion()
     {
     {

+ 2 - 1
src/Packagist/WebBundle/Entity/PackageRepository.php

@@ -13,6 +13,7 @@
 namespace Packagist\WebBundle\Entity;
 namespace Packagist\WebBundle\Entity;
 
 
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\QueryBuilder;
 
 
 /**
 /**
  * @author Jordi Boggiano <j.boggiano@seld.be>
  * @author Jordi Boggiano <j.boggiano@seld.be>
@@ -156,7 +157,7 @@ class PackageRepository extends EntityRepository
         return $qb;
         return $qb;
     }
     }
 
 
-    private function addFilters($qb, array $filters)
+    private function addFilters(QueryBuilder $qb, array $filters)
     {
     {
         foreach ($filters as $name => $value) {
         foreach ($filters as $name => $value) {
             if (null === $value) {
             if (null === $value) {

+ 25 - 7
src/Packagist/WebBundle/Entity/Tag.php

@@ -14,6 +14,9 @@ namespace Packagist\WebBundle\Entity;
 
 
 use Doctrine\ORM\Mapping as ORM;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Validator\Constraints as Assert;
 use Symfony\Component\Validator\Constraints as Assert;
+use Doctrine\Common\Collections\Collection;
+
+use Doctrine\ORM\EntityManager;
 
 
 /**
 /**
  * @ORM\Entity
  * @ORM\Entity
@@ -45,7 +48,17 @@ class Tag
         $this->name = $name;
         $this->name = $name;
     }
     }
 
 
-    public static function getByName($em, $name, $create = false)
+    /**
+     * @static
+     *
+     * @param \Doctrine\ORM\EntityManager $em
+     * @param                             $name
+     * @param bool                        $create
+     *
+     * @return mixed|Tag
+     * @throws \Doctrine\ORM\NoResultException
+     */
+    public static function getByName(EntityManager $em, $name, $create = false)
     {
     {
         try {
         try {
             $qb = $em->createQueryBuilder();
             $qb = $em->createQueryBuilder();
@@ -54,12 +67,17 @@ class Tag
                 ->where('t.name = ?1')
                 ->where('t.name = ?1')
                 ->setMaxResults(1)
                 ->setMaxResults(1)
                 ->setParameter(1, $name);
                 ->setParameter(1, $name);
+
             return $qb->getQuery()->getSingleResult();
             return $qb->getQuery()->getSingleResult();
         } catch (\Doctrine\ORM\NoResultException $e) {
         } catch (\Doctrine\ORM\NoResultException $e) {
+            if ($create) {
+                $tag = new self($name);
+                $em->persist($tag);
+
+                return $tag;
+            }
+            throw $e;
         }
         }
-        $tag = new self($name);
-        $em->persist($tag);
-        return $tag;
     }
     }
 
 
     public function setId($id)
     public function setId($id)
@@ -85,9 +103,9 @@ class Tag
     /**
     /**
      * Add versions
      * Add versions
      *
      *
-     * @param Packagist\WebBundle\Entity\Version $versions
+     * @param \Packagist\WebBundle\Entity\Version $versions
      */
      */
-    public function addVersions(\Packagist\WebBundle\Entity\Version $versions)
+    public function addVersions(Version $versions)
     {
     {
         $this->versions[] = $versions;
         $this->versions[] = $versions;
     }
     }
@@ -95,7 +113,7 @@ class Tag
     /**
     /**
      * Get versions
      * Get versions
      *
      *
-     * @return Doctrine\Common\Collections\Collection $versions
+     * @return \Doctrine\Common\Collections\Collection $versions
      */
      */
     public function getVersions()
     public function getVersions()
     {
     {

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

@@ -69,7 +69,7 @@ class User extends BaseUser
     /**
     /**
      * Add packages
      * Add packages
      *
      *
-     * @param Packagist\WebBundle\Entity\Package $packages
+     * @param \Packagist\WebBundle\Entity\Package $packages
      */
      */
     public function addPackages(Package $packages)
     public function addPackages(Package $packages)
     {
     {
@@ -79,7 +79,7 @@ class User extends BaseUser
     /**
     /**
      * Get packages
      * Get packages
      *
      *
-     * @return Doctrine\Common\Collections\Collection $packages
+     * @return \Doctrine\Common\Collections\Collection $packages
      */
      */
     public function getPackages()
     public function getPackages()
     {
     {
@@ -89,7 +89,7 @@ class User extends BaseUser
     /**
     /**
      * Add authors
      * Add authors
      *
      *
-     * @param Packagist\WebBundle\Entity\Author $authors
+     * @param \Packagist\WebBundle\Entity\Author $authors
      */
      */
     public function addAuthors(\Packagist\WebBundle\Entity\Author $authors)
     public function addAuthors(\Packagist\WebBundle\Entity\Author $authors)
     {
     {
@@ -99,7 +99,7 @@ class User extends BaseUser
     /**
     /**
      * Get authors
      * Get authors
      *
      *
-     * @return Doctrine\Common\Collections\Collection
+     * @return \Doctrine\Common\Collections\Collection
      */
      */
     public function getAuthors()
     public function getAuthors()
     {
     {
@@ -109,7 +109,7 @@ class User extends BaseUser
     /**
     /**
      * Set createdAt
      * Set createdAt
      *
      *
-     * @param datetime $createdAt
+     * @param \DateTime $createdAt
      */
      */
     public function setCreatedAt($createdAt)
     public function setCreatedAt($createdAt)
     {
     {
@@ -119,7 +119,7 @@ class User extends BaseUser
     /**
     /**
      * Get createdAt
      * Get createdAt
      *
      *
-     * @return datetime
+     * @return \DateTime
      */
      */
     public function getCreatedAt()
     public function getCreatedAt()
     {
     {

+ 50 - 44
src/Packagist/WebBundle/Entity/Version.php

@@ -13,8 +13,10 @@
 namespace Packagist\WebBundle\Entity;
 namespace Packagist\WebBundle\Entity;
 
 
 use Doctrine\ORM\Mapping as ORM;
 use Doctrine\ORM\Mapping as ORM;
-use Composer\Package\Version\VersionParser;
 use Symfony\Component\Validator\Constraints as Assert;
 use Symfony\Component\Validator\Constraints as Assert;
+use Doctrine\Common\Collections\ArrayCollection;
+
+use Composer\Package\Version\VersionParser;
 
 
 /**
 /**
  * @ORM\Entity(repositoryClass="Packagist\WebBundle\Entity\VersionRepository")
  * @ORM\Entity(repositoryClass="Packagist\WebBundle\Entity\VersionRepository")
@@ -193,14 +195,14 @@ class Version
 
 
     public function __construct()
     public function __construct()
     {
     {
-        $this->tags = new \Doctrine\Common\Collections\ArrayCollection();
-        $this->require = new \Doctrine\Common\Collections\ArrayCollection();
-        $this->replace = new \Doctrine\Common\Collections\ArrayCollection();
-        $this->conflict = new \Doctrine\Common\Collections\ArrayCollection();
-        $this->provide = new \Doctrine\Common\Collections\ArrayCollection();
-        $this->devRequire = new \Doctrine\Common\Collections\ArrayCollection();
-        $this->suggest = new \Doctrine\Common\Collections\ArrayCollection();
-        $this->authors = new \Doctrine\Common\Collections\ArrayCollection();
+        $this->tags = new ArrayCollection();
+        $this->require = new ArrayCollection();
+        $this->replace = new ArrayCollection();
+        $this->conflict = new ArrayCollection();
+        $this->provide = new ArrayCollection();
+        $this->devRequire = new ArrayCollection();
+        $this->suggest = new ArrayCollection();
+        $this->authors = new ArrayCollection();
         $this->createdAt = new \DateTime;
         $this->createdAt = new \DateTime;
         $this->updatedAt = new \DateTime;
         $this->updatedAt = new \DateTime;
     }
     }
@@ -209,10 +211,12 @@ class Version
     {
     {
         $tags = array();
         $tags = array();
         foreach ($this->getTags() as $tag) {
         foreach ($this->getTags() as $tag) {
+            /** @var $tag Tag */
             $tags[] = $tag->getName();
             $tags[] = $tag->getName();
         }
         }
         $authors = array();
         $authors = array();
         foreach ($this->getAuthors() as $author) {
         foreach ($this->getAuthors() as $author) {
+            /** @var $author Author */
             $authors[] = $author->toArray();
             $authors[] = $author->toArray();
         }
         }
 
 
@@ -307,7 +311,7 @@ class Version
     /**
     /**
      * Get description
      * Get description
      *
      *
-     * @return text $description
+     * @return string $description
      */
      */
     public function getDescription()
     public function getDescription()
     {
     {
@@ -377,7 +381,7 @@ class Version
     /**
     /**
      * Set license
      * Set license
      *
      *
-     * @param string $license
+     * @param array $license
      */
      */
     public function setLicense(array $license)
     public function setLicense(array $license)
     {
     {
@@ -407,7 +411,7 @@ class Version
     /**
     /**
      * Get source
      * Get source
      *
      *
-     * @return text $source
+     * @return array $source
      */
      */
     public function getSource()
     public function getSource()
     {
     {
@@ -427,7 +431,7 @@ class Version
     /**
     /**
      * Get dist
      * Get dist
      *
      *
-     * @return text
+     * @return array
      */
      */
     public function getDist()
     public function getDist()
     {
     {
@@ -447,7 +451,7 @@ class Version
     /**
     /**
      * Get autoload
      * Get autoload
      *
      *
-     * @return text
+     * @return array
      */
      */
     public function getAutoload()
     public function getAutoload()
     {
     {
@@ -467,7 +471,7 @@ class Version
     /**
     /**
      * Get binaries
      * Get binaries
      *
      *
-     * @return text
+     * @return array
      */
      */
     public function getBinaries()
     public function getBinaries()
     {
     {
@@ -517,7 +521,7 @@ class Version
     /**
     /**
      * Set createdAt
      * Set createdAt
      *
      *
-     * @param datetime $createdAt
+     * @param \DateTime $createdAt
      */
      */
     public function setCreatedAt($createdAt)
     public function setCreatedAt($createdAt)
     {
     {
@@ -527,7 +531,7 @@ class Version
     /**
     /**
      * Get createdAt
      * Get createdAt
      *
      *
-     * @return datetime $createdAt
+     * @return \DateTime $createdAt
      */
      */
     public function getCreatedAt()
     public function getCreatedAt()
     {
     {
@@ -537,7 +541,7 @@ class Version
     /**
     /**
      * Set releasedAt
      * Set releasedAt
      *
      *
-     * @param datetime $releasedAt
+     * @param \DateTime $releasedAt
      */
      */
     public function setReleasedAt($releasedAt)
     public function setReleasedAt($releasedAt)
     {
     {
@@ -547,7 +551,7 @@ class Version
     /**
     /**
      * Get releasedAt
      * Get releasedAt
      *
      *
-     * @return datetime $releasedAt
+     * @return \DateTime $releasedAt
      */
      */
     public function getReleasedAt()
     public function getReleasedAt()
     {
     {
@@ -557,7 +561,7 @@ class Version
     /**
     /**
      * Set package
      * Set package
      *
      *
-     * @param Packagist\WebBundle\Entity\Package $package
+     * @param \Packagist\WebBundle\Entity\Package $package
      */
      */
     public function setPackage(Package $package)
     public function setPackage(Package $package)
     {
     {
@@ -567,7 +571,7 @@ class Version
     /**
     /**
      * Get package
      * Get package
      *
      *
-     * @return Packagist\WebBundle\Entity\Package $package
+     * @return \Packagist\WebBundle\Entity\Package $package
      */
      */
     public function getPackage()
     public function getPackage()
     {
     {
@@ -577,7 +581,7 @@ class Version
     /**
     /**
      * Get tags
      * Get tags
      *
      *
-     * @return Doctrine\Common\Collections\Collection $tags
+     * @return \Doctrine\Common\Collections\ArrayCollection $tags
      */
      */
     public function getTags()
     public function getTags()
     {
     {
@@ -587,7 +591,7 @@ class Version
     /**
     /**
      * Set updatedAt
      * Set updatedAt
      *
      *
-     * @param datetime $updatedAt
+     * @param \DateTime $updatedAt
      */
      */
     public function setUpdatedAt($updatedAt)
     public function setUpdatedAt($updatedAt)
     {
     {
@@ -597,7 +601,7 @@ class Version
     /**
     /**
      * Get updatedAt
      * Get updatedAt
      *
      *
-     * @return datetime $updatedAt
+     * @return \DateTime $updatedAt
      */
      */
     public function getUpdatedAt()
     public function getUpdatedAt()
     {
     {
@@ -607,7 +611,7 @@ class Version
     /**
     /**
      * Get authors
      * Get authors
      *
      *
-     * @return Doctrine\Common\Collections\Collection
+     * @return \Doctrine\Common\Collections\ArrayCollection
      */
      */
     public function getAuthors()
     public function getAuthors()
     {
     {
@@ -703,29 +707,29 @@ class Version
     }
     }
 
 
     /**
     /**
-     * Add tags
+     * Add tag
      *
      *
-     * @param Packagist\WebBundle\Entity\Tag $tags
+     * @param \Packagist\WebBundle\Entity\Tag $tag
      */
      */
-    public function addTag(\Packagist\WebBundle\Entity\Tag $tags)
+    public function addTag(Tag $tag)
     {
     {
-        $this->tags[] = $tags;
+        $this->tags[] = $tag;
     }
     }
 
 
     /**
     /**
      * Add authors
      * Add authors
      *
      *
-     * @param Packagist\WebBundle\Entity\Author $authors
+     * @param \Packagist\WebBundle\Entity\Author $author
      */
      */
-    public function addAuthor(\Packagist\WebBundle\Entity\Author $authors)
+    public function addAuthor(Author $author)
     {
     {
-        $this->authors[] = $authors;
+        $this->authors[] = $author;
     }
     }
 
 
     /**
     /**
      * Add require
      * Add require
      *
      *
-     * @param Packagist\WebBundle\Entity\RequireLink $require
+     * @param \Packagist\WebBundle\Entity\RequireLink $require
      */
      */
     public function addRequireLink(RequireLink $require)
     public function addRequireLink(RequireLink $require)
     {
     {
@@ -735,7 +739,7 @@ class Version
     /**
     /**
      * Get require
      * Get require
      *
      *
-     * @return Doctrine\Common\Collections\Collection
+     * @return \Doctrine\Common\Collections\ArrayCollection
      */
      */
     public function getRequire()
     public function getRequire()
     {
     {
@@ -745,7 +749,7 @@ class Version
     /**
     /**
      * Add replace
      * Add replace
      *
      *
-     * @param Packagist\WebBundle\Entity\ReplaceLink $replace
+     * @param \Packagist\WebBundle\Entity\ReplaceLink $replace
      */
      */
     public function addReplaceLink(ReplaceLink $replace)
     public function addReplaceLink(ReplaceLink $replace)
     {
     {
@@ -755,7 +759,7 @@ class Version
     /**
     /**
      * Get replace
      * Get replace
      *
      *
-     * @return Doctrine\Common\Collections\Collection
+     * @return \Doctrine\Common\Collections\ArrayCollection
      */
      */
     public function getReplace()
     public function getReplace()
     {
     {
@@ -765,7 +769,7 @@ class Version
     /**
     /**
      * Add conflict
      * Add conflict
      *
      *
-     * @param Packagist\WebBundle\Entity\ConflictLink $conflict
+     * @param \Packagist\WebBundle\Entity\ConflictLink $conflict
      */
      */
     public function addConflictLink(ConflictLink $conflict)
     public function addConflictLink(ConflictLink $conflict)
     {
     {
@@ -775,7 +779,7 @@ class Version
     /**
     /**
      * Get conflict
      * Get conflict
      *
      *
-     * @return Doctrine\Common\Collections\Collection
+     * @return \Doctrine\Common\Collections\ArrayCollection
      */
      */
     public function getConflict()
     public function getConflict()
     {
     {
@@ -785,7 +789,7 @@ class Version
     /**
     /**
      * Add provide
      * Add provide
      *
      *
-     * @param Packagist\WebBundle\Entity\ProvideLink $provide
+     * @param \Packagist\WebBundle\Entity\ProvideLink $provide
      */
      */
     public function addProvideLink(ProvideLink $provide)
     public function addProvideLink(ProvideLink $provide)
     {
     {
@@ -795,7 +799,7 @@ class Version
     /**
     /**
      * Get provide
      * Get provide
      *
      *
-     * @return Doctrine\Common\Collections\Collection
+     * @return \Doctrine\Common\Collections\ArrayCollection
      */
      */
     public function getProvide()
     public function getProvide()
     {
     {
@@ -805,7 +809,7 @@ class Version
     /**
     /**
      * Add devRequire
      * Add devRequire
      *
      *
-     * @param Packagist\WebBundle\Entity\DevRequireLink $devRequire
+     * @param \Packagist\WebBundle\Entity\DevRequireLink $devRequire
      */
      */
     public function addDevRequireLink(DevRequireLink $devRequire)
     public function addDevRequireLink(DevRequireLink $devRequire)
     {
     {
@@ -815,7 +819,7 @@ class Version
     /**
     /**
      * Get devRequire
      * Get devRequire
      *
      *
-     * @return Doctrine\Common\Collections\Collection
+     * @return \Doctrine\Common\Collections\ArrayCollection
      */
      */
     public function getDevRequire()
     public function getDevRequire()
     {
     {
@@ -825,7 +829,7 @@ class Version
     /**
     /**
      * Add suggest
      * Add suggest
      *
      *
-     * @param Packagist\WebBundle\Entity\SuggestLink $suggest
+     * @param \Packagist\WebBundle\Entity\SuggestLink $suggest
      */
      */
     public function addSuggestLink(SuggestLink $suggest)
     public function addSuggestLink(SuggestLink $suggest)
     {
     {
@@ -835,7 +839,7 @@ class Version
     /**
     /**
      * Get suggest
      * Get suggest
      *
      *
-     * @return Doctrine\Common\Collections\Collection
+     * @return \Doctrine\Common\Collections\ArrayCollection
      */
      */
     public function getSuggest()
     public function getSuggest()
     {
     {
@@ -862,6 +866,8 @@ class Version
             $version = $parser->normalizeBranch(str_replace('-dev', '', $extra['branch-alias'][$this->getVersion()]));
             $version = $parser->normalizeBranch(str_replace('-dev', '', $extra['branch-alias'][$this->getVersion()]));
             return preg_replace('{(\.9{7})+}', '.x', $version);
             return preg_replace('{(\.9{7})+}', '.x', $version);
         }
         }
+
+        return '';
     }
     }
 
 
     public function __toString()
     public function __toString()

+ 2 - 0
src/Packagist/WebBundle/Entity/VersionRepository.php

@@ -34,11 +34,13 @@ class VersionRepository extends EntityRepository
         $version->getPackage()->getVersions()->removeElement($version);
         $version->getPackage()->getVersions()->removeElement($version);
 
 
         foreach ($version->getAuthors() as $author) {
         foreach ($version->getAuthors() as $author) {
+            /** @var $author Author */
             $author->getVersions()->removeElement($version);
             $author->getVersions()->removeElement($version);
         }
         }
         $version->getAuthors()->clear();
         $version->getAuthors()->clear();
 
 
         foreach ($version->getTags() as $tag) {
         foreach ($version->getTags() as $tag) {
+            /** @var $tag Tag */
             $tag->getVersions()->removeElement($version);
             $tag->getVersions()->removeElement($version);
         }
         }
         $version->getTags()->clear();
         $version->getTags()->clear();

+ 3 - 0
src/Packagist/WebBundle/Package/Dumper.php

@@ -58,6 +58,8 @@ class Dumper
      * Constructor
      * Constructor
      *
      *
      * @param RegistryInterface $doctrine
      * @param RegistryInterface $doctrine
+     * @param Filesystem $filesystem
+     * @param UrlGeneratorInterface $router
      * @param string $webDir web root
      * @param string $webDir web root
      * @param string $cacheDir cache dir
      * @param string $cacheDir cache dir
      */
      */
@@ -75,6 +77,7 @@ class Dumper
      *
      *
      * @param array $packageIds
      * @param array $packageIds
      * @param Boolean $force
      * @param Boolean $force
+     * @param Boolean $verbose
      */
      */
     public function dump(array $packageIds, $force = false, $verbose = false)
     public function dump(array $packageIds, $force = false, $verbose = false)
     {
     {

+ 3 - 3
src/Packagist/WebBundle/Package/Updater.php

@@ -79,10 +79,10 @@ class Updater
     /**
     /**
      * Update a project
      * Update a project
      *
      *
-     * @param PackageInterface $package
+     * @param \Packagist\WebBundle\Entity\Package $package
      * @param RepositoryInterface $repository the repository instance used to update from
      * @param RepositoryInterface $repository the repository instance used to update from
      * @param int $flags a few of the constants of this class
      * @param int $flags a few of the constants of this class
-     * @param DateTime $start
+     * @param \DateTime $start
      */
      */
     public function update(Package $package, RepositoryInterface $repository, $flags = 0, \DateTime $start = null)
     public function update(Package $package, RepositoryInterface $repository, $flags = 0, \DateTime $start = null)
     {
     {
@@ -150,7 +150,7 @@ class Updater
         $em->flush();
         $em->flush();
     }
     }
 
 
-    private function updateInformation(Package $package, PackageInterface $data, $flags)
+    private function updateInformation(PackageInterface $package, PackageInterface $data, $flags)
     {
     {
         $em = $this->doctrine->getEntityManager();
         $em = $this->doctrine->getEntityManager();
         $version = new Version();
         $version = new Version();

+ 1 - 1
src/Packagist/WebBundle/Resources/public/js/layout.js

@@ -7,4 +7,4 @@ $.ajaxSetup({
     error: function (xhr) {
     error: function (xhr) {
         humane.info("We're so sorry, something is wrong on our end.");
         humane.info("We're so sorry, something is wrong on our end.");
     }
     }
-})
+});

+ 35 - 35
src/Packagist/WebBundle/Resources/public/js/submitPackage.js

@@ -1,35 +1,35 @@
-(function ($) {
-    var onSubmit = function(e) {
-        var success;
-        $('div > ul, div.confirmation', this).remove();
-        success = function (data) {
-            var html = '';
-            $('#submit').removeClass('loading');
-            if (data.status === 'error') {
-                $.each(data.reason, function (k, v) {
-                    html += '<li>'+v+'</li>';
-                });
-                $('#submit-package-form div').prepend('<ul>'+html+'</ul>');
-            } else {
-                $('#submit-package-form input[type="submit"]').before(
-                    '<div class="confirmation">The package name found for your repository is: '+data.name+', press Submit to confirm.</div>'
-                );
-                $('#submit').val('Submit');
-                $('#submit-package-form').unbind('submit');
-            }
-        };
-        $.post($(this).data('check-url'), $(this).serializeArray(), success);
-        $('#submit').addClass('loading');
-        // TODO display loader icon
-        e.preventDefault();
-    }
-
-    $('#package_repository').change(function() {
-        $('#submit-package-form').unbind('submit');
-        $('#submit-package-form').submit(onSubmit);
-        $('#submit').val('Check');
-    });
-
-    $('#package_repository').triggerHandler('change');
-})(jQuery);
-
+(function ($) {
+    var onSubmit = function(e) {
+        var success;
+        $('div > ul, div.confirmation', this).remove();
+        success = function (data) {
+            var html = '';
+            $('#submit').removeClass('loading');
+            if (data.status === 'error') {
+                $.each(data.reason, function (k, v) {
+                    html += '<li>'+v+'</li>';
+                });
+                $('#submit-package-form div').prepend('<ul>'+html+'</ul>');
+            } else {
+                $('#submit-package-form input[type="submit"]').before(
+                    '<div class="confirmation">The package name found for your repository is: '+data.name+', press Submit to confirm.</div>'
+                );
+                $('#submit').val('Submit');
+                $('#submit-package-form').unbind('submit');
+            }
+        };
+        $.post($(this).data('check-url'), $(this).serializeArray(), success);
+        $('#submit').addClass('loading');
+        // TODO display loader icon
+        e.preventDefault();
+    };
+
+    $('#package_repository').change(function() {
+        $('#submit-package-form').unbind('submit');
+        $('#submit-package-form').submit(onSubmit);
+        $('#submit').val('Check');
+    });
+
+    $('#package_repository').triggerHandler('change');
+})(jQuery);
+

+ 1 - 1
src/Packagist/WebBundle/Resources/views/layout.html.twig

@@ -99,7 +99,7 @@
         </footer>
         </footer>
 
 
         <script src="//ajax.googleapis.com/ajax/libs/jquery/1.5.2/jquery.min.js"></script>
         <script src="//ajax.googleapis.com/ajax/libs/jquery/1.5.2/jquery.min.js"></script>
-        <script>!window.jQuery && document.write(unescape('%3Cscript src="/js/libs/jquery-1.5.2.min.js"%3E%3C/script%3E'))</script>
+        <script>!window.jQuery && document.write(encodeURI('%3Cscript src="/js/libs/jquery-1.5.2.min.js"%3E%3C/script%3E'))</script>
         <script src="{{ asset('js/libs/humane.min.js') }}"></script>
         <script src="{{ asset('js/libs/humane.min.js') }}"></script>
         <script src="{{ asset('bundles/packagistweb/js/layout.js') }}"></script>
         <script src="{{ asset('bundles/packagistweb/js/layout.js') }}"></script>
         <script src="{{ asset('bundles/packagistweb/js/search.js')}}"></script>
         <script src="{{ asset('bundles/packagistweb/js/search.js')}}"></script>