Commit Graph

2350 Commits

Author SHA1 Message Date
Michel Weimerskirch
dfc302722e Documentation corrected in EnsureProductionSettingsDoctrineCommand.php 2011-03-01 20:41:34 +01:00
Fabien Potencier
501bf2fcb6 Merge remote branch 'kriswallsmith/zend/compiled-classes'
* kriswallsmith/zend/compiled-classes:
  [ZendBundle] added classes to compile
2011-03-01 20:39:23 +01:00
Fabien Potencier
fd53035c8d Merge remote branch 'schmittjoh/inlinePassFix'
* schmittjoh/inlinePassFix:
  [DependencyInjection/Compiler] fixes a bug which silently changed the scope of services
2011-03-01 20:38:48 +01:00
Fabien Potencier
d7fa78d790 Merge remote branch 'pborreli/daily-typos'
* pborreli/daily-typos:
  [Tests] Fixed Typo
  [Validator] Fixed Typo
  [Security] Fixed Typo
  [HttpKernel] Fixed Typo
  [Form] Fixed Typo
  [DependencyInjection] Fixed Typo
  [CssSelector] Fixed Typo
  [Doctrine*Bundle] Fixed Typo
  [TwigBundle] Fixed Typo
  [HttpFoundation] Removed remove recurring test
2011-03-01 20:37:54 +01:00
Fabien Potencier
e01c8eecd9 Merge remote branch 'kriswallsmith/assetic/test-coverage'
* kriswallsmith/assetic/test-coverage:
  [AsseticBundle] progress migrating functional tests to unit tests
  [AsseticBundle] changed type to use interface
  [AsseticBundle] added a functional test group
2011-03-01 20:36:56 +01:00
Kris Wallsmith
9283877828 [AsseticBundle] progress migrating functional tests to unit tests 2011-03-01 13:59:50 -05:00
Pascal Borreli
65560b30e1 [Validator] Fixed Typo 2011-03-01 18:58:08 +01:00
Pascal Borreli
843d5a8399 [Security] Fixed Typo 2011-03-01 18:58:08 +01:00
Pascal Borreli
c70824d22c [HttpKernel] Fixed Typo 2011-03-01 18:58:08 +01:00
Pascal Borreli
f3a0b3fd83 [Form] Fixed Typo 2011-03-01 18:58:08 +01:00
Pascal Borreli
b84999ac33 [DependencyInjection] Fixed Typo 2011-03-01 18:58:08 +01:00
Pascal Borreli
d060a3c6ff [CssSelector] Fixed Typo 2011-03-01 18:58:07 +01:00
Pascal Borreli
64b50e1c46 [Doctrine*Bundle] Fixed Typo 2011-03-01 18:58:07 +01:00
Pascal Borreli
19f931a231 [TwigBundle] Fixed Typo 2011-03-01 18:58:07 +01:00
Pascal Borreli
ff44b0ff28 [HttpFoundation] Removed remove recurring test 2011-03-01 18:58:07 +01:00
Kris Wallsmith
d24c52ad38 [AsseticBundle] changed type to use interface 2011-03-01 11:00:19 -05:00
Kris Wallsmith
66c921f093 [AsseticBundle] added a functional test group 2011-03-01 10:49:14 -05:00
Jordi Boggiano
75dbc3a5b8 [Config] Improved exception message a bit 2011-03-01 14:44:24 +01:00
Johannes M. Schmitt
67c886f3df [DependencyInjection/Compiler] fixes a bug which silently changed the scope of services 2011-03-01 13:47:34 +01:00
Kris Wallsmith
26e7470eb3 [ZendBundle] added classes to compile 2011-02-28 19:07:58 -05:00
Kris Wallsmith
35376592c4 [AsseticBundle] fixed fluent formatting 2011-02-28 14:03:42 -05:00
Kris Wallsmith
d57c6657bd [AsseticBundle] added config option to limit which bundles formulae are loaded from 2011-02-28 11:48:25 -05:00
Fabien Potencier
57d0d3fe2f Merge remote branch 'kriswallsmith/assetic/new-resource-interface'
* kriswallsmith/assetic/new-resource-interface:
  [AsseticBundle] updated resource for new interface
