Use less strictness where necessary.

cakephp · Nov 25, 2016 · 177136c · 177136c
1 parent f36de8a
commit 177136c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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' => '',