Merge pull request #209 from symfony-cmf/fix_tests

fix test setup, added php 5.6 to test matrix
symfony-cmf · Oct 13, 2014 · a936046 · a936046
2 parents 55e0ef2 + 9dbf3bd
commit a936046
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,7 @@ php:
     - 5.3
     - 5.4
     - 5.5
+    - 5.6
     - hhvm
 
 env:
@@ -12,7 +13,6 @@ env:
 matrix:
   allow_failures:
     - env: SYMFONY_VERSION=dev-master
-    - php: hhvm
   include:
     - php: 5.5
       env: SYMFONY_VERSION=2.3.*

diff --git a/Admin/AbstractMenuNodeAdmin.php b/Admin/AbstractMenuNodeAdmin.php
@@ -24,8 +24,24 @@
  */
 abstract class AbstractMenuNodeAdmin extends Admin
 {
+    /**
+     * @var ContentAwareFactory
+     */
     protected $contentAwareFactory;
+
+    /**
+     * @var string
+     */
+    protected $contentRoot;
+
+    /**
+     * @var string
+     */
     protected $menuRoot;
+
+    /**
+     * @var string
+     */
     protected $translationDomain = 'CmfMenuBundle';
 
     protected function configureListFields(ListMapper $listMapper)
@@ -83,7 +99,7 @@ protected function configureFormFields(FormMapper $formMapper)
         }
     }
 
-    protected function configureShowField(ShowMapper $showMapper)
+    protected function configureShowFields(ShowMapper $showMapper)
     {
         $showMapper
             ->add('id', 'text')

diff --git a/Tests/Resources/app/config/config.php b/Tests/Resources/app/config/config.php
@@ -1,5 +1,6 @@
 <?php
 
+$container->setParameter('cmf_testing.bundle_fqn', 'Symfony\Cmf\Bundle\MenuBundle');
 $loader->import(CMF_TEST_CONFIG_DIR.'/default.php');
 $loader->import(CMF_TEST_CONFIG_DIR.'/phpcr_odm.php');
 $loader->import(CMF_TEST_CONFIG_DIR.'/sonata_admin.php');