2011-02-28 17:18:19 +01:00
Degory Valentine
057e86161e added test to verify ArgvInput->parse() failure with array input definition 2011-02-28 17:16:58 +01:00
Degory Valentine
0306c9aa66 Fixed array argument parsing in ArgvInput. 2011-02-28 17:16:58 +01:00
Kris Wallsmith
8ebec86cab [AsseticBundle] updated resource for new interface 2011-02-28 10:36:51 -05:00
Kris Wallsmith
d6c08f6685 [AsseticBundle] missing argument 2011-02-28 08:14:39 -05:00
Kris Wallsmith
5683c6e6e1 [AsseticBundle] separated read and write paths to facilitate writing assets to a CDN via a custom stream wrapper 2011-02-28 08:14:28 -05:00
Fabien Potencier
2bb2388c3f fixed typo 2011-02-28 12:12:49 +01:00
Matthew Lewinski
cde5f528c2 Fix the Acl schema generator script.
Change 3e818846 in doctrine/dbal introduced a number of new classes in
the Doctrine\DBAL\Platforms\Keywords namespace, so we need to be more
careful here when generating Acl schema, so as to only load Platform
classes and not any others in the same directory.
2011-02-27 16:56:47 -06:00
Jordi Boggiano
9a35851c6b Rename .symfony to .gitkeep which is more standard git practice 2011-02-27 23:29:14 +01:00
Fabien Potencier
3948c2d8a2 [Routing] fixed annotation dir loader auto-reload when a controller class changes 2011-02-27 22:39:54 +01:00
Fabien Potencier
37178fed01 Merge remote branch 'lewinski/radio-infinite-recursion-fix'
* lewinski/radio-infinite-recursion-fix:
  [Form] Fix infinite recursion in RadioField->getName()
2011-02-27 22:35:57 +01:00
Fabien Potencier
d4663505f7 Merge remote branch 'vicb/config'
* vicb/config:
  [Config] Simplify ScalarNode by inheriting from VariableNode
2011-02-27 22:32:11 +01:00
Fabien Potencier
642f8ff71f Merge remote branch 'kriswallsmith/assetic/watch'
* kriswallsmith/assetic/watch:
  [AsseticBundle] added error handling to --watch
  [AsseticBundle] added a simple cache to --watch so it picks up where it left off last time
  [AsseticBundle] added a --watch option to the assetic:dump command
2011-02-27 22:25:45 +01:00
Fabien Potencier
c99a44b1e8 Merge remote branch 'schmittjoh/security'
* schmittjoh/security:
  [Security] added method to retrieve the configured remember-me parameter
  [Security] Copy token attributes when auth providers create a new token from another
2011-02-27 22:20:44 +01:00
Fabien Potencier
c58b6afc38 Merge remote branch 'cristiangsp/Translation_FallbackLocale'
* cristiangsp/Translation_FallbackLocale:
  [Translation] Modified Translation unit test "testTransWithFallbackLocale"
  [Translation] Fixed the addition of the fallbackLocale catalogue to the current locale catalogue.
  [Translation] Added search to FallbackLocale Catalogue.
2011-02-27 21:48:34 +01:00
Fabien Potencier
cdf6851eb3 fixed merge 2011-02-27 21:16:13 +01:00
Fabien Potencier
49f84f1997 Merge remote branch 'lsmith77/code_analyzer_2011_02_27'
* lsmith77/code_analyzer_2011_02_27:
  corrected NonceExpiredException namespace
  issues found by static code analysis
