From 8c58a415669689b6e9a0bd280575a59073d86945 Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <dev@bernhard-posselt.com>
Date: Thu, 1 May 2014 23:04:08 +0200
Subject: fix updater url

---
 appinfo/routes.php                              | 2 +-
 controller/apicontroller.php                    | 2 --
 controller/feedapicontroller.php                | 1 -
 tests/unit/controller/ApiControllerTest.php     | 4 ++--
 tests/unit/controller/FeedApiControllerTest.php | 2 +-
 5 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/appinfo/routes.php b/appinfo/routes.php
index b3f42cdef..235b0fb10 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -81,7 +81,7 @@ $application->registerRoutes($this, array('routes' => array(
 	array('name' => 'feed_api#move', 'url' => '/api/v1-2/feeds/{feedId}/move', 'verb' => 'PUT'), // FIXME: POST would be more correct
 	array('name' => 'feed_api#rename', 'url' => '/api/v1-2/feeds/{feedId}/rename', 'verb' => 'PUT'), // FIXME: POST would be more correct
 	array('name' => 'feed_api#read', 'url' => '/api/v1-2/feeds/{feedId}/read', 'verb' => 'PUT'), // FIXME: POST would be more correct
-	array('name' => 'feed_api#update', 'url' => '/api/v1-2/update', 'verb' => 'GET'),
+	array('name' => 'feed_api#update', 'url' => '/api/v1-2/feeds/update', 'verb' => 'GET'),
 
 	// items
 	array('name' => 'item_api#index', 'url' => '/api/v1-2/items', 'verb' => 'GET'),
diff --git a/controller/apicontroller.php b/controller/apicontroller.php
index 44c888972..237011dcc 100644
--- a/controller/apicontroller.php
+++ b/controller/apicontroller.php
@@ -50,7 +50,6 @@ class ApiController extends Controller {
 
 	/**
 	 * @NoCSRFRequired
-	 * @API
 	 */
 	public function beforeUpdate() {
 		$this->updater->beforeUpdate();
@@ -60,7 +59,6 @@ class ApiController extends Controller {
 
 	/**
 	 * @NoCSRFRequired
-	 * @API
 	 */
 	public function afterUpdate() {
 		$this->updater->afterUpdate();
diff --git a/controller/feedapicontroller.php b/controller/feedapicontroller.php
index 14902693d..98fc834f7 100644
--- a/controller/feedapicontroller.php
+++ b/controller/feedapicontroller.php
@@ -201,7 +201,6 @@ class FeedApiController extends Controller {
 
 	/**
 	 * @NoCSRFRequired
-	 * @API
 	 */
 	public function update() {
 		$userId = $this->params('userId');
diff --git a/tests/unit/controller/ApiControllerTest.php b/tests/unit/controller/ApiControllerTest.php
index 8975819ea..5693ac3aa 100644
--- a/tests/unit/controller/ApiControllerTest.php
+++ b/tests/unit/controller/ApiControllerTest.php
@@ -59,12 +59,12 @@ class ApiControllerTest extends ControllerTestUtility {
 	}
 
 	public function testBeforeUpdateAnnotations(){
-		$annotations = array('NoCSRFRequired', 'API');
+		$annotations = array('NoCSRFRequired');
 		$this->assertAnnotations($this->newsAPI, 'beforeUpdate', $annotations);
 	}
 
 	public function testAfterUpdateAnnotations(){
-		$annotations = array('NoCSRFRequired', 'API');
+		$annotations = array('NoCSRFRequired');
 		$this->assertAnnotations($this->newsAPI, 'afterUpdate', $annotations);
 	}
 
diff --git a/tests/unit/controller/FeedApiControllerTest.php b/tests/unit/controller/FeedApiControllerTest.php
index fdd507258..7beeda87e 100644
--- a/tests/unit/controller/FeedApiControllerTest.php
+++ b/tests/unit/controller/FeedApiControllerTest.php
@@ -113,7 +113,7 @@ class FeedApiControllerTest extends ControllerTestUtility {
 
 
 	public function testUpdateAnnotations(){
-		$annotations = array('NoCSRFRequired', 'API');
+		$annotations = array('NoCSRFRequired');
 		$this->assertAnnotations($this->feedAPI, 'update', $annotations);
 	}
 
-- 
cgit v1.2.3