Archived

forked from https://github.com/symfony/symfony

This repository has been archived on 2023-08-20. You can view files and clone it, but cannot push or open issues or pull requests.

Go to file

Fabien Potencier ee9c986790 merged branch Tobion/command-name (PR #3285 ) Commits ------- `447d468` restore previous testing style with static fixtures for console `11585c3` fix Command:asXml to use processed help `304e13d` replaced command names with supported placeholders in help texts Discussion ---------- using the placeholder in command help texts Replaced the command names with the already supported placeholders `%command.name%` and `%command.full_name%`. Thus preventing typos in future commands based on the existing ones. --------------------------------------------------------------------------- by fabpot at 2012-02-09T06:26:07Z That breaks the unit tests. --------------------------------------------------------------------------- by Tobion at 2012-02-09T17:05:06Z fixed --------------------------------------------------------------------------- by stof at 2012-02-09T17:43:47Z can you rebase your branch please ? it conflicts with master --------------------------------------------------------------------------- by stof at 2012-02-09T17:44:11Z the reason is simple: SwiftmailerBundle is gone :) --------------------------------------------------------------------------- by Tobion at 2012-02-09T23:23:23Z done --------------------------------------------------------------------------- by fabpot at 2012-02-11T23:47:10Z Can you squash your commit before I merge this PR? Thanks. --------------------------------------------------------------------------- by Tobion at 2012-02-12T13:57:14Z I'm unable to squash it into 1 commit because of the uptream commits inside. I hope it's fine now. If not someone needs to help me. --------------------------------------------------------------------------- by stof at 2012-02-12T14:27:38Z ``git rebase -i upstream/master`` should allow you rebasing things and squashing them toghter (changing the action for the second commit to ``squash``) --------------------------------------------------------------------------- by Tobion at 2012-02-12T14:47:29Z first i tried with git rebase -i head~4 (4 commits), but this showed many more external commits. second I tried git reset --soft with a clean commit, but still no success. then I used your proposal. and there are always conflicts of stuff that is not part of my PR. now the diff is messed up... this is frustrating --------------------------------------------------------------------------- by stof at 2012-02-12T14:58:43Z The only reason why the diff is messed is because you messed it when resolving the conflicts by choosing the wrong result for the output. Please fix things as it means that merging your PR would revert changes done previosuly --------------------------------------------------------------------------- by stof at 2012-02-12T15:00:18Z Basically, you reverted most of the changes done in Symfony the few last days. --------------------------------------------------------------------------- by Tobion at 2012-02-12T15:10:59Z I used `git checkout --theirs .` when resolving. Whats the correct way? --------------------------------------------------------------------------- by stof at 2012-02-12T15:13:21Z Well, I generally resolve the conflicts myself instead of asking git to use one version, as generally the final code is not one of the versions by a mix of both versions (as both sides are likely to have done useful changes) --------------------------------------------------------------------------- by Tobion at 2012-02-12T15:15:02Z Yes but the conflicts are in files I never touched and that are not part of my changes. I cannot resolve hundreds of files by hand. --------------------------------------------------------------------------- by Tobion at 2012-02-12T15:41:31Z Finally it worked. I used git reset head~1 and then discarded all foreign changes. There you go. --------------------------------------------------------------------------- by Tobion at 2012-02-14T14:06:04Z @fabpot ping --------------------------------------------------------------------------- by Tobion at 2012-02-20T18:20:50Z @fabpot ping --------------------------------------------------------------------------- by stof at 2012-03-02T22:14:49Z @Tobion the branch needs to be rebased. It conflicts with master --------------------------------------------------------------------------- by Tobion at 2012-03-21T04:22:10Z All done. I don't want to squash commits because they are self-contained fixes and changes that might be needed for future references (like the dynamic tests for -`>run()`).		2012-03-21 18:31:29 +01:00
src/Symfony	fix Command:asXml to use processed help	2012-03-21 05:32:51 +01:00
tests	restore previous testing style with static fixtures for console	2012-03-21 05:32:53 +01:00
.gitignore	Added vendor directory to .gitignore	2010-06-24 10:44:28 +02:00
.travis.yml	also test PHP 5.3.2, since this is the official lowest supported PHP version	2011-12-26 01:15:21 +01:00
autoload.php.dist	fixed code coverage raport generation	2012-03-16 15:28:27 +01:00
CHANGELOG-2.0.md	updated CHANGELOG for 2.0.11	2012-02-24 22:59:05 +01:00
CHANGELOG-2.1.md	[Console] Stop parsing options after encountering "--" token	2012-03-16 15:53:13 -04:00
check_cs	[Check CS] don't replace 'else if' on twig files (closes #2961 )	2011-12-27 16:10:32 +01:00
composer.json	fixed typos in composer file	2012-03-15 11:15:25 +01:00
CONTRIBUTORS.md	update CONTRIBUTORS for 2.0.10	2012-02-06 10:49:11 +01:00
LICENSE	Updated LICENSE files copyright	2012-02-22 10:10:37 +01:00
phpunit.xml.dist	Ignore destructive memcached tests by default	2012-02-24 13:37:42 +01:00
README.md	set travis-ci icon to master	2011-11-23 11:36:09 +01:00
UPGRADE-2.1.md	Changelog and upgrading changes.	2012-03-14 21:00:04 +05:45
vendors.php	fixed code coverage raport generation	2012-03-16 15:28:27 +01:00

README.md

README

What is Symfony2?

Symfony2 is a PHP 5.3 full-stack web framework. It is written with speed and flexibility in mind. It allows developers to build better and easy to maintain websites with PHP.

Symfony can be used to develop all kind of websites, from your personal blog to high traffic ones like Dailymotion or Yahoo! Answers.

Requirements

Symfony2 is only supported on PHP 5.3.2 and up.

Installation

The best way to install Symfony2 is to download the Symfony Standard Edition available at http://symfony.com/download.

Documentation

The "Quick Tour" tutorial gives you a first feeling of the framework. If, like us, you think that Symfony2 can help speed up your development and take the quality of your work to the next level, read the official Symfony2 documentation.

Contributing

Symfony2 is an open source, community-driven project. If you'd like to contribute, please read the Contributing Code part of the documentation. If you're submitting a pull request, please follow the guidelines in the Submitting a Patch section.