2011-02-27 21:12:31 +01:00
Christophe Coevoet
92bfbf575c Fixed CS 2011-02-27 20:56:29 +01:00
Lukas Kahwe Smith
2bf30f8bb7 corrected NonceExpiredException namespace 2011-02-27 19:46:40 +01:00
Lukas Kahwe Smith
4b3c49550f issues found by static code analysis 2011-02-27 19:34:02 +01:00
Pascal Borreli
5b819261c2 [Yaml] Removed useless else 2011-02-27 18:36:38 +01:00
Pascal Borreli
87452f7515 [Translation] Removed useless else 2011-02-27 18:36:38 +01:00
Pascal Borreli
5a922dae22 [Templating] Removed useless else 2011-02-27 18:36:38 +01:00
Pascal Borreli
787812d968 [Security] Removed useless else 2011-02-27 18:36:38 +01:00
Pascal Borreli
1fcb99b936 [HttpKernel] Removed useless else 2011-02-27 18:36:38 +01:00
Pascal Borreli
fc42cc5066 [HttpFoundation] Removed useless else 2011-02-27 18:36:38 +01:00
Pascal Borreli
03f91ff1e0 [Form] Removed useless else 2011-02-27 18:36:37 +01:00
Pascal Borreli
66f4d8bf6d [DependencyInjection] Removed useless else 2011-02-27 18:36:37 +01:00
Pascal Borreli
2cbaddfd87 [CssSelector] Removed useless else 2011-02-27 18:36:37 +01:00
Pascal Borreli
f7ab114d36 [HttpFoundation] Fixed missing curly brackets 2011-02-27 18:36:37 +01:00
Pascal Borreli
46d28ce1b1 [Console] Removed useless else 2011-02-27 18:36:37 +01:00
Pascal Borreli
96981670ea [BrowserKit] Removed useless else 2011-02-27 18:36:36 +01:00
Pascal Borreli
2a6c5018ae [FrameworkBundle] Removed useless else 2011-02-27 18:36:36 +01:00
Pascal Borreli
1e7a2e13cd [Doctrine*Bundle] Removed old use namespace (Doctrine\Common\Cli) 2011-02-27 18:36:36 +01:00
Pascal Borreli
f7716645a5 [FrameworkBundle] Removed useless else 2011-02-27 18:36:36 +01:00
Pascal Borreli
664c00b62e [DoctrineBundle] Removed useless sprintf 2011-02-27 18:36:36 +01:00
cgonzalez
381d1e2da1 [Translation] Fixed the addition of the fallbackLocale catalogue to the current locale catalogue.
When loading a catalogue the function "optimizeCatalogue" add the fallback catalogue to the current locale catalogue. This should be done by first adding the language catalogue and finally adding the fallbacklocale catalogue specified in the configuration. This subsequent additions are done by the "loadCatalogue" function.

The problem is that in the "loadCatalogue" function exists an if statement that checks if the resource of a given locale exists before loading it. If not, the function simply returns. This return implies that the subsequent addition of the fallbacklocale wouldn't be done.

This has been fixed by simply replacing the current if statement and adding a new one that, if the resource exists, then executes the process of resource loading. Finally, the function continue calling the "optimizeCatalogue" function.
2011-02-27 12:32:46 +01:00
cgonzalez
b6049beca2 [Translation] Added search to FallbackLocale Catalogue.
When the current locale catalogue doesn't contain the id searched, the code doesn't search in the fallbacklocale catalogue (as is explained in the documentation).
Added the search to the fallbacklocale catalogue to the translation function.
2011-02-27 12:32:46 +01:00
Fabien Potencier
a287a619ad Revert "[ZendBundle] added classes to compile"
This reverts commit add21ec4c0.
2011-02-27 08:09:25 +01:00
Johannes Schmitt
97ee92e7b0 Merge branch 'CopyTokenAttributesInProviders' of https://github.com/opensky/symfony into opensky-CopyTokenAttributesInProviders 2011-02-26 21:47:57 +01:00
Johannes Schmitt
621a79f1f2 [Security] added method to retrieve the configured remember-me parameter 2011-02-26 21:44:40 +01:00
Fabien Potencier
de33e14699 Merge remote branch 'kriswallsmith/zend/compiled-classes'
* kriswallsmith/zend/compiled-classes:
  [ZendBundle] added classes to compile
