From 2856fc809684ccbd76b725fd38a89aa2bd720324 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20J=C4=99drzejewski?= <pjedrzejewski@diweb.pl>
Date: Tue, 13 Nov 2012 01:24:53 +0100
Subject: [PATCH] Fix typos and bad method calls

---
 .../ResourceBundle/Controller/RequestFetcher.php   |  2 +-
 .../Controller/ResourceController.php              | 14 +++++++-------
 .../Doctrine/ORM/ResourceRepository.php            |  2 +-
 .../ResourceBundle/Doctrine/ResourceRepository.php |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Sylius/Bundle/ResourceBundle/Controller/RequestFetcher.php b/src/Sylius/Bundle/ResourceBundle/Controller/RequestFetcher.php
index ba94b2a44d..85fc19bd57 100644
--- a/src/Sylius/Bundle/ResourceBundle/Controller/RequestFetcher.php
+++ b/src/Sylius/Bundle/ResourceBundle/Controller/RequestFetcher.php
@@ -68,7 +68,7 @@ class RequestFetcher
 
     public function getIdentifierValue()
     {
-        return $this->get($this->getIdentifierName(), 'id');
+        return $this->request->get($this->getIdentifierName());
     }
 
     public function isCollectionPaginated()
diff --git a/src/Sylius/Bundle/ResourceBundle/Controller/ResourceController.php b/src/Sylius/Bundle/ResourceBundle/Controller/ResourceController.php
index c63e2a0ba0..3bb7e12895 100644
--- a/src/Sylius/Bundle/ResourceBundle/Controller/ResourceController.php
+++ b/src/Sylius/Bundle/ResourceBundle/Controller/ResourceController.php
@@ -115,7 +115,7 @@ class ResourceController extends Controller
             return $this->redirectToResource($resource);
         }
 
-        if (!$this->isHtmlRequest()) {
+        if (!$this->getRequestFetcher()->isHtmlRequest()) {
             return $this->handleView(View::create($form));
         }
 
@@ -149,15 +149,15 @@ class ResourceController extends Controller
             return $this->redirectToResource($resource);
         }
 
-        if (!$this->isHtmlRequest()) {
+        if (!$this->getRequestFetcher()->isHtmlRequest()) {
             return $this->handleView(View::create($form));
         }
 
         $view = View::create()
             ->setTemplate($this->getFullTemplateName('create.html'))
             ->setData(array(
-                $this->getResourceName() => $resource,
-                'form'                   => $form->createView()
+                $this->resourceName => $resource,
+                'form'              => $form->createView()
             ))
         ;
 
@@ -197,7 +197,7 @@ class ResourceController extends Controller
 
     protected function getResourceFormType()
     {
-        if (null !== $type = $this->requestFetcher->getFormType()) {
+        if (null !== $type = $this->getRequestFetcher()->getFormType()) {
             return $type;
         }
 
@@ -206,7 +206,7 @@ class ResourceController extends Controller
 
     protected function redirectToResource(ResourceInterface $resource)
     {
-        $this->requestFetcher->getRedirect();
+        $redirect = $this->getRequestFetcher()->getRedirect();
         $route = $redirect ? $redirect : $this->getResourceRoute();
 
         return $this->handleView(RouteRedirectView::create($route, array('id' => $resource->getId())));
@@ -214,7 +214,7 @@ class ResourceController extends Controller
 
     protected function redirectToResourceCollection()
     {
-        $this->requestFetcher->getRedirect();
+        $redirect = $this->getRequestFetcher()->getRedirect();
         $route = $redirect ? $redirect : $this->getResourceCollectionRoute();
 
         return $this->handleView(RouteRedirectView::create($route));
diff --git a/src/Sylius/Bundle/ResourceBundle/Doctrine/ORM/ResourceRepository.php b/src/Sylius/Bundle/ResourceBundle/Doctrine/ORM/ResourceRepository.php
index f1d11893fa..6ce2c51922 100644
--- a/src/Sylius/Bundle/ResourceBundle/Doctrine/ORM/ResourceRepository.php
+++ b/src/Sylius/Bundle/ResourceBundle/Doctrine/ORM/ResourceRepository.php
@@ -33,7 +33,7 @@ class ResourceRepository extends BaseResourceRepository
 
         if (null !== $sortBy) {
             foreach ($sortBy as $property => $order) {
-                $queryBuilder->orderBy($alias.$property, $order);
+                $queryBuilder->orderBy($alias.'.'.$property, $order);
             }
         }
 
diff --git a/src/Sylius/Bundle/ResourceBundle/Doctrine/ResourceRepository.php b/src/Sylius/Bundle/ResourceBundle/Doctrine/ResourceRepository.php
index 63ebf187c1..98b5b5bde1 100644
--- a/src/Sylius/Bundle/ResourceBundle/Doctrine/ResourceRepository.php
+++ b/src/Sylius/Bundle/ResourceBundle/Doctrine/ResourceRepository.php
@@ -47,7 +47,7 @@ abstract class ResourceRepository extends BaseResourceRepository
 
     public function findOneBy(array $criteria)
     {
-        return $this->objectRepository->findBy($criteria);
+        return $this->objectRepository->findOneBy($criteria);
     }
 
 }