Merge pull request #119 from sjopet/patch-2

lsmith77 · lsmith77 · commit 5468b96a0fd7 · 2013-08-08T00:06:51.000-07:00
renamed MenuNodeCommonAdmin to AbstractMenuNodeAdmin and changed it to abstract
diff --git a/Admin/AbstractMenuNodeAdmin.php b/Admin/AbstractMenuNodeAdmin.php
@@ -12,7 +12,7 @@
 /**
  * Common base admin for Menu and MenuNode
  */
-class MenuNodeCommonAdmin extends Admin
+abstract class AbstractMenuNodeAdmin extends Admin
 {
     protected $contentAwareFactory;
     protected $menuRoot;
diff --git a/Admin/MenuAdmin.php b/Admin/MenuAdmin.php
@@ -4,7 +4,7 @@
 
 use Sonata\AdminBundle\Form\FormMapper;
 
-class MenuAdmin extends MenuNodeCommonAdmin
+class MenuAdmin extends AbstractMenuNodeAdmin
 {
     protected $baseRouteName = 'cmf_menu';
     protected $baseRoutePattern = '/cmf/menu/menu';
diff --git a/Admin/MenuNodeAdmin.php b/Admin/MenuNodeAdmin.php
@@ -7,7 +7,7 @@
 use Knp\Menu\ItemInterface as MenuItemInterface;
 use Doctrine\Common\Util\ClassUtils;
 
-class MenuNodeAdmin extends MenuNodeCommonAdmin
+class MenuNodeAdmin extends AbstractMenuNodeAdmin
 {
     protected $baseRouteName = 'cmf_menu_menunode';
     protected $baseRoutePattern = '/cmf/menu/menunode';

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`/**`
`13`	`13`	`* Common base admin for Menu and MenuNode`
`14`	`14`	`*/`
`15`		`-class MenuNodeCommonAdmin extends Admin`
	`15`	`+abstract class AbstractMenuNodeAdmin extends Admin`
`16`	`16`	`{`
`17`	`17`	`protected $contentAwareFactory;`
`18`	`18`	`protected $menuRoot;`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`use Sonata\AdminBundle\Form\FormMapper;`
`6`	`6`
`7`		`-class MenuAdmin extends MenuNodeCommonAdmin`
	`7`	`+class MenuAdmin extends AbstractMenuNodeAdmin`
`8`	`8`	`{`
`9`	`9`	`protected $baseRouteName = 'cmf_menu';`
`10`	`10`	`protected $baseRoutePattern = '/cmf/menu/menu';`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`use Knp\Menu\ItemInterface as MenuItemInterface;`
`8`	`8`	`use Doctrine\Common\Util\ClassUtils;`
`9`	`9`
`10`		`-class MenuNodeAdmin extends MenuNodeCommonAdmin`
	`10`	`+class MenuNodeAdmin extends AbstractMenuNodeAdmin`
`11`	`11`	`{`
`12`	`12`	`protected $baseRouteName = 'cmf_menu_menunode';`
`13`	`13`	`protected $baseRoutePattern = '/cmf/menu/menunode';`