Przeglądaj źródła

Merge pull request #5 from jonnnnyw/scrutinizer-patch-1

Scrutinizer Auto-Fixes
Jonny Wenmoth 12 lat temu
rodzic
commit
2b6b2fd9c7

+ 19 - 19
src/JonnyW/PhantomJs/Client.php

@@ -55,7 +55,7 @@ class Client implements ClientInterface
 	/**
 	 * Internal constructor
 	 *
-	 * @param JonnyW\PhantomJs\Message\FactoryInterface $factory
+	 * @param FactoryInterface $factory
 	 * @return void
 	 */
 	public function __construct(FactoryInterface $factory = null)
@@ -72,8 +72,8 @@ class Client implements ClientInterface
 	/**
 	 * Get singleton instance
 	 *
-	 * @param JonnyW\PhantomJs\Message\FactoryInterface $factory
-	 * @return JonnyW\PhantomJs\ClientInterface
+	 * @param FactoryInterface $factory
+	 * @return Client
 	 */
 	public static function getInstance(FactoryInterface $factory = null)
 	{
@@ -97,10 +97,10 @@ class Client implements ClientInterface
 	/**
 	 * Send request
 	 *
-	 * @param JonnyW\PhantomJs\Message\RequestInterface $request
-	 * @param JonnyW\PhantomJs\Message\ResponseInterface $response
+	 * @param RequestInterface $request
+	 * @param ResponseInterface $response
 	 * @param string $file
-	 * @return JonnyW\PhantomJs\Message\ResponseInterface
+	 * @return ResponseInterface
 	 */
 	public function send(RequestInterface $request, ResponseInterface $response, $file = null)
 	{
@@ -114,9 +114,9 @@ class Client implements ClientInterface
 	/**
 	 * Open page
 	 *
-	 * @param JonnyW\PhantomJs\Message\RequestInterface $request
-	 * @param JonnyW\PhantomJs\Message\ResponseInterface $response
-	 * @return JonnyW\PhantomJs\Message\ResponseInterface
+	 * @param RequestInterface $request
+	 * @param ResponseInterface $response
+	 * @return ResponseInterface
 	 */
 	public function open(RequestInterface $request, ResponseInterface $response)
 	{
@@ -126,10 +126,10 @@ class Client implements ClientInterface
 	/**
 	 * Screen capture
 	 *
-	 * @param JonnyW\PhantomJs\Message\RequestInterface $request
-	 * @param JonnyW\PhantomJs\Message\ResponseInterface $response
+	 * @param RequestInterface $request
+	 * @param ResponseInterface $response
 	 * @param string $file
-	 * @return JonnyW\PhantomJs\Message\ResponseInterface
+	 * @return ResponseInterface
 	 */
 	public function capture(RequestInterface $request, ResponseInterface $response, $file)
 	{
@@ -146,7 +146,7 @@ class Client implements ClientInterface
 	 * Set new PhantomJs path
 	 *
 	 * @param string $path
-	 * @return JonnyW\PhantomJs\ClientInterface
+	 * @return Client
 	 */
 	public function setPhantomJs($path)
 	{
@@ -163,7 +163,7 @@ class Client implements ClientInterface
 	 * Set timeout period (in milliseconds)
 	 *
 	 * @param int $period
-	 * @return JonnyW\PhantomJs\ClientInterface
+	 * @return Client
 	 */
 	public function setTimeout($period)
 	{
@@ -175,10 +175,10 @@ class Client implements ClientInterface
 	/**
 	 * Make PhantomJS request
 	 *
-	 * @param JonnyW\PhantomJs\Message\RequestInterface $request
-	 * @param JonnyW\PhantomJs\Message\ResponseInterface $response
+	 * @param RequestInterface $request
+	 * @param ResponseInterface $response
 	 * @param string $cmd
-	 * @return JonnyW\PhantomJs\Message\ResponseInterface
+	 * @return ResponseInterface
 	 */
 	protected function request(RequestInterface $request, ResponseInterface $response, $cmd)
 	{
@@ -229,7 +229,7 @@ class Client implements ClientInterface
 	 * return path to file
 	 *
 	 * @param string $data
-	 * @return JonnyW\PhantomJs\ClientInterface
+	 * @return string
 	 */
 	protected function writeScript($data)
 	{
@@ -255,7 +255,7 @@ class Client implements ClientInterface
 	 * Remove temporary script file
 	 *
 	 * @param string|boolean $file
-	 * @return JonnyW\PhantomJs\ClientInterface
+	 * @return Client
 	 */
 	protected function removeScript($file)
 	{

+ 10 - 10
src/JonnyW/PhantomJs/ClientInterface.php

@@ -21,29 +21,29 @@ interface ClientInterface
 	/**
 	 * Send request
 	 *
-	 * @param JonnyW\PhantomJs\Message\RequestInterface $request
-	 * @param JonnyW\PhantomJs\Message\ResponseInterface $response
+	 * @param RequestInterface $request
+	 * @param ResponseInterface $response
 	 * @param string $file
-	 * @return JonnyW\PhantomJs\Message\ResponseInterface
+	 * @return ResponseInterface
 	 */
 	public function send(RequestInterface $request, ResponseInterface $response, $file = null);
 
 	/**
 	 * Open page
 	 *
-	 * @param JonnyW\PhantomJs\Message\RequestInterface $request
-	 * @param JonnyW\PhantomJs\Message\ResponseInterface $response
-	 * @return JonnyW\PhantomJs\Message\ResponseInterface
+	 * @param RequestInterface $request
+	 * @param ResponseInterface $response
+	 * @return ResponseInterface
 	 */
 	public function open(RequestInterface $request, ResponseInterface $response);
 
 	/**
 	 * Screen capture
 	 *
-	 * @param JonnyW\PhantomJs\Message\RequestInterface $request
-	 * @param JonnyW\PhantomJs\Message\ResponseInterface $response
+	 * @param RequestInterface $request
+	 * @param ResponseInterface $response
 	 * @param string $file
-	 * @return JonnyW\PhantomJs\Message\ResponseInterface
+	 * @return ResponseInterface
 	 */
 	public function capture(RequestInterface $request, ResponseInterface $response, $file);
 
@@ -51,7 +51,7 @@ interface ClientInterface
 	 * Set new PhantomJs path
 	 *
 	 * @param string $path
-	 * @return JonnyW\PhantomJs\ClientInterface
+	 * @return Client
 	 */
 	public function setPhantomJs($path);
 }

+ 7 - 7
src/JonnyW/PhantomJs/Message/Factory.php

@@ -8,10 +8,10 @@
  */
 namespace JonnyW\PhantomJs\Message;
 
-use  JonnyW\PhantomJs\Message\FactoryInterface;
-use  JonnyW\PhantomJs\Message\RequestInterface;
-use  JonnyW\PhantomJs\Message\Request;
-use  JonnyW\PhantomJs\Message\Response;
+use JonnyW\PhantomJs\Message\FactoryInterface;
+use JonnyW\PhantomJs\Message\RequestInterface;
+use JonnyW\PhantomJs\Message\Request;
+use JonnyW\PhantomJs\Message\Response;
 
 /**
  * PHP PhantomJs
@@ -30,7 +30,7 @@ class Factory implements FactoryInterface
 	/**
 	 * Get singleton instance
 	 *
-	 * @return JonnyW\PhantomJs\Message\FactoryInterface
+	 * @return Factory
 	 */
 	public static function getInstance()
 	{
@@ -46,7 +46,7 @@ class Factory implements FactoryInterface
 	 *
 	 * @param string $method
 	 * @param string $url
-	 * @return JonnyW\PhantomJs\Message\Request
+	 * @return Request
 	 */
 	public function createRequest($method = RequestInterface::METHOD_GET, $url = null)
 	{
@@ -56,7 +56,7 @@ class Factory implements FactoryInterface
 	/**
 	 * Create response instance
 	 *
-	 * @return JonnyW\PhantomJs\Message\Response
+	 * @return Response
 	 */
 	public function createResponse()
 	{

+ 4 - 4
src/JonnyW/PhantomJs/Message/FactoryInterface.php

@@ -8,7 +8,7 @@
  */
 namespace JonnyW\PhantomJs\Message;
 
-use  JonnyW\PhantomJs\Message\RequestInterface;
+use JonnyW\PhantomJs\Message\RequestInterface;
 
 /**
  * PHP PhantomJs
@@ -20,7 +20,7 @@ interface FactoryInterface
 	/**
 	 * Get singleton instance
 	 *
-	 * @return JonnyW\PhantomJs\Message\FactoryInterface
+	 * @return Factory
 	 */
 	public static function getInstance();
 
@@ -29,14 +29,14 @@ interface FactoryInterface
 	 *
 	 * @param string $url
 	 * @param string $method
-	 * @return JonnyW\PhantomJs\Message\Request
+	 * @return Request
 	 */
 	public function createRequest($url, $method = RequestInterface::METHOD_GET);
 
 	/**
 	 * Create response instance
 	 *
-	 * @return JonnyW\PhantomJs\Message\Response
+	 * @return Response
 	 */
 	public function createResponse();
 }

+ 5 - 5
src/JonnyW/PhantomJs/Message/Request.php

@@ -71,7 +71,7 @@ class Request implements RequestInterface
 	 * Set request method
 	 *
 	 * @param string $method
-	 * @return JonnyW\PhantomJs\Message\Request
+	 * @return Request
 	 */
 	public function setMethod($method)
 	{
@@ -102,7 +102,7 @@ class Request implements RequestInterface
 	 * Set request URL
 	 *
 	 * @param string $url
-	 * @return JonnyW\PhantomJs\Message\Request
+	 * @return Request
 	 */
 	public function setUrl($url)
 	{
@@ -160,7 +160,7 @@ class Request implements RequestInterface
 	 * Set request data
 	 *
 	 * @param array $data
-	 * @return JonnyW\PhantomJs\Message\Request
+	 * @return Request
 	 */
 	public function setRequestData(array $data)
 	{
@@ -229,7 +229,7 @@ class Request implements RequestInterface
 	 *
 	 * @param string $header
 	 * @param string $value
-	 * @return JonnyW\PhantomJs\Message\Request
+	 * @return Request
 	 */
 	public function addHeader($header, $value)
 	{
@@ -242,7 +242,7 @@ class Request implements RequestInterface
 	 * Merge headers with existing
 	 *
 	 * @param array $headers
-	 * @return JonnyW\PhantomJs\Message\Request
+	 * @return Request
 	 */
 	public function addHeaders(array $headers)
 	{

+ 6 - 6
src/JonnyW/PhantomJs/Message/RequestInterface.php

@@ -28,7 +28,7 @@ interface RequestInterface
 	 * Set request method
 	 *
 	 * @param string $method
-	 * @return JonnyW\PhantomJs\Message\Request
+	 * @return Request
 	 */
 	public function setMethod($method);
 
@@ -43,7 +43,7 @@ interface RequestInterface
 	 * Set request URL
 	 *
 	 * @param string $url
-	 * @return JonnyW\PhantomJs\Message\Request
+	 * @return Request
 	 */
 	public function setUrl($url);
 
@@ -68,7 +68,7 @@ interface RequestInterface
 	 * Set request data
 	 *
 	 * @param array $data
-	 * @return JonnyW\PhantomJs\Message\Request
+	 * @return Request
 	 */
 	public function setRequestData(array $data);
 
@@ -84,7 +84,7 @@ interface RequestInterface
 	 * Set headers
 	 *
 	 * @param array $headers
-	 * @return JonnyW\PhantomJs\Message\Request
+	 * @return JonnyW\PhantomJs\Message\Request|null
 	 */
 	public function setHeaders(array $headers);
 
@@ -93,7 +93,7 @@ interface RequestInterface
 	 *
 	 * @param string $header
 	 * @param string $value
-	 * @return JonnyW\PhantomJs\Message\Request
+	 * @return Request
 	 */
 	public function addHeader($header, $value);
 
@@ -101,7 +101,7 @@ interface RequestInterface
 	 * Merge headers with existing
 	 *
 	 * @param array $headers
-	 * @return JonnyW\PhantomJs\Message\Request
+	 * @return Request
 	 */
 	public function addHeaders(array $headers);
 

+ 2 - 2
src/JonnyW/PhantomJs/Message/Response.php

@@ -69,7 +69,7 @@ class Response implements ResponseInterface
 	/**
 	 * Set response data
 	 *
-	 * @return JonnyW\PhantomJs\Message\ResponseInterface
+	 * @return Response
 	 */
 	public function setData(array $data)
 	{
@@ -159,7 +159,7 @@ class Response implements ResponseInterface
 	/**
 	 * Get response status code
 	 *
-	 * @return int|null
+	 * @return integer
 	 */
 	public function getStatus()
 	{

+ 1 - 1
src/JonnyW/PhantomJs/Message/ResponseInterface.php

@@ -19,7 +19,7 @@ interface ResponseInterface
 	/**
 	 * Set response data
 	 *
-	 * @return JonnyW\PhantomJs\Message\ResponseInterface
+	 * @return Response
 	 */
 	public function setData(array $data);