From d05d325bc9bbf3584bfbe0b7299f7ee51bac4bcb Mon Sep 17 00:00:00 2001 From: ElectricMaxxx Date: Wed, 4 Oct 2017 05:53:50 +0200 Subject: [PATCH] moving phpcr-odm and phpcr-bundle into require-dev section the persistence in phpcr should be disabled by default also move core-bundle to require-dev the publishing workflow is disabled by default, so the core-bundle could be seen as optional Apply fixes from StyleCI [ci skip] [skip ci] --- composer.json | 13 +++++++++---- src/PublishWorkflow/Voter/MenuContentVoter.php | 1 + 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 3bff4c36..7342b1a3 100644 --- a/composer.json +++ b/composer.json @@ -14,9 +14,6 @@ "require": { "php": "^5.6|^7.0", "symfony/framework-bundle": "^2.8|^3.0", - "symfony-cmf/core-bundle": "^2.0", - "doctrine/phpcr-bundle": "^1.1", - "doctrine/phpcr-odm": "^1.4.2", "knplabs/knp-menu-bundle": "^2.0.0", "knplabs/knp-menu": "^2.0.0" }, @@ -25,7 +22,15 @@ "symfony/phpunit-bridge": "^3.2", "symfony-cmf/routing-bundle": "^1.4|^2.0", "symfony-cmf/testing": "^2.0", - "twig/twig": "^1.18|^2.0" + "twig/twig": "^1.18|^2.0", + "symfony-cmf/core-bundle": "^2.0", + "doctrine/phpcr-bundle": "^1.1", + "doctrine/phpcr-odm": "^1.4.2" + }, + "suggest": { + "doctrine/phpcr-odm": "To enable support for the PHPCR ODM documents (^1.4)", + "doctrine/phpcr-bundle": "To enable support for the PHPCR ODM documents", + "symfony-cmf/core-bundle": "To enable support for publishing workflow" }, "autoload": { "psr-4": { diff --git a/src/PublishWorkflow/Voter/MenuContentVoter.php b/src/PublishWorkflow/Voter/MenuContentVoter.php index cdb52ff9..6c517f6c 100644 --- a/src/PublishWorkflow/Voter/MenuContentVoter.php +++ b/src/PublishWorkflow/Voter/MenuContentVoter.php @@ -74,6 +74,7 @@ public function vote(TokenInterface $token, $object, array $attributes) // now we only abstain or deny if we find a supported attribute // and the content is not publishable $decision = self::ACCESS_ABSTAIN; + continue; }