Avoid nullable values in some Client's methods

ossinkine · ossinkine · commit 068f87f79eb5 · 2018-03-13T16:11:48.000+05:00
diff --git a/src/Symfony/Component/BrowserKit/Client.php b/src/Symfony/Component/BrowserKit/Client.php
@@ -183,20 +183,28 @@ public function getCookieJar()
     /**
      * Returns the current Crawler instance.
      *
-     * @return Crawler|null A Crawler instance
+     * @return Crawler A Crawler instance
      */
     public function getCrawler()
     {
+        if (null === $this->crawler) {
+            @trigger_error(sprintf('The %s() method calling before request() method is deprecated since 4.1 and will throw an exception in 5.0.', __METHOD__), E_USER_DEPRECATED);
+        }
+
         return $this->crawler;
     }
 
     /**
      * Returns the current BrowserKit Response instance.
      *
-     * @return Response|null A BrowserKit Response instance
+     * @return Response A BrowserKit Response instance
      */
     public function getInternalResponse()
     {
+        if (null === $this->internalResponse) {
+            @trigger_error(sprintf('The %s() method calling before request() method is deprecated since 4.1 and will throw an exception in 5.0.', __METHOD__), E_USER_DEPRECATED);
+        }
+
         return $this->internalResponse;
     }
 
@@ -206,22 +214,30 @@ public function getInternalResponse()
      * The origin response is the response instance that is returned
      * by the code that handles requests.
      *
-     * @return object|null A response instance
+     * @return object A response instance
      *
      * @see doRequest()
      */
     public function getResponse()
     {
+        if (null === $this->response) {
+            @trigger_error(sprintf('The %s() method calling before request() method is deprecated since 4.1 and will throw an exception in 5.0.', __METHOD__), E_USER_DEPRECATED);
+        }
+
         return $this->response;
     }
 
     /**
      * Returns the current BrowserKit Request instance.
      *
-     * @return Request|null A BrowserKit Request instance
+     * @return Request A BrowserKit Request instance
      */
     public function getInternalRequest()
     {
+        if (null === $this->internalRequest) {
+            @trigger_error(sprintf('The %s() method calling before request() method is deprecated since 4.1 and will throw an exception in 5.0.', __METHOD__), E_USER_DEPRECATED);
+        }
+
         return $this->internalRequest;
     }
 
@@ -231,12 +247,16 @@ public function getInternalRequest()
      * The origin request is the request instance that is sent
      * to the code that handles requests.
      *
-     * @return object|null A Request instance
+     * @return object A Request instance
      *
      * @see doRequest()
      */
     public function getRequest()
     {
+        if (null === $this->request) {
+            @trigger_error(sprintf('The %s() method calling before request() method is deprecated since 4.1 and will throw an exception in 5.0.', __METHOD__), E_USER_DEPRECATED);
+        }
+
         return $this->request;
     }
 
