Merge branch '3.4' into 4.3

* 3.4:
  Fix return statements
  [TwigBridge] add missing dep
  Add false type to ChoiceListFactoryInterface::createView $label argument

Author: nicolas-grekas

PropertyPath.php

@@ -136,7 +136,7 @@ public function getLength()
     public function getParent()
     {
         if ($this->length <= 1) {
-            return;
+            return null;
         }
 
         $parent = clone $this;

PropertyPathInterface.php

@@ -40,7 +40,7 @@ public function getLength();
      *
      * If this property path only contains one item, null is returned.
      *
-     * @return PropertyPath The parent path or null
+     * @return PropertyPath|null The parent path or null
      */
     public function getParent();