fix updater url

owncloud-archive · May 1, 2014 · 8c58a41 · 8c58a41
1 parent b78b3fe
commit 8c58a41
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 7 deletions.
diff --git a/appinfo/routes.php b/appinfo/routes.php
@@ -81,7 +81,7 @@
 	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
@@ -50,7 +50,6 @@ public function version() {
 
 	/**
 	 * @NoCSRFRequired
-	 * @API
 	 */
 	public function beforeUpdate() {
 		$this->updater->beforeUpdate();
@@ -60,7 +59,6 @@ public function beforeUpdate() {
 
 	/**
 	 * @NoCSRFRequired
-	 * @API
 	 */
 	public function afterUpdate() {
 		$this->updater->afterUpdate();

diff --git a/controller/feedapicontroller.php b/controller/feedapicontroller.php
@@ -201,7 +201,6 @@ public function fromAllUsers() {
 
 	/**
 	 * @NoCSRFRequired
-	 * @API
 	 */
 	public function update() {
 		$userId = $this->params('userId');

diff --git a/tests/unit/controller/ApiControllerTest.php b/tests/unit/controller/ApiControllerTest.php
@@ -59,12 +59,12 @@ public function testVersionAnnotations(){
 	}
 
 	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
@@ -113,7 +113,7 @@ public function testFromUsersAnnotations(){
 
 
 	public function testUpdateAnnotations(){
-		$annotations = array('NoCSRFRequired', 'API');
+		$annotations = array('NoCSRFRequired');
 		$this->assertAnnotations($this->feedAPI, 'update', $annotations);
 	}
-Original file line number
+Diff line change
@@ Expand Up / @@ -201,7 +201,6 @@ public function fromAllUsers() { @@
     	/**
     	 * @NoCSRFRequired
-    	 * @API
     	 */
     	public function update() {
     		$userId = $this->params('userId');
@@ Expand Down @@