diff --git a/src/Symfony/Component/HttpKernel/Client.php b/src/Symfony/Component/HttpKernel/Client.php
@@ -25,8 +25,8 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  *
- * @method Request|null  getRequest()  A Request instance
- * @method Response|null getResponse() A Response instance
+ * @method Request getRequest() A Request instance
+ * @method Response getResponse() A Response instance
  */
 class Client extends BaseClient
 {

Original file line number	Diff line number	Diff line change
`@@ -183,20 +183,28 @@ public function getCookieJar()`
`183`	`183`	`/**`
`184`	`184`	`* Returns the current Crawler instance.`
`185`	`185`	`*`
`186`		`- * @return Crawler\|null A Crawler instance`
	`186`	`+ * @return Crawler A Crawler instance`
`187`	`187`	`*/`
`188`	`188`	`public function getCrawler()`
`189`	`189`	`{`
	`190`	`+ if (null === $this->crawler) {`
	`191`	`+ @trigger_error(sprintf('The %s() method calling before request() method is deprecated since 4.1 and will throw an exception in 5.0.', __METHOD__), E_USER_DEPRECATED);`
	`192`	`+ }`
	`193`	`+`
`190`	`194`	`return $this->crawler;`
`191`	`195`	`}`
`192`	`196`
`193`	`197`	`/**`
`194`	`198`	`* Returns the current BrowserKit Response instance.`
`195`	`199`	`*`
`196`		`- * @return Response\|null A BrowserKit Response instance`
	`200`	`+ * @return Response A BrowserKit Response instance`
`197`	`201`	`*/`
`198`	`202`	`public function getInternalResponse()`
`199`	`203`	`{`
	`204`	`+ if (null === $this->internalResponse) {`
	`205`	`+ @trigger_error(sprintf('The %s() method calling before request() method is deprecated since 4.1 and will throw an exception in 5.0.', __METHOD__), E_USER_DEPRECATED);`
	`206`	`+ }`
	`207`	`+`
`200`	`208`	`return $this->internalResponse;`
`201`	`209`	`}`
`202`	`210`
`@@ -206,22 +214,30 @@ public function getInternalResponse()`
`206`	`214`	`* The origin response is the response instance that is returned`
`207`	`215`	`* by the code that handles requests.`
`208`	`216`	`*`
`209`		`- * @return object\|null A response instance`
	`217`	`+ * @return object A response instance`
`210`	`218`	`*`
`211`	`219`	`* @see doRequest()`
`212`	`220`	`*/`
`213`	`221`	`public function getResponse()`
`214`	`222`	`{`
	`223`	`+ if (null === $this->response) {`
	`224`	`+ @trigger_error(sprintf('The %s() method calling before request() method is deprecated since 4.1 and will throw an exception in 5.0.', __METHOD__), E_USER_DEPRECATED);`
	`225`	`+ }`
	`226`	`+`
`215`	`227`	`return $this->response;`
`216`	`228`	`}`
`217`	`229`
`218`	`230`	`/**`
`219`	`231`	`* Returns the current BrowserKit Request instance.`
`220`	`232`	`*`
`221`		`- * @return Request\|null A BrowserKit Request instance`
	`233`	`+ * @return Request A BrowserKit Request instance`
`222`	`234`	`*/`
`223`	`235`	`public function getInternalRequest()`
`224`	`236`	`{`
	`237`	`+ if (null === $this->internalRequest) {`
	`238`	`+ @trigger_error(sprintf('The %s() method calling before request() method is deprecated since 4.1 and will throw an exception in 5.0.', __METHOD__), E_USER_DEPRECATED);`
	`239`	`+ }`
	`240`	`+`
`225`	`241`	`return $this->internalRequest;`
`226`	`242`	`}`
`227`	`243`
`@@ -231,12 +247,16 @@ public function getInternalRequest()`
`231`	`247`	`* The origin request is the request instance that is sent`
`232`	`248`	`* to the code that handles requests.`
`233`	`249`	`*`
`234`		`- * @return object\|null A Request instance`
	`250`	`+ * @return object A Request instance`
`235`	`251`	`*`
`236`	`252`	`* @see doRequest()`
`237`	`253`	`*/`
`238`	`254`	`public function getRequest()`
`239`	`255`	`{`
	`256`	`+ if (null === $this->request) {`
	`257`	`+ @trigger_error(sprintf('The %s() method calling before request() method is deprecated since 4.1 and will throw an exception in 5.0.', __METHOD__), E_USER_DEPRECATED);`
	`258`	`+ }`
	`259`	`+`
`240`	`260`	`return $this->request;`
`241`	`261`	`}`
`242`	`262`
Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,8 @@`
`25`	`25`	`*`
`26`	`26`	`* @author Fabien Potencier <[email protected]>`
`27`	`27`	`*`
`28`		`- * @method Request\|null getRequest() A Request instance`
`29`		`- * @method Response\|null getResponse() A Response instance`
	`28`	`+ * @method Request getRequest() A Request instance`
	`29`	`+ * @method Response getResponse() A Response instance`
`30`	`30`	`*/`
`31`	`31`	`class Client extends BaseClient`
`32`	`32`	`{`