allow more things to be nullable to avoid problems when phpcr-odm starts to properly validate

Author: dbu

Model/MenuNode.php

@@ -37,7 +37,9 @@ class MenuNode extends MenuNodeBase implements
     protected $linkType;
 
     /**
-     * @var mixed
+     * The content this menu item points to.
+     *
+     * @var object
      */
     protected $content;
 

Model/MenuNodeBase.php

@@ -101,7 +101,7 @@ class MenuNodeBase implements NodeInterface
      *
      * @var array
      */
-    protected $extras;
+    protected $extras = array();
 
     /**
      * Parameters to use when generating the route.

Resources/config/doctrine-model/MenuNode.phpcr.xml

@@ -15,11 +15,11 @@
         <reference-one name="content" property="menuContent"/>
 
         <field name="label" type="string" translated="true"/>
-        <field name="uri" type="string" translated="true"/>
-        <field name="linkType" type="string"/>
+        <field name="uri" type="string" translated="true" nullable="true"/>
+        <field name="linkType" type="string" nullable="true"/>
         <field name="publishable" type="boolean"/>
-        <field name="publishStartDate" type="date"/>
-        <field name="publishEndDate" type="date"/>
+        <field name="publishStartDate" type="date" nullable="true"/>
+        <field name="publishEndDate" type="date" nullable="true"/>
 
     </mapped-superclass>
 

Resources/config/doctrine-model/MenuNodeBase.phpcr.xml

@@ -16,8 +16,8 @@
         <parent-document name="parent"/>
 
         <field name="label" type="string"/>
-        <field name="uri" type="string"/>
-        <field name="route" type="string"/>
+        <field name="uri" type="string" nullable="true"/>
+        <field name="route" type="string" nullable="true"/>
         <field name="routeAbsolute" type="boolean"/>
         <field name="display" type="boolean"/>
         <field name="displayChildren" type="boolean"/>