Commit Graph

6841 Commits

Author SHA1 Message Date
H. Westphal
a0329c37c9 Added lifetime/cleanup support. 2011-09-19 22:37:12 +02:00
Fabien Potencier
1ec6c8ddde updated CHANGELOG for 2.1 2011-09-19 18:03:40 +02:00
Fabien Potencier
89b9674266 merged branch schmittjoh/configFix (PR #2197)
Commits
-------

83199ae [FrameworkBundle] Fix unintuitive merging behavior for assets_base_urls
4061114 [FrameworkBundle] fixes unintuitive merging behavior

Discussion
----------

[FrameworkBundle] fixes unintuitive merging behavior

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

by fabpot at 2011/09/16 10:04:53 -0700

I think this is a "bug", no? If this is the case, then we need to fix the 2.0 branch.

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

by schmittjoh at 2011/09/17 00:34:14 -0700

It is a change in behavior, but whether or how you want to merge this is really up to you.

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

by jmikola at 2011/09/19 08:09:26 -0700

I was about to create a PR for this very same quirk, as this was causing my CDN's for various environments to all get merged together. I think we can get away with merging it directly to 2.0 since `assets_base_urls` are hardly covered in the documentation at all.

Once this gets merged, I wouldn't mind writing up a blurb on them to explain how the shorthand syntax works and this merging strategy.

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

by jmikola at 2011/09/19 08:28:21 -0700

I just noticed this PR only fixes the `base_urls` config option under `packages`. We should also correct this behavior for `assets_base_urls`, which appears further up in FrameworkBundle's Configuration.php file.

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

by jmikola at 2011/09/19 08:44:57 -0700

@schmittjoh: I have the second commit for this sitting in https://github.com/jmikola/symfony/tree/configFix (rebased on your branch) if you'd prefer to merge that into your branch to update this PR.

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

by schmittjoh at 2011/09/19 08:55:42 -0700

Merged it in. Thanks.

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

by fabpot at 2011/09/19 09:01:27 -0700

ok, I'm going to merge this into master.

@jmikola: Can you submit documentation for the new way?
2011-09-19 18:01:46 +02:00
Johannes Schmitt
c0e6118050 yet another fix 2011-09-19 17:53:25 +02:00
Jeremy Mikola
83199aec00 [FrameworkBundle] Fix unintuitive merging behavior for assets_base_urls
See: 4061114562
2011-09-19 11:42:07 -04:00
Fabien Potencier
9a886ac73f merged branch stealth35/trans_ini (PR #2212)
Commits
-------

903ab81 [Translation] support Ini file

Discussion
----------

[Translation] support Ini file
2011-09-19 17:13:47 +02:00
stealth35
903ab81434 [Translation] support Ini file 2011-09-19 17:00:58 +02:00
Johannes Schmitt
cb9383dc09 some more fixes 2011-09-19 16:37:34 +02:00
Johannes Schmitt
7a20b89734 fixes some typos 2011-09-19 16:25:18 +02:00
Johannes Schmitt
ac765fcb6e avoid circular references 2011-09-19 14:48:19 +02:00
Johannes Schmitt
9b025b795c fixed typo 2011-09-19 14:48:19 +02:00
Fabien Potencier
9703aac268 [FrameworkBundle] fixed Translator to also load the fallback catalog 2011-09-19 09:01:12 +02:00
Fabien Potencier
80abf56e92 [FrameworkBundle] fixed a unit test 2011-09-19 08:55:18 +02:00
Fabien Potencier
ed05e7a5f6 merged 2.0 2011-09-19 08:53:42 +02:00
Fabien Potencier
b635dcad7a [Translator] fixed non-loaded locale 2011-09-19 08:52:59 +02:00
Fabien Potencier
184bbe7b24 merged branch hason/czechvalidators (PR #2150)
Commits
-------

b9b6084 [FrameworkBundle] Updated Czech translations for image validator

Discussion
----------

[FrameworkBundle] Updated Czech translations for image validator

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

by stof at 2011/09/10 12:10:08 -0700

Could you send a PR against the 2.0 branch for the trans-unit up to 41 which are already part of 2.0 ? Adding 42 to 46 should then still be done in master as they are new for 2.1
2011-09-19 08:47:36 +02:00
Fabien Potencier
1b66af1b99 [WebProfilerBundle] fixed CS, tweaked a sentence 2011-09-19 08:26:03 +02:00
Fabien Potencier
0c39eece06 [FrameworkBundle] fixed configuration 2011-09-19 08:13:52 +02:00
Fabien Potencier
b8303f3995 merged branch alexandresalome/toolbar-js-error (PR #2205)
Commits
-------

c6b15b3 [WebProfilerBundle] Variables only used once
847c665 [WebProfilerBundle] Use panel URL for debugging toolbar
fe13a6c [WebProfilerBundle] Fix CS
fe76d74 [WebProfilerBundle] Propose to open debug toolbar request in an error occured.

Discussion
----------

[WebProfilerBundle] Propose to open debug toolbar request in an error occ

[WebProfilerBundle] Propose to open debug toolbar request in an error occured.

This is very useful when creating data collectors and an error occurs
when redering the toolbar via XHR.

The only problem is that the exception page renders the toolbar via JS, too.

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

by stof at 2011/09/17 05:26:10 -0700

IMO, you should propose to open the link to the profiler (if the profiler is enabled) instead of opening the toolbar alone

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

by alexandresalome at 2011/09/17 05:34:50 -0700

Thanks @stof

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

by alexandresalome at 2011/09/17 05:50:11 -0700

4 commits for 2 lines... I should change my job. Thanks @stof, again
2011-09-19 07:44:51 +02:00
Fabien Potencier
92727f833f merged branch jalliot/default-asset-version-format (PR #2199)
Commits
-------

9fe87be More explicit default value for assets_version_format

Discussion
----------

Fixed default asset version format

This is not needed as it is already the value that is set when null in ``Symfony\Component\Templating\Asset\Package`` but that would make it clearer for people who just read the configuration.
2011-09-19 07:43:17 +02:00
Fabien Potencier
19b2be1353 merged branch naknak/ticket_2200 (PR #2201)
Commits
-------

78c630c Added access to Doctrine's ValidateSchema command from the console. See ticket 2200.

Discussion
----------

Added access to Doctrine's ValidateSchema command from the console.

See ticket 2200.

Add a trivial Proxy wrapper class to access Doctrine's ValidateSchema() command from app/console
2011-09-19 07:38:34 +02:00
Fabien Potencier
8c64202979 merged branch Seldaek/wintest (PR #2204)
Commits
-------

88ebe0c Adjust the way of checking for windows

Discussion
----------

Adjust the way of checking for windows
2011-09-19 07:36:55 +02:00
Fabien Potencier
27506bc361 merged branch stealth35/master (PR #2211)
Commits
-------

c645314 Missing ResourceBundle service

Discussion
----------

[FrameworkBundle] Missing ResourceBundle service in translation.xml
2011-09-19 07:33:28 +02:00
stealth35
c6453146cf Missing ResourceBundle service 2011-09-18 17:13:32 +03:00
Fabien Potencier
0826d1c717 [WebProfilerBundle] added a way to filter logs by priority 2011-09-18 16:03:08 +02:00
Fabien Potencier
dde8b6aa25 merged branch hason/czech-2.0 (PR #2203)
Commits
-------

620d44a [FrameworkBundle] updated Czech translation

Discussion
----------

[2.0] Updated Czech translation
2011-09-18 09:44:02 +02:00
Fabien Potencier
2d4cb2e99c merged branch stof/subrequest_fix (PR #2208)
Commits
-------

ab8e760 Fixed the creation of the subrequests

Discussion
----------

Fixed the creation of the subrequests

The subrequest must be created using an absolute path to keep the
informations about the host and the base path.
Closes #2168
2011-09-18 09:41:15 +02:00
Christophe Coevoet
ab8e760c68 Fixed the creation of the subrequests
The subrequest must be created using an absolute path to keep the
informations about the host and the base path.
Closes #2168
2011-09-18 00:24:28 +02:00
Fabien Potencier
6fa1d64f84 Merge branch '2.0'
* 2.0:
  [HttpKernel] fixed typo
  fixed previous merge, done the same change to other occurences
  fixes usage of mb_*
  Profiler session import fixed.
  [Process] workaround a faulty implementation of is_executable on Windows
  Swedish translation fix.
  [Locale] Fix #2179 StubIntlDateFormatter support yy format
  Fixed fourth argument of Filesystem->mirror()
2011-09-17 22:18:22 +02:00
Fabien Potencier
677a072554 [HttpKernel] fixed typo 2011-09-17 22:16:16 +02:00
Martin Hasoň
620d44a398 [FrameworkBundle] updated Czech translation 2011-09-17 15:25:49 +02:00
alexandresalome
c6b15b37db [WebProfilerBundle] Variables only used once 2011-09-17 14:48:42 +02:00
alexandresalome
847c665e69 [WebProfilerBundle] Use panel URL for debugging toolbar 2011-09-17 14:33:26 +02:00
alexandresalome
fe13a6ca65 [WebProfilerBundle] Fix CS 2011-09-17 14:26:06 +02:00
alexandresalome
fe76d746ec [WebProfilerBundle] Propose to open debug toolbar request in an error occured.
This is very useful when creating data collectors and an error occurs
when redering the toolbar via XHR.
2011-09-17 14:16:35 +02:00
Jordi Boggiano
88ebe0cfc4 Adjust the way of checking for windows 2011-09-17 12:57:47 +02:00
Neil Katin
78c630ca2d Added access to Doctrine's ValidateSchema command from the console.
See ticket 2200.
2011-09-16 16:49:37 -07:00
Jordan Alliot
9fe87becd8 More explicit default value for assets_version_format 2011-09-16 18:14:28 +01:00
Fabien Potencier
bc8ed44945 updated CHANGELOG for 2.1 2011-09-16 18:49:11 +02:00
Fabien Potencier
42407d688a merged branch alexandresalome/framework-use-file-storage (PR #2195)
Commits
-------

046a125 [FrameworkBundle] Set the file storage as default storage for Symfony2

Discussion
----------

[FrameworkBundle] Set the file storage as default storage for Symfony2

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

by Seldaek at 2011/09/16 07:41:48 -0700

What's the reasoning behind this? Is SQLite causing issues? Isn't it faster than file storage?

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

by alexandresalome at 2011/09/16 07:50:50 -0700

3 reasons :

* The file storage is faster than the SQLite storage (see https://github.com/symfony/symfony/pull/1772)
* It's the only reason why Symfony2 is dependent of SQLite
* SQLite profiler has problems with concurrency (especially when concurrent access occurs).

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

by Seldaek at 2011/09/16 07:51:50 -0700

Ok sorry I missed the other PR. Sounds great :)
2011-09-16 18:46:54 +02:00
Fabien Potencier
ea7f0f9c46 merged branch jalliot/fix-mirror-arg (PR #2050)
Commits
-------

95dc7e1 Fixed fourth argument of Filesystem->mirror()

Discussion
----------

Fixed fourth argument of Filesystem->mirror()

See #2027 and #2033 for discussion.

@fabpot said that we don't want to use symlink at all on Windows so if this is confirmed, we should also change ``Filesystem->symlink()`` implementation.

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

by alexandresalome at 2011/09/16 08:29:40 -0700

Tested on Windows, OK for me
2011-09-16 18:32:22 +02:00
Johannes M. Schmitt
4061114562 [FrameworkBundle] fixes unintuitive merging behavior 2011-09-16 17:09:10 +02:00
alexandresalome
046a125ef7 [FrameworkBundle] Set the file storage as default storage for Symfony2 2011-09-16 15:45:17 +02:00
Fabien Potencier
e0502b1d69 fixed previous merge, done the same change to other occurences 2011-09-16 14:38:31 +02:00
Fabien Potencier
607337b022 merged branch schmittjoh/mbFix (PR #2194)
Commits
-------

8e2cbe6 fixes usage of mb_*

Discussion
----------

Fixes usage of mb_strlen

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

by Seldaek at 2011/09/16 05:33:45 -0700

This will fail if the mbstring ext isn't enabled, you should still test for the mb_ function first.
2011-09-16 14:35:35 +02:00
Johannes M. Schmitt
8e2cbe603b fixes usage of mb_* 2011-09-16 14:27:56 +02:00
Denis Klementjev
fd4d241b17 Profiler session import fixed. 2011-09-16 13:51:26 +02:00
Fabien Potencier
61487cb6f7 merged branch schmittjoh/resourceOptimization (PR #2193)
Commits
-------

a1491e8 added some missing accessors/mutators

Discussion
----------

added some missing accessors/mutators
2011-09-16 13:49:30 +02:00
Johannes M. Schmitt
a1491e8b54 added some missing accessors/mutators 2011-09-16 13:43:09 +02:00
Fabien Potencier
83b69e6d8c [Translation] renamed a method 2011-09-16 13:27:17 +02:00