2011-02-26 20:46:27 +01:00
Pascal Borreli
2fbb8e07f8 [Security] Fixed typo 2011-02-26 20:02:06 +01:00
Pascal Borreli
b9a6f9210b [HttpKernel] Fixed typo 2011-02-26 20:02:06 +01:00
Pascal Borreli
f3b9364eae [HttpFoundation] Fixed typo 2011-02-26 20:02:06 +01:00
Pascal Borreli
ddd6d93f9f [Form] Fixed typo 2011-02-26 20:02:06 +01:00
Pascal Borreli
4f2f1c08a9 [EventDispatcher] Fixed typo 2011-02-26 20:02:06 +01:00
Pascal Borreli
1a8ce933e1 [DependencyInjection] Fixed typo 2011-02-26 20:02:05 +01:00
Pascal Borreli
b940046ac4 [CssSelector] Fixed typo 2011-02-26 20:02:05 +01:00
Pascal Borreli
e1ec66cbb8 [Config] Fixed typo 2011-02-26 20:02:05 +01:00
Pascal Borreli
0c9951f676 [TwigBundle] Fixed typo 2011-02-26 20:02:05 +01:00
Pascal Borreli
added08c92 [SecurityBundle] Fixed typo 2011-02-26 20:02:05 +01:00
Pascal Borreli
1dca1ea002 [FrameworkBundle] Fixed typo 2011-02-26 20:02:05 +01:00
Pascal Borreli
ecd3845b80 [DoctrineMongoDBBundle] Fixed typo 2011-02-26 20:02:05 +01:00
Pascal Borreli
68140021fc [DoctrineBundle] Fixed typo 2011-02-26 20:02:05 +01:00
Pascal Borreli
b9c2579f2b [DoctrineAbstractBundle] Fixed typo 2011-02-26 20:02:05 +01:00
Fabien Potencier
e16c666266 [Routing] made an empty path info to redirect to / (as for any other route that ends with a /) 2011-02-26 08:56:44 +01:00
Kris Wallsmith
3ce1d82589 [AsseticBundle] added error handling to --watch 2011-02-25 10:27:51 -08:00
Kris Wallsmith
4816b9e711 [AsseticBundle] added a simple cache to --watch so it picks up where it left off last time 2011-02-25 10:01:01 -08:00
Kris Wallsmith
80256655e2 [AsseticBundle] added a --watch option to the assetic:dump command 2011-02-25 09:52:37 -08:00
Fabien Potencier
f46c6f7e45 [Routing] fixed the %2f problem in URLs 2011-02-25 18:01:32 +01:00
Fabien Potencier
1ee6ad4dad Revert "A command to generate a migration from the sql queries executed when you load some data fixtures."
This reverts commit 0f353c1411.
2011-02-25 17:11:58 +01:00
Fabien Potencier
a0d4250cde Revert "initial steps to handling objects"
This reverts commit 988b8f3736.
2011-02-25 17:11:56 +01:00
Fabien Potencier
11d8ce3976 Revert "cosmetic tweak"
This reverts commit e356c2a902.
2011-02-25 17:11:51 +01:00
Kris Wallsmith
8fedd8d067 [AsseticBundle] renamed some test files to respect the exclude of Resources in phpunit.xml.dist 2011-02-25 06:50:57 -08:00
Fabien Potencier
ad80b09a4f Merge remote branch 'kriswallsmith/assetic/etags'
* kriswallsmith/assetic/etags:
  [AsseticBundle] added etags to controller so changes to filters etc trigger invalidation
2011-02-25 07:19:45 +01:00
Fabien Potencier
ee4db2a5d8 Merge remote branch 'kriswallsmith/assetic/filter-visibility'
* kriswallsmith/assetic/filter-visibility:
  [AsseticBundle] fixed visibility of YUI filters
2011-02-25 07:19:38 +01:00
Kris Wallsmith
968c870c94 [AsseticBundle] added etags to controller so changes to filters etc trigger invalidation 2011-02-24 21:48:51 -08:00
Kris Wallsmith
d4db5319c8 [AsseticBundle] added resources to the routing loader
now the router will be aware of any changes assetic is aware of
2011-02-24 21:05:07 -08:00
Kris Wallsmith
05055d443c [AsseticBundle] fixed formula caching system 2011-02-24 21:05:06 -08:00
Kris Wallsmith
45976aa9a0 [AsseticBundle] fixed visibility of YUI filters 2011-02-24 21:03:09 -08:00
Kris Wallsmith
add21ec4c0 [ZendBundle] added classes to compile 2011-02-24 11:27:16 -08:00
Fabien Potencier
5b92dcf9dd Merge remote branch 'stof/zend_config'
* stof/zend_config:
  Changed default priority to INFO
  [ZendBundle] Added a Configuration class
2011-02-24 17:55:15 +01:00
Fabien Potencier
396fcf15a8 Merge remote branch 'kriswallsmith/assetic/rm-phpcs'
* kriswallsmith/assetic/rm-phpcs:
  [AsseticBundle] removed PHP_CodeSniffer dependency
2011-02-24 17:51:30 +01:00
Christophe Coevoet
0488ebc2e8 Changed default priority to INFO 2011-02-24 17:48:41 +01:00
Christophe Coevoet
192583a225 [ZendBundle] Added a Configuration class 2011-02-24 17:38:40 +01:00
Victor Berchet
3bfb599074 [Config] Simplify ScalarNode by inheriting from VariableNode 2011-02-24 16:31:00 +01:00
Fabien Potencier
691c9f5950 Merge remote branch 'marphi/fix_assetic'
* marphi/fix_assetic:
  [AsseticBundle] fix fatal error - missing argument assetic.asset_manager in definition assetic.asset_manager_cache_warmer serivce
2011-02-24 15:52:13 +01:00