From 8a246dcd447b6d81bd1e20ff8aa7f8dbb7f61026 Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Wed, 5 Jun 2013 13:39:12 +0200 Subject: [PATCH 1/4] allow master branch to install 2.4-dev --- app/check.php | 7 +++++++ composer.json | 20 ++++++++++---------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/app/check.php b/app/check.php index daa6d0ae5b..91b826befe 100644 --- a/app/check.php +++ b/app/check.php @@ -25,8 +25,13 @@ echo_title('Mandatory requirements'); +$checkPassed = true; foreach ($symfonyRequirements->getRequirements() as $req) { + /** @var $req Requirement */ echo_requirement($req); + if (!$req->isFulfilled()) { + $checkPassed = false; + } } echo_title('Optional recommendations'); @@ -35,6 +40,8 @@ echo_requirement($req); } +exit($checkPassed ? 0 : 1); + /** * Prints a Requirement instance */ diff --git a/composer.json b/composer.json index 4146999f17..0bce7556a1 100644 --- a/composer.json +++ b/composer.json @@ -8,16 +8,16 @@ }, "require": { "php": ">=5.3.3", - "symfony/symfony": "2.3.*", + "symfony/symfony": "~2.3", "doctrine/orm": ">=2.2.3,<2.4-dev", - "doctrine/doctrine-bundle": "1.2.*", - "twig/extensions": "1.0.*", - "symfony/assetic-bundle": "2.3.*", - "symfony/swiftmailer-bundle": "2.3.*", - "symfony/monolog-bundle": "2.3.*", - "sensio/distribution-bundle": "2.3.*", - "sensio/framework-extra-bundle": "2.3.*", - "sensio/generator-bundle": "2.3.*", + "doctrine/doctrine-bundle": "~1.2", + "twig/extensions": "~1.0", + "symfony/assetic-bundle": "~2.3", + "symfony/swiftmailer-bundle": "~2.3", + "symfony/monolog-bundle": "~2.3", + "sensio/distribution-bundle": "~2.3", + "sensio/framework-extra-bundle": "~2.3", + "sensio/generator-bundle": "~2.3", "incenteev/composer-parameter-handler": "~2.0" }, "scripts": { @@ -39,7 +39,7 @@ "config": { "bin-dir": "bin" }, - "minimum-stability": "RC", + "minimum-stability": "dev", "extra": { "symfony-app-dir": "app", "symfony-web-dir": "web", From 7baa790198d8915f27e9fd5e0b16163c9b7752f0 Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Wed, 5 Jun 2013 13:51:21 +0200 Subject: [PATCH 2/4] added a hello world command in demo bundle --- .../DemoBundle/Command/HelloWorldCommand.php | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 src/Acme/DemoBundle/Command/HelloWorldCommand.php diff --git a/src/Acme/DemoBundle/Command/HelloWorldCommand.php b/src/Acme/DemoBundle/Command/HelloWorldCommand.php new file mode 100644 index 0000000000..998cbcdf24 --- /dev/null +++ b/src/Acme/DemoBundle/Command/HelloWorldCommand.php @@ -0,0 +1,48 @@ +getContainer(). + * + * @author Tobias Schultze + */ +class HelloWorldCommand extends Command +{ + /** + * {@inheritdoc} + */ + protected function configure() + { + $this + ->setName('acme:hello') + ->setDescription('Hello World example command') + ->addArgument('who', InputArgument::OPTIONAL, 'Who to greet.', 'World') + ->setHelp(<<%command.name% command greets somebody or everybody: + +php %command.full_name% + +The optional argument specifies who to greet: + +php %command.full_name% Fabien +EOF + ); + } + + /** + * {@inheritdoc} + */ + protected function execute(InputInterface $input, OutputInterface $output) + { + $output->writeln(sprintf('Hello %s!', $input->getArgument('who'))); + } +} From b47328a0c4bd20462beb606c800ff95ceade41b1 Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Wed, 5 Jun 2013 14:38:36 +0200 Subject: [PATCH 3/4] configure the log to console handler we require ~2.4 now as we use a new feature that was introduced in 2.4 --- app/config/config_dev.yml | 17 ++++++++++------- app/config/config_prod.yml | 2 ++ composer.json | 4 ++-- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml index 4bb7c8ba8f..c5619149ca 100644 --- a/app/config/config_dev.yml +++ b/app/config/config_dev.yml @@ -14,15 +14,18 @@ web_profiler: monolog: handlers: main: - type: stream - path: %kernel.logs_dir%/%kernel.environment%.log - level: debug + type: stream + path: %kernel.logs_dir%/%kernel.environment%.log + level: debug + console: + type: console + bubble: false firephp: - type: firephp - level: info + type: firephp + level: info chromephp: - type: chromephp - level: info + type: chromephp + level: info assetic: use_controller: true diff --git a/app/config/config_prod.yml b/app/config/config_prod.yml index e125e75258..ceba8197cb 100644 --- a/app/config/config_prod.yml +++ b/app/config/config_prod.yml @@ -21,3 +21,5 @@ monolog: type: stream path: %kernel.logs_dir%/%kernel.environment%.log level: debug + console: + type: console diff --git a/composer.json b/composer.json index 0bce7556a1..c69c3a9c89 100644 --- a/composer.json +++ b/composer.json @@ -8,13 +8,13 @@ }, "require": { "php": ">=5.3.3", - "symfony/symfony": "~2.3", + "symfony/symfony": "~2.4", "doctrine/orm": ">=2.2.3,<2.4-dev", "doctrine/doctrine-bundle": "~1.2", "twig/extensions": "~1.0", "symfony/assetic-bundle": "~2.3", "symfony/swiftmailer-bundle": "~2.3", - "symfony/monolog-bundle": "~2.3", + "symfony/monolog-bundle": "~2.4", "sensio/distribution-bundle": "~2.3", "sensio/framework-extra-bundle": "~2.3", "sensio/generator-bundle": "~2.3", From 0cafa504b6d1235c901d127da01c996219341e6c Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Wed, 5 Jun 2013 15:14:52 +0200 Subject: [PATCH 4/4] also allow doctrine 2.4 to be installed --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index c69c3a9c89..c61f13ca4c 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ "require": { "php": ">=5.3.3", "symfony/symfony": "~2.4", - "doctrine/orm": ">=2.2.3,<2.4-dev", + "doctrine/orm": "~2.2,>=2.2.3", "doctrine/doctrine-bundle": "~1.2", "twig/extensions": "~1.0", "symfony/assetic-bundle": "~2.3",