Browse Source

Use 3.4 annotations.

dereuromark 8 years ago
parent
commit
99f1bfc440

+ 4 - 4
src/Controller/Component/CommonComponent.php

@@ -156,7 +156,7 @@ class CommonComponent extends Component {
 	 * @param mixed $whereTo URL
 	 * @param mixed $whereTo URL
 	 * @param bool $allowSelf if redirect to the same controller/action (url) is allowed
 	 * @param bool $allowSelf if redirect to the same controller/action (url) is allowed
 	 * @param int $status
 	 * @param int $status
-	 * @return \Cake\Network\Response
+	 * @return \Cake\Http\Response
 	 */
 	 */
 	public function autoRedirect($whereTo, $allowSelf = false, $status = 302) {
 	public function autoRedirect($whereTo, $allowSelf = false, $status = 302) {
 		if ($allowSelf || $this->Controller->referer(null, true) !== '/' . $this->Controller->request->url) {
 		if ($allowSelf || $this->Controller->referer(null, true) !== '/' . $this->Controller->request->url) {
@@ -175,7 +175,7 @@ class CommonComponent extends Component {
 	 *
 	 *
 	 * @param mixed $whereTo URL
 	 * @param mixed $whereTo URL
 	 * @param int $status
 	 * @param int $status
-	 * @return \Cake\Network\Response
+	 * @return \Cake\Http\Response
 	 */
 	 */
 	public function postRedirect($whereTo, $status = 302) {
 	public function postRedirect($whereTo, $status = 302) {
 		return $this->Controller->redirect($whereTo, $status);
 		return $this->Controller->redirect($whereTo, $status);
@@ -188,7 +188,7 @@ class CommonComponent extends Component {
 	 * @param mixed $whereTo URL
 	 * @param mixed $whereTo URL
 	 * @param bool $conditionalAutoRedirect false to skip whitelisting
 	 * @param bool $conditionalAutoRedirect false to skip whitelisting
 	 * @param int $status
 	 * @param int $status
-	 * @return \Cake\Network\Response
+	 * @return \Cake\Http\Response
 	 */
 	 */
 	public function autoPostRedirect($whereTo, $conditionalAutoRedirect = true, $status = 302) {
 	public function autoPostRedirect($whereTo, $conditionalAutoRedirect = true, $status = 302) {
 		$referer = $this->Controller->referer($whereTo, true);
 		$referer = $this->Controller->referer($whereTo, true);
@@ -236,7 +236,7 @@ class CommonComponent extends Component {
 	 *
 	 *
 	 * @param mixed|null $url
 	 * @param mixed|null $url
 	 * @param int|null $status
 	 * @param int|null $status
-	 * @return \Cake\Network\Response
+	 * @return \Cake\Http\Response
 	 */
 	 */
 	public function completeRedirect($url = null, $status = 302) {
 	public function completeRedirect($url = null, $status = 302) {
 		if ($url === null) {
 		if ($url === null) {

+ 1 - 1
src/Controller/ShuntRequestController.php

@@ -24,7 +24,7 @@ class ShuntRequestController extends AppController {
 	 * Switch language as post link.
 	 * Switch language as post link.
 	 *
 	 *
 	 * @param string|null $language
 	 * @param string|null $language
-	 * @return \Cake\Network\Response
+	 * @return \Cake\Http\Response
 	 */
 	 */
 	public function language($language = null) {
 	public function language($language = null) {
 		$this->request->allowMethod(['post']);
 		$this->request->allowMethod(['post']);