Introduce properties for SQL parts in QueryBuilder

[BenMorel]

Q	A
Type	improvement
BC Break	yes
Fixed issues	none

Summary

This supersedes #3829. Now that #3830 and #3833 have introduced From and Join objects, it's time to replace the $sqlParts associative array with an explicit object, namely QueryParts.

Update: the SQL parts are now part of QueryBuilder itself.

[BenMorel]

@morozov Do you know what's wrong with phpcs? How can I early exit here?

[morozov]

Do you know what's wrong with phpcs? How can I early exit here?

Please try phpcbf:

--- a/lib/Doctrine/DBAL/Query/QueryParts.php
+++ b/lib/Doctrine/DBAL/Query/QueryParts.php
@@ -67,8 +67,10 @@ class QueryParts
             $this->where = clone $this->where;
         }
 
-        if ($this->having !== null) {
-            $this->having = clone $this->having;
+        if ($this->having === null) {
+            return;
         }
+
+        $this->having = clone $this->having;
     }
 }

See slevomat/coding-standard#371 for the reference.

[BenMorel]

Please try phpcbf: (...)

Kills readability in this specific case, if you ask me. Should I proceed anyway?

[morozov]

Kills readability in this specific case, if you ask me. Should I proceed anyway?

I agree (hence the issue). However, I'd prefer to format the code according to the standard instead of having to maintain an exception in phpcs.xml.

[BenMorel]

I agree (hence the issue). However, I'd prefer to format the code according to the standard instead of having to maintain an exception in phpcs.xml.

Fixed in 00b4f89.

[BenMorel]

I agree (hence the issue). However, I'd prefer to format the code according to the standard instead of having to maintain an exception in phpcs.xml.

Fixed in 00b4f89.

And obsoleted by 42c6062. Problem solved.

[BenMorel]

@morozov All good for me. Let me know if you see anything else!

[morozov]

All good for me. Let me know if you see anything else!

Apart from the nitpicks, looks good. Love the removal of the add() implementation.

[BenMorel]

@morozov All done! Ready for your review.

[BenMorel]

@morozov Ready for review, once again.

[morozov]

Apart from the upgrade notes, looks good. Let's get it merged.

[BenMorel]

Squashed!

[morozov]

@BenMorel after getting this done, if you’re still in the mood for static analysis puzzles like this, you may want to look at #3799. There was some progress done in the past but it seems stuck.

[BenMorel]

Please use $this->expectException() instead.

Ugh. All assertions are static, and this method isn't. How can this even work??

Anyway, all fixed, and squashed again.

[morozov]

Thanks, @BenMorel! All good this time.