Improve PSR-2 compatibility about static keyword.

hkdobrev · hkdobrev · commit c1c6362b51ea · 2014-08-26T22:23:35.000+03:00
From 4.5 of the PSR-2 specification: http://www.php-fig.org/psr/psr-2/ > When present, the static declaration MUST come after the visibility declaration.
diff --git a/src/OAuth2Demo/Client/Controllers/Homepage.php b/src/OAuth2Demo/Client/Controllers/Homepage.php
@@ -7,7 +7,7 @@
 class Homepage
 {
     // Connects the routes in Silex
-    static public function addRoutes($routing)
+    public static function addRoutes($routing)
     {
         $routing->get('/', array(new self(), 'homepage'))->bind('homepage');
         $routing->post('/set-environment', array(new self(), 'setEnvironment'))->bind('set_environment');
@@ -30,4 +30,4 @@ public function setEnvironment(Application $app)
 
         return $app->redirect($app['url_generator']->generate('homepage'));
     }
-}
+}
diff --git a/src/OAuth2Demo/Client/Controllers/ReceiveAuthorizationCode.php b/src/OAuth2Demo/Client/Controllers/ReceiveAuthorizationCode.php
@@ -6,7 +6,7 @@
 
 class ReceiveAuthorizationCode
 {
-    static public function addRoutes($routing)
+    public static function addRoutes($routing)
     {
         $routing->get('/client/receive_authcode', array(new self(), 'receiveAuthorizationCode'))->bind('authorize_redirect');
     }
diff --git a/src/OAuth2Demo/Client/Controllers/ReceiveImplicitToken.php b/src/OAuth2Demo/Client/Controllers/ReceiveImplicitToken.php
@@ -6,7 +6,7 @@
 
 class ReceiveImplicitToken
 {
-    static public function addRoutes($routing)
+    public static function addRoutes($routing)
     {
         $routing->get('/client/receive_implicit_token', array(new self(), 'receiveImplicitToken'))->bind('authorize_redirect_implicit');
     }
diff --git a/src/OAuth2Demo/Client/Controllers/RequestResource.php b/src/OAuth2Demo/Client/Controllers/RequestResource.php
@@ -6,7 +6,7 @@
 
 class RequestResource
 {
-    static public function addRoutes($routing)
+    public static function addRoutes($routing)
     {
         $routing->get('/client/request_resource', array(new self(), 'requestResource'))->bind('request_resource');
     }
@@ -38,4 +38,4 @@ public function requestResource(Application $app)
 
         return $twig->render('client/show_resource.twig', array('response' => $json ? $json : $response, 'resource_uri' => $resource_uri));
     }
-}
+}
diff --git a/src/OAuth2Demo/Client/Controllers/RequestToken.php b/src/OAuth2Demo/Client/Controllers/RequestToken.php
@@ -6,7 +6,7 @@
 
 class RequestToken
 {
-    static public function addRoutes($routing)
+    public static function addRoutes($routing)
     {
         $routing->get('/client/request_token/authorization_code', array(new self(), 'requestTokenWithAuthCode'))->bind('request_token_with_authcode');
         $routing->get('/client/request_token/user_credentials', array(new self(), 'requestTokenWithUserCredentials'))->bind('request_token_with_usercredentials');
@@ -81,4 +81,4 @@ public function requestTokenWithUserCredentials(Application $app)
 
         return $twig->render('client/failed_token_request.twig', array('response' => $json ? $json : $response));
     }
-}
+}
diff --git a/src/OAuth2Demo/Server/Controllers/Authorize.php b/src/OAuth2Demo/Server/Controllers/Authorize.php
@@ -7,7 +7,7 @@
 class Authorize
 {
     // Connects the routes in Silex
-    static public function addRoutes($routing)
+    public static function addRoutes($routing)
     {
         $routing->get('/authorize', array(new self(), 'authorize'))->bind('authorize');
         $routing->post('/authorize', array(new self(), 'authorizeFormSubmit'))->bind('authorize_post');
@@ -55,4 +55,4 @@ public function authorizeFormSubmit(Application $app)
         // call the oauth server and return the response
         return $server->handleAuthorizeRequest($app['request'], $response, $authorized);
     }
-}
+}
diff --git a/src/OAuth2Demo/Server/Controllers/Resource.php b/src/OAuth2Demo/Server/Controllers/Resource.php
@@ -8,7 +8,7 @@
 class Resource
 {
     // Connects the routes in Silex
-    static public function addRoutes($routing)
+    public static function addRoutes($routing)
     {
         $routing->get('/resource', array(new self(), 'resource'))->bind('access');
     }
@@ -41,4 +41,4 @@ public function resource(Application $app)
             return new Response(json_encode($api_response));
         }
     }
