Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Here are the aliases for the orm and mongodb odm #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 10 commits into from
Closed

Here are the aliases for the orm and mongodb odm #14

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8fbf196
Adding orm: and mongodb: annotation aliases to avoid conflicts. Recom…
jwage Oct 2, 2010
e88c0b7
[DoctrineBundle] fixed previous commit
fabpot Oct 3, 2010
c2f856f
[FrameworkBundle] fixed comment
fabpot Oct 4, 2010
a380692
Fix namespace collision
ornicar Oct 4, 2010
2525998
replaced form field rendering with plain templates
fabpot Sep 9, 2010
ff683a6
Integrating new data fixtures code.
jwage Oct 5, 2010
3bc3115
Adding setLogger for data fixtures.
jwage Oct 5, 2010
c6ed593
fixed unit tests
fabpot Oct 5, 2010
36a31ec
Fixing container test.
jwage Oct 5, 2010
50044cb
Fixing old path to new one.
jwage Oct 5, 2010
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix namespace collision
  • Loading branch information
@ornicar @fabpot
ornicar authored and fabpot committed Oct 4, 2010
commit a38069288ce2f5d37237196531200d7a7cd291cf
4 changes: 2 additions & 2 deletions 4 src/Symfony/Bundle/FrameworkBundle/Client.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
use Symfony\Component\HttpKernel\Client as BaseClient;
use Symfony\Component\BrowserKit\History;
use Symfony\Component\BrowserKit\CookieJar;
use Symfony\Component\HttpKernel\Profiler\Profiler;
use Symfony\Component\HttpKernel\Profiler\Profiler as HttpProfiler;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;

Expand Down Expand Up @@ -67,7 +67,7 @@ public function getKernel()
/**
* Gets a profiler for the current Response.
*
* @return Profiler A Profiler instance
* @return HttpProfiler A Profiler instance
*/
public function getProfiler()
{
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.