From 177136c6bc288e6c0f9d9e790273f27b455fea10 Mon Sep 17 00:00:00 2001 From: dereuromark Date: Fri, 25 Nov 2016 23:59:47 +0100 Subject: [PATCH] Use less strictness where necessary. --- src/Database/Query.php | 12 ++++++------ src/View/View.php | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Database/Query.php b/src/Database/Query.php index 8ee97b7c0a2..efe57b3fa7f 100644 --- a/src/Database/Query.php +++ b/src/Database/Query.php @@ -94,24 +94,24 @@ class Query implements ExpressionInterface, IteratorAggregate /** * Statement object resulting from executing this query. * - * @var \Cake\Database\StatementInterface + * @var \Cake\Database\StatementInterface|null */ - protected $_iterator; + protected $_iterator = null; /** * The object responsible for generating query placeholders and temporarily store values * associated to each of those. * - * @var \Cake\Database\ValueBinder + * @var \Cake\Database\ValueBinder|null */ - protected $_valueBinder; + protected $_valueBinder = null; /** * Instance of functions builder object used for generating arbitrary SQL functions. * - * @var \Cake\Database\FunctionsBuilder + * @var \Cake\Database\FunctionsBuilder|null */ - protected $_functionsBuilder; + protected $_functionsBuilder = null; /** * Boolean for tracking whether or not buffered results diff --git a/src/View/View.php b/src/View/View.php index 04eac4d9fc2..c04001a8203 100644 --- a/src/View/View.php +++ b/src/View/View.php @@ -334,7 +334,7 @@ public function __construct( $this->eventManager($eventManager); $this->request = $request ?: Router::getRequest(true); $this->response = $response ?: new Response(); - if ($this->request === null) { + if (!$this->request) { $this->request = new ServerRequest([ 'base' => '', 'url' => '',