-}
+}
diff --git a/src/OAuth2Demo/Server/Controllers/Token.php b/src/OAuth2Demo/Server/Controllers/Token.php
@@ -7,7 +7,7 @@
 class Token
 {
     // Connects the routes in Silex
-    static public function addRoutes($routing)
+    public static function addRoutes($routing)
     {
         $routing->post('/token', array(new self(), 'token'))->bind('grant');
     }
@@ -28,4 +28,4 @@ public function token(Application $app)
         // let the oauth2-server-php library do all the work!
         return $server->handleTokenRequest($app['request'], $response);
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`class Homepage`
`8`	`8`	`{`
`9`	`9`	`// Connects the routes in Silex`
`10`		`- static public function addRoutes($routing)`
	`10`	`+ public static function addRoutes($routing)`
`11`	`11`	`{`
`12`	`12`	`$routing->get('/', array(new self(), 'homepage'))->bind('homepage');`
`13`	`13`	`$routing->post('/set-environment', array(new self(), 'setEnvironment'))->bind('set_environment');`
`@@ -30,4 +30,4 @@ public function setEnvironment(Application $app)`
`30`	`30`
`31`	`31`	`return $app->redirect($app['url_generator']->generate('homepage'));`
`32`	`32`	`}`
`33`		`-}`
	`33`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`class ReceiveAuthorizationCode`
`8`	`8`	`{`
`9`		`- static public function addRoutes($routing)`
	`9`	`+ public static function addRoutes($routing)`
`10`	`10`	`{`
`11`	`11`	`$routing->get('/client/receive_authcode', array(new self(), 'receiveAuthorizationCode'))->bind('authorize_redirect');`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`class ReceiveImplicitToken`
`8`	`8`	`{`
`9`		`- static public function addRoutes($routing)`
	`9`	`+ public static function addRoutes($routing)`
`10`	`10`	`{`
`11`	`11`	`$routing->get('/client/receive_implicit_token', array(new self(), 'receiveImplicitToken'))->bind('authorize_redirect_implicit');`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`class RequestResource`
`8`	`8`	`{`
`9`		`- static public function addRoutes($routing)`
	`9`	`+ public static function addRoutes($routing)`
`10`	`10`	`{`
`11`	`11`	`$routing->get('/client/request_resource', array(new self(), 'requestResource'))->bind('request_resource');`
`12`	`12`	`}`
`@@ -38,4 +38,4 @@ public function requestResource(Application $app)`
`38`	`38`
`39`	`39`	`return $twig->render('client/show_resource.twig', array('response' => $json ? $json : $response, 'resource_uri' => $resource_uri));`
`40`	`40`	`}`
`41`		`-}`
	`41`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`class RequestToken`
`8`	`8`	`{`
`9`		`- static public function addRoutes($routing)`
	`9`	`+ public static function addRoutes($routing)`
`10`	`10`	`{`
`11`	`11`	`$routing->get('/client/request_token/authorization_code', array(new self(), 'requestTokenWithAuthCode'))->bind('request_token_with_authcode');`
`12`	`12`	`$routing->get('/client/request_token/user_credentials', array(new self(), 'requestTokenWithUserCredentials'))->bind('request_token_with_usercredentials');`
`@@ -81,4 +81,4 @@ public function requestTokenWithUserCredentials(Application $app)`
`81`	`81`
`82`	`82`	`return $twig->render('client/failed_token_request.twig', array('response' => $json ? $json : $response));`
`83`	`83`	`}`
`84`		`-}`
	`84`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`class Authorize`
`8`	`8`	`{`
`9`	`9`	`// Connects the routes in Silex`
`10`		`- static public function addRoutes($routing)`
	`10`	`+ public static function addRoutes($routing)`
`11`	`11`	`{`
`12`	`12`	`$routing->get('/authorize', array(new self(), 'authorize'))->bind('authorize');`
`13`	`13`	`$routing->post('/authorize', array(new self(), 'authorizeFormSubmit'))->bind('authorize_post');`
`@@ -55,4 +55,4 @@ public function authorizeFormSubmit(Application $app)`
`55`	`55`	`// call the oauth server and return the response`
`56`	`56`	`return $server->handleAuthorizeRequest($app['request'], $response, $authorized);`
`57`	`57`	`}`
`58`		`-}`
	`58`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`class Resource`
`9`	`9`	`{`
`10`	`10`	`// Connects the routes in Silex`
`11`		`- static public function addRoutes($routing)`
	`11`	`+ public static function addRoutes($routing)`
`12`	`12`	`{`
`13`	`13`	`$routing->get('/resource', array(new self(), 'resource'))->bind('access');`
`14`	`14`	`}`
`@@ -41,4 +41,4 @@ public function resource(Application $app)`
`41`	`41`	`return new Response(json_encode($api_response));`
`42`	`42`	`}`
`43`	`43`	`}`
`44`		`-}`
	`44`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`class Token`
`8`	`8`	`{`
`9`	`9`	`// Connects the routes in Silex`
`10`		`- static public function addRoutes($routing)`
	`10`	`+ public static function addRoutes($routing)`
`11`	`11`	`{`
`12`	`12`	`$routing->post('/token', array(new self(), 'token'))->bind('grant');`
`13`	`13`	`}`
`@@ -28,4 +28,4 @@ public function token(Application $app)`
`28`	`28`	`// let the oauth2-server-php library do all the work!`
`29`	`29`	`return $server->handleTokenRequest($app['request'], $response);`
`30`	`30`	`}`
`31`		`-}`
	`31`	`+}`