diff --git a/.gush.yml b/.gush.yml new file mode 100644 index 00000000..ffa6c4a7 --- /dev/null +++ b/.gush.yml @@ -0,0 +1,3 @@ +adapter: github +issue-tracker: github + diff --git a/.travis.yml b/.travis.yml index ef2628cb..858f67bc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,10 @@ language: php php: - - 5.3 - - 5.4 +# - 5.3 +# - 5.4 - 5.5 - - hhvm +# - hhvm env: - SYMFONY_VERSION=2.5.* @@ -12,12 +12,12 @@ env: matrix: allow_failures: - env: SYMFONY_VERSION=dev-master - - php: hhvm +# - php: hhvm include: - - php: 5.5 - env: SYMFONY_VERSION=2.3.* - - php: 5.5 - env: SYMFONY_VERSION=2.4.* +# - php: 5.5 +# env: SYMFONY_VERSION=2.3.* +# - php: 5.5 +# env: SYMFONY_VERSION=2.4.* - php: 5.5 env: SYMFONY_VERSION=dev-master @@ -29,5 +29,6 @@ before_script: script: phpunit --coverage-text notifications: - irc: "irc.freenode.org#symfony-cmf" - email: "symfony-cmf-devs@googlegroups.com" +# irc: "irc.freenode.org#symfony-cmf" +# email: "symfony-cmf-devs@googlegroups.com" + email: "cordoval@gmail.com" diff --git a/Admin/Extension/MenuOptionsExtension.php b/Admin/Extension/MenuOptionsExtension.php index 78403d32..5191320b 100644 --- a/Admin/Extension/MenuOptionsExtension.php +++ b/Admin/Extension/MenuOptionsExtension.php @@ -113,6 +113,7 @@ public function configureFormFields(FormMapper $formMapper) 'options' => $child_options, ) ) - ->end(); + ->end() + ; } } diff --git a/Admin/MenuNodeAdmin.php b/Admin/MenuNodeAdmin.php index 512c2d13..8a2ef071 100644 --- a/Admin/MenuNodeAdmin.php +++ b/Admin/MenuNodeAdmin.php @@ -13,7 +13,6 @@ use Sonata\AdminBundle\Form\FormMapper; use Sonata\DoctrinePHPCRAdminBundle\Admin\Admin; -use Symfony\Cmf\Bundle\MenuBundle\Model\Menu; use Knp\Menu\ItemInterface as MenuItemInterface; use Doctrine\Common\Util\ClassUtils; diff --git a/DependencyInjection/CmfMenuExtension.php b/DependencyInjection/CmfMenuExtension.php index 8f8446d8..2917158e 100644 --- a/DependencyInjection/CmfMenuExtension.php +++ b/DependencyInjection/CmfMenuExtension.php @@ -24,7 +24,6 @@ class CmfMenuExtension extends Extension public function load(array $configs, ContainerBuilder $container) { $config = $this->processConfiguration(new Configuration(), $configs); - $bundles = $container->getParameter('kernel.bundles'); $loader = new XmlFileLoader( $container, @@ -34,7 +33,7 @@ public function load(array $configs, ContainerBuilder $container) $loader->load('menu.xml'); $factory = $container->getDefinition($this->getAlias().'.factory'); $factory->replaceArgument(1, new Reference($config['content_url_generator'])); - $container->setParameter($this->getAlias() . '.allow_empty_items', $config['allow_empty_items']); + $container->setParameter($this->getAlias().'.allow_empty_items', $config['allow_empty_items']); $this->loadVoters($config, $loader, $container); diff --git a/Model/MenuNode.php b/Model/MenuNode.php index d5aff724..85d4e6b8 100644 --- a/Model/MenuNode.php +++ b/Model/MenuNode.php @@ -15,7 +15,6 @@ use Symfony\Cmf\Bundle\CoreBundle\Translatable\TranslatableInterface; use Symfony\Cmf\Bundle\CoreBundle\PublishWorkflow\PublishTimePeriodInterface; use Symfony\Cmf\Bundle\CoreBundle\PublishWorkflow\PublishableInterface; -use Symfony\Cmf\Bundle\MenuBundle\Model\MenuOptionsInterface; /** * This is the standard CMF MenuNode implementation @@ -239,7 +238,7 @@ public function getLinkType() * @see getLinkType * @see ContentAwareFactory::$validLinkTypes * - * Valid link types are defined in ContenentAwareFactory + * Valid link types are defined in ContentAwareFactory * * @param $linkType string - one of uri, route or content */ diff --git a/Model/MenuOptionsInterface.php b/Model/MenuOptionsInterface.php index 4c52dc7a..1864c154 100644 --- a/Model/MenuOptionsInterface.php +++ b/Model/MenuOptionsInterface.php @@ -9,7 +9,6 @@ * * @author Mojtaba Koosej */ - interface MenuOptionsInterface extends NodeInterface { /** @@ -106,7 +105,7 @@ function getChildrenAttributes(); /** * Set the children attributes * - * @param array $attributes + * @param array $childrenAttributes * * @return Page The current Page instance */ @@ -127,5 +126,4 @@ function getLabelAttributes(); * @return Page The current Page instance */ function setLabelAttributes($labelAttributes); - } diff --git a/Provider/PhpcrMenuProvider.php b/Provider/PhpcrMenuProvider.php index 0d394708..d0df681b 100644 --- a/Provider/PhpcrMenuProvider.php +++ b/Provider/PhpcrMenuProvider.php @@ -169,7 +169,7 @@ public function get($name, array $options = array()) throw new \InvalidArgumentException("Menu at '$name' is misconfigured (f.e. the route might be incorrect) and could therefore not be instanciated"); } - $menuItem->setCurrentUri($this->request->getRequestUri()); + //$menuItem->setCurrentUri($this->request->getRequestUri()); return $menuItem; } @@ -225,7 +225,7 @@ protected function find($name, array $options, $throw) && 0 === strncmp($path, $this->getMenuRoot(), strlen($this->getMenuRoot())) ) { // we have jackalope with a fetch depth. prefetch all menu - // nodes of all menues. + // nodes of all menus. $session->getNode($this->getMenuRoot(), $this->getPrefetch() + 1); } else { $session->getNode($path, $this->getPrefetch()); diff --git a/Resources/config/menu.xml b/Resources/config/menu.xml index 70e89de1..493ba151 100644 --- a/Resources/config/menu.xml +++ b/Resources/config/menu.xml @@ -20,7 +20,6 @@ - diff --git a/Resources/translations/CmfMenuBundle.es.xliff b/Resources/translations/CmfMenuBundle.es.xliff new file mode 100644 index 00000000..8edec05d --- /dev/null +++ b/Resources/translations/CmfMenuBundle.es.xliff @@ -0,0 +1,167 @@ + + + + + + dashboard.cmf + Symfony CMF + + + dashboard.label_menu + Menus + + + dashboard.label_menu_node + Nodo Menu + + + breadcrumb.link_menu_list + Menus + + + breadcrumb.link_menu_create + Crear + + + breadcrumb.link_menu_edit + Editar + + + breadcrumb.link_menu_delete + Eliminar + + + breadcrumb.link_menu_node_list + Nodos Menu + + + breadcrumb.link_menu_node_create + Crear + + + breadcrumb.link_menu_node_edit + Editar + + + breadcrumb.link_menu_node_delete + Eliminar + + + list.label_id + Id + + + list.label_name + Nombre + + + list.label_label + Etiqueta + + + list.label_uri + URI + + + list.label_route + Ruta + + + form.group_general + General + + + form.group_items + Items + + + form.label_children + Items + + + form.label_parent + Padre + + + form.label_name + Nombre + + + form.label_label + Etiqueta + + + form.label_uri + URI + + + form.label_route + Ruta + + + form.label_parameters + Parámetros de ruta + + + form.label_content + Contenido + + + form.label_link_type + Tipo de enlace + + + form.label_weak + Asociación débil + + + help.items_help + Click en cada item para editar, click derecho para crear items. + + + form.group_menus + Menu + + + form.label_menu_nodes + Menu + + + form.group_menu_options + Opciones de menu + + + form.label_display + Desplegar + + + form.help_display + Una entrada menu sólo es mostrada si la etiqueta no está vacía. + + + form.label_display_children + Mostrar Hijos + + + form.help_display_children + Hijos son mostrados sólo si la entrada misma es mostrada. + + + form.label_attributes + Atributos de Menu + + + form.label_label_attributes + Atributos de Etiqueta + + + form.label_children_attributes + Atributos de Hijos + + + form.label_link_attributes + Atributos de enlace + + + + diff --git a/composer.json b/composer.json index 7f674932..e47be437 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "symfony/framework-bundle": "~2.3", "doctrine/phpcr-bundle": ">=1.1.0,<1.3-dev", "doctrine/phpcr-odm": ">=1.1.0,<1.3-dev", - "knplabs/knp-menu-bundle": "1.1.*", + "knplabs/knp-menu-bundle": "~2.0.0", "symfony-cmf/core-bundle": ">=1.1.0,<1.3-dev" }, "require-dev": { @@ -38,7 +38,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.2-dev" + "dev-master": "2.0-dev" } } }