Commits
-------

5144db26 Merge branch 'master' of github.com:docteurklein/Silex
0fd27b49 removed leading backslash; set autoload of class_exists to false
f3171054 [Autoloading] Made the require_once of the UnviversalClassLoader conditional.

Discussion
----------

Autoloader fix

[Autoloading] Made the require_once of the UnviversalClassLoader conditional.

As we can't know what happened before we require the silex.phar file, we
can't deduce if an autoloader has already been required.
It can lead to fatal errors for cases like it is in SilexBundle.

---------------------------------------------------------------------------

by brikou at 2011/06/27 09:38:43 -0700

👍

Commits
-------

9dcab531 Pitfail about ioncube loader added in documentation. Mistakes in text fixed Issue https://github.com/fabpot/Silex/issues/93
ca41d277 Pitfail about ioncube loader added in documentation Issue https://github.com/fabpot/Silex/issues/93

Discussion
----------

Pitfall with ioncube loader

Pitfall about problem between phar archive and ioncube loader added in documentation
Issue https://github.com/fabpot/Silex/issues/93

---------------------------------------------------------------------------

by laurent35240 at 2011/05/28 07:22:24 -0700

I just changed the text and added the missing blank line.

Do you know btw a good editor for restructured text? It is the first time that I had to modify such documentation format

Commits
-------

bae8c3c8 Added syntax highlighting to `README`

Discussion
----------

Added syntax highlighting to `README`

Commits
-------

c32e0ec7 fixed twig template filename (for form usage)

Discussion
----------

fixed twig template filename (for form usage)

---------------------------------------------------------------------------

by stof at 2011/06/27 13:11:05 -0700

@mgatto This change was part of the beta5 release of Symfony2

---------------------------------------------------------------------------

by mgatto at 2011/06/27 13:32:44 -0700

Thanks. I also wanted that in for documentation purposes if this is pulled in since Symfony2 is a rapidly moving target at this time.

Issue https://github.com/fabpot/Silex/issues/93

Issue https://github.com/fabpot/Silex/issues/93

Conflicts:
	autoload.php

* igorw/doctrine-typo:
  [docs] DoctrineExtension typo

* Refactor RequestContext creation into a RequestContextFactory
* Fix RequestContext argument order (issue #63)
* Allow specifying default ports for HTTP and HTTPS
* Add Controller::requireSecure() to enforce HTTPS on routes
* Refactor UrlGeneratorExtensionTest

* igorw/multi-phar-inclusion:
  Support including a phar from another phar

* igorw/pimple-no-tests:
  exclude pimple tests from phar

The default stubs mess up when you try to run a phar which includes
another phar. In my case I was running pip.phar on the CLI, which
included app.php, which in turn included silex.phar.

It broke the __DIR__ calls. This was able to fix it.

Needs testing in lots of different setups, because the default stubs are
no longer used.