xaav 13 роки тому
батько
коміт
660bae40f9

+ 6 - 30
src/Packagist/WebBundle/Controller/WebController.php

@@ -57,7 +57,7 @@ class WebController extends Controller
         $package = new Package;
         $form = $this->get('form.factory')->create(new PackageType, $package);
 
-        $request = $this->get('request');
+        $request = $this->getRequest();
         $provider = $this->get('packagist.repository_provider');
         if ($request->getMethod() == 'POST') {
             $form->bindRequest($request);
@@ -69,41 +69,17 @@ class WebController extends Controller
                 $composerFile = $repository->getComposerInformation('master');
                 $package->setName($composerFile['name']);
 
-                $this->get('session')->set('package', $package);
-                return new RedirectResponse($this->generateUrl('confirm'));
+                $em = $this->getDoctrine()->getEntityManager();
+                $em->persist($package);
+                $em->flush();
+
+                return new RedirectResponse($this->generateUrl('home'));
             }
         }
 
         return array('form' => $form->createView(), 'page' => 'submit');
     }
 
-    /**
-     * @Template()
-     * @Route("/submit/confirm", name="confirm")
-     */
-    public function confirmPackageAction()
-    {
-        if(($package = $this->get('session')->get('package')) instanceof Package) {
-            $confirmForm = new ConfirmForm;
-            $form = $this->createForm(new ConfirmFormType, $confirmForm);
-            $request = $this->getRequest();
-            if($request->getMethod() == 'POST') {
-                $form->bindRequest($request);
-                if($form->isValid()){
-                    try {
-                        $this->get('session')->remove('package');
-                        $this->getDoctrine()->getEntityManager()->persist($package);
-                        $this->get('session')->setFlash('success', $package->getName().' has been added to the package list, the repository will be parsed for releases in a bit.');
-                        return new RedirectResponse($this->generateUrl('home'));
-                    } catch (\PDOException $e) {
-                        $this->get('session')->setFlash('error', $package->getName().' could not be saved in our database, most likely the name is already in use.');
-                    }
-                }
-            }
-        }
-        return array('form' => $form->createView(), 'page' => 'confirm');
-    }
-
     /**
      * @Template()
      * @Route("/about", name="about")

+ 0 - 7
src/Packagist/WebBundle/Form/ConfirmForm.php

@@ -1,7 +0,0 @@
-<?php
-
-namespace Packagist\WebBundle\Form;
-
-class ConfirmForm
-{
-}

+ 0 - 33
src/Packagist/WebBundle/Form/ConfirmFormType.php

@@ -1,33 +0,0 @@
-<?php
-
-/*
- * This file is part of Packagist.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *     Nils Adermann <naderman@naderman.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Packagist\WebBundle\Form;
-
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilder;
-
-/**
- * @author Jordi Boggiano <j.boggiano@seld.be>
- */
-class ConfirmFormType extends AbstractType
-{
-    public function buildForm(FormBuilder $builder, array $options)
-    {
-    }
-
-    public function getDefaultOptions(array $options)
-    {
-        return array(
-            'data_class' => 'Packagist\WebBundle\Form\ConfirmForm',
-        );
-    }
-}