Commit Graph

3228 Commits

Author SHA1 Message Date
Tigran Azatyan
249164d9b2 fixed typos 2011-10-10 14:44:40 +06:00
Tigran Azatyan
f4b78051fc Edited src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.hy.xliff via GitHub 2011-10-10 14:42:02 +06:00
Tigran Azatyan
4cc1ed004c Edited src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.hy.xliff via GitHub 2011-10-10 14:29:06 +06:00
Tigran Azatyan
6a23e5fabf fixed typos 2011-10-10 14:27:36 +06:00
Tigran Azatyan
5b9d92ae62 Fixed some errors 2011-10-09 16:45:31 +06:00
Fabien Potencier
a1adef7fd1 merged branch tigranazatyan/master (PR #2361)
Commits
-------

f49bbb7 updated
319fd9c Updated the file
0dc8c3f Edited src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.hy.xliff via GitHub
25d7596 Added 42-48 messages to Armenian translation

Discussion
----------

Armenian Translation (new)

updated armenian translation file for Framework Bundle
2011-10-09 08:37:44 +02:00
Alessio
dd0d6fd15b fixing italian messages 2011-10-09 02:40:44 +03:00
Tigran Azatyan
f49bbb7498 updated 2011-10-09 04:04:49 +06:00
Tigran Azatyan
319fd9ced3 Updated the file 2011-10-09 04:02:26 +06:00
Tigran Azatyan
0dc8c3f536 Edited src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.hy.xliff via GitHub 2011-10-09 03:20:20 +06:00
Tigran Azatyan
25d7596407 Added 42-48 messages to Armenian translation 2011-10-09 03:19:37 +06:00
Fabien Potencier
a8faa83708 merged 2.0 2011-10-08 22:58:00 +02:00
Tigran Azatyan
d2d849cf60 First 2011-10-08 22:57:17 +02:00
Fabien Potencier
36f619b57d merged branch tigranazatyan/master (PR #2359)
Commits
-------

05663ec First

Discussion
----------

Armenian Translation

I added armenian translation to Framework Bundle Validators

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

by stof at 2011/10/08 13:48:31 -0700

Can you do a PR based on the 2.0 branch instead ?

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

by tigranazatyan at 2011/10/08 13:51:03 -0700

I do not have skills using github, please do it yourself:)
2011-10-08 22:56:09 +02:00
Tigran Azatyan
05663ec527 First 2011-10-09 01:07:53 +05:00
Fabien Potencier
74bc699b27 moved management of the locale from the Session class to the Request class
The locale management does not require sessions anymore.

In the Symfony2 spirit, the locale should be part of your URLs. If this is the case
(via the special _locale request attribute), Symfony will store it in the request
(getLocale()).

This feature is now also configurable/replaceable at will as everything is now managed
by the new LocaleListener event listener.

How to upgrade:

The default locale configuration has been moved from session to the main configuration:

Before:

framework:
    session:
        default_locale: en

After:

framework:
    default_locale: en

Whenever you want to get the current locale, call getLocale() on the request (was on the
session before).
2011-10-08 18:34:49 +02:00
Christian Raue
2e5869db00 fixed "using $this when not in object context" error for 2.0 branch (replaces #2353) 2011-10-08 14:05:33 +02:00
Fabien Potencier
89fd9653b4 merged branch Seldaek/trans_charset (PR #2339)
Commits
-------

5473d3b [Translation] Allow use of UTF-8 encoded catalogues into non-UTF-8 applications
deb6dea [Translation] Add failing tests to verify that UTF-8 lang files can't be used with another charset

Discussion
----------

Allow use of UTF-8 catalogues in non-UTF-8 applications

This is #2313 but targetting the master branch.

Bug fix: yes
Feature addition: ?:)
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: -

The problem I'm having is that, while porting an existing app, we are using UTF-8 everywhere to have a migration path ready, but the current application and DB is still in ISO-8859-1, which means translations containing accented chars are broken.

Also, we didn't hit the issue yet since we don't use forms much, but I imagine we would have similar issues with core translations for the validator which are all UTF-8 encoded.

Note that I explicitly suppressed this conversion in case your application is setup as UTF-8, to make sure most people are not affected by any slow down this introduces.
2011-10-07 12:00:26 +02:00
Jordi Boggiano
5473d3b6c9 [Translation] Allow use of UTF-8 encoded catalogues into non-UTF-8 applications 2011-10-07 11:21:05 +02:00
Helmer Aaviksoo
c4226bb6dc Removed redundant "@return void"-s 2011-10-07 11:15:35 +03:00
Fabien Potencier
0e852fe232 Merge branch '2.0'
* 2.0:
  [DoctrineBundle] fixed a unit test (detected thanks to PHP 3.6.0)
  [Form] Fixed lacking attributes in DateTimeType
2011-10-06 21:40:44 +02:00
Fabien Potencier
15f19e50fc [DoctrineBundle] fixed a unit test (detected thanks to PHP 3.6.0) 2011-10-06 21:40:38 +02:00
Fabien Potencier
3f567b8208 [FrameworkBundle] moved a parameter in the same file as the one where the service is defined for better consistency 2011-10-05 19:17:58 +02:00
Fabien Potencier
69922c41a9 merged branch SongoQ/polish_translations (PR #2319)
Commits
-------

4909169 Typo, should be "znaków"

Discussion
----------

[FrameworkBundle] Polish validator translations - Typo, should be "znaków"
2011-10-04 16:20:42 +02:00
Marcin Chylek
4909169ca4 Typo, should be "znaków" 2011-10-04 15:05:36 +02:00
Deni
9219cf9f7d [FrameworkBundle] Sync the Russian translations with the SizeLength constraint 2011-10-04 16:49:04 +04:00
Fabien Potencier
1fa3d8e701 merged branch SongoQ/polish_translations (PR #2315)
Commits
-------

31840b9 Updated Polish validator translations (trans-unit id="47" and id="48")

Discussion
----------

Updated Polish validator translations (trans-unit id="47" and id="48")
2011-10-04 09:36:45 +02:00
Fabien Potencier
d81131ea65 merged branch alifity/id-trans-unit-47-48 (PR #2316)
Commits
-------

8404b35 Updated indonesian translations for trans-unit 47 and 48

Discussion
----------

Updated indonesian translations for trans-unit 47 and 48
2011-10-04 09:36:35 +02:00
Fabien Potencier
fbe9aa526e merged 2.0 2011-10-04 09:32:13 +02:00
Alif Rachmawadi
8404b354ba Updated indonesian translations for trans-unit 47 and 48 2011-10-04 10:26:20 +07:00
Marcin Chylek
31840b97c6 Updated Polish validator translations (trans-unit id="47" and id="48") 2011-10-03 23:13:07 +02:00
excelwebzone
eac2a7781d Oops.. translated the variable by mistake 2011-10-03 07:50:24 -07:00
excelwebzone
51b3b59b54 Updated Hebrew validator translations (trans-unit id="48") 2011-10-03 07:48:23 -07:00
Arnout Boks
0299d38570 [FrameworkBundle] Updated Dutch validator translations 2011-10-01 14:26:33 +02:00
Jordan Alliot
f9b2be9c9c Added french translation for SizeLength and UserPassword constraints 2011-09-30 22:56:56 +02:00
Fabien Potencier
6295e55329 [DoctrineBundle] made the previous fix only available in the development environment 2011-09-30 18:10:34 +02:00
Fabien Potencier
87416b4756 [DoctrineBundle] tweaked previous merge 2011-09-30 18:08:38 +02:00
Fabien Potencier
4790a5e43f merged branch Gregwar/proxy_file_issue (PR #1968)
Commits
-------

0e00e3f [DoctrineBundle] CS
0c4b793 [DoctrineBundle] Fixed performances issues on "On-demand" proxy file generation
e866a67 [DoctrineBundle] Tries to auto-generate the missing proxy files on the autoloader

Discussion
----------

[DoctrineBundle] Tries to auto-generate the missing proxy files on the autoloaded

See:
https://github.com/symfony/symfony/issues/1965
https://github.com/symfony/symfony/issues/1535

This fix is not really clean and there's maybe a factorizing work to do on it, but this work and avoid me spending my day deleting session cookies each time I clear cache.

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

by stloyd at 2011/08/23 10:37:28 -0700

You should follow Symfony2 CS (http://symfony.com/doc/current/contributing/code/standards.html).

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

by ruudk at 2011/09/26 02:50:13 -0700

+1

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

by fabpot at 2011/09/27 07:01:51 -0700

It looks like a bug fix, so this PR should be closed and a new one based on the 2.0 branch should be open. @beberlei: are you fine with this patch?

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

by beberlei at 2011/09/29 04:24:22 -0700

What is this for? I dont understand the bug and the solution here screams cache slam.

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

by beberlei at 2011/09/29 04:34:02 -0700

Ok i get the problem but the solution is still a monsterous hack. Can we find a real solution to the problem? There has to be one.

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

by Gregwar at 2011/09/29 04:34:25 -0700

@beberlei, when an user is authenticated for instance, there can be proxies serialized in session.

Si if you clear the cache in dev environment you'll get an error because the matching proxy classes won't exist and you'll be forced to clear your cookies and reauth, which can be annoying

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

by Gregwar at 2011/09/29 04:38:45 -0700

@beberlei, yes, I agree that we should do something more elegant, but the problem is that when PHP "meet" the proxy class we can't really know what was the "original" class it is supposed to extend

And as @schmittjoh said, this will only be executed very rarely

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

by beberlei at 2011/09/29 05:18:35 -0700

You agree you want something more suitable and still want this to be merged?

To ease the immediate pain wr could allow this however only in debug mode. A real solution here is maybe to move the proxy files out of the env folders. Rhey dont depend ont the env after all.

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

by stloyd at 2011/09/29 05:21:33 -0700

Proxy is not depending on env, but generation of proxy is... So this solution will be hard IMO, or even unacceptable...

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

by Gregwar at 2011/09/29 05:25:39 -0700

@beberlei what I meant is that I agree that's dirty but I don't think of anything better to solve this...

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

by fabpot at 2011/09/29 06:23:03 -0700

Even if the current patch is not the best solution, we should probably apply it to fix the problem and think about a better solution afterwards. Does it sound good for everybody?
2011-09-30 18:07:40 +02:00
Fabien Potencier
b3ea939c35 merged branch jalliot/event-subscriber (PR #2021)
Commits
-------

3223c5a Removed now useless test
21cf0ac Backported new behaviour from PR #2148 and removed check for interface at run-time
8b240d4 Implementation of kernel.event_subscriber tag for services.

Discussion
----------

Added missing kernel.event_subscriber tag (closes #2012)

This PR adds a ``kernel.event_subscriber`` tag which allows to register services as event subscribers in the same way ``kernel.event_listener`` allows to register them as event listeners.
The service is still lazy loaded and the DIC does not need to be recompiled for every modification in the service's code.

There is one important thing to remember:
If the service is created by a factory, the class parameter **MUST** reflect the real class of the service, although it is not needed at the moment for the DIC. For that issue, we could either forbid services created by factories or add a note to the documentation.

This PR closes #2012.

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

by jalliot at 2011/08/24 06:42:18 -0700

I'm not sure the test is good enough so feel free to add some more.

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

by jalliot at 2011/08/25 03:46:20 -0700

I re-implemented the check for EventSubscriberInterface in ContainerAwareEventDispatcher because I think the overhead is minimum and it allows to use this method even without the tag (at run-time).
I also added some tests for RegisterKernelListenersPass.

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

by stof at 2011/09/04 02:42:00 -0700

@jalliot Your branch conflicts with the current master. could you rebase it ?

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

by jalliot at 2011/09/04 02:57:03 -0700

Rebased

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

by jalliot at 2011/09/13 02:19:46 -0700

@fabpot What do you think about this PR? At the moment, the subscribers are not really usable in Symfony2 because of the lack of this tag.

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

by fabpot at 2011/09/13 04:17:46 -0700

I don't like subscribers. There are other PRs on adding more support for them, but the reality is that they are complex for no added benefit. I'm wondering if it wouldn't be better to just remove them altogether.

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

by jalliot at 2011/09/13 04:38:20 -0700

@fabpot Well I prefer listeners too but I think that if Symfony2 does support subscribers (which it does at the moment), it should do it properly and completely, thus allowing to register subscriber services like here or to register several methods for one same event like in #2148.
But I guess that if you merged those 2 PRs (well actually this one would have to be modified first if #2148 is merged but I'll do it then), many use cases would be covered and people should stop asking for more support :) (except maybe for removing the static modifier but this would be wrong IMO and prevent entirely this PR).

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

by fabpot at 2011/09/28 11:47:10 -0700

@jalliot: #2148 has been merged. Can you update this PR accordingly? thanks.

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

by jalliot at 2011/09/28 12:00:44 -0700

Sure thing. Will do it as well as removing the check for the interface tonight or tomorrow :)

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

by jalliot at 2011/09/29 08:53:17 -0700

@fabpot Check for interface removed and #2148 merged. Also rebased on latest master.

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

by fabpot at 2011/09/29 09:09:11 -0700

Tests do not pass.

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

by jalliot at 2011/09/29 09:18:48 -0700

@fabpot Fixed
2011-09-29 23:27:29 +02:00
Jordan Alliot
3223c5a1f3 Removed now useless test 2011-09-29 18:17:30 +02:00
Jordan Alliot
21cf0ac5d7 Backported new behaviour from PR #2148 and removed check for interface at run-time 2011-09-29 17:49:53 +02:00
Jordan Alliot
8b240d4c22 Implementation of kernel.event_subscriber tag for services. 2011-09-29 17:44:16 +02:00
Fabien Potencier
e6867bb2e0 [SwiftmailerBundle] added swiftmailer dependency in composer.json 2011-09-29 17:42:52 +02:00
Fabien Potencier
245ff6d7a8 updated composer.json for 2.1 2011-09-29 17:40:43 +02:00
Fabien Potencier
f5ab6ec934 Merge branch '2.0'
* 2.0:
  [composer] add missing deps for FrameworkBundle
  [composer] change ext/intl to the new ext-intl syntax
  [composer] fix monolog-bridge composer.json, add more inter-component deps
  [composer] add composer.json
2011-09-29 17:29:32 +02:00
Fabien Potencier
5c760b0d40 merged branch igorw/composer (PR #2275)
Commits
-------

731b28b [composer] add missing deps for FrameworkBundle
9c8f100 [composer] change ext/intl to the new ext-intl syntax
d535afe [composer] fix monolog-bridge composer.json, add more inter-component deps
9ade639 [composer] add composer.json

Discussion
----------

Composer

This PR adds a composer.json file for [composer](https://github.com/composer/composer) ([more info](packagist.org/about-composer)).

For discussion you can also go into #composer-dev on freenode and argue with naderman, seldaek and everzet.

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

by naderman at 2011/09/26 15:51:51 -0700

You haven't entered any keywords, they might come in handy when searching for packages on packagist.

But really this is just a +1 ;-)

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

by stof at 2011/09/26 16:12:21 -0700

See my comments on your previous (non-rebased) commit: f1c0242b5a

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

by igorw at 2011/09/27 00:04:36 -0700

Following dependencies do not have a composer.json yet: Twig, Doctrine (orm, dbal, common), swiftmailer.

Also missing from the standard edition: assetic, twig-extensions, jsm-metadata, SensioFrameworkExtraBundle, JMSSecurityExtraBundle, SensioDistributionBundle, SensioGeneratorBundle, AsseticBundle.

The point is, those can be added later on. Having the components composerized is already a leap forward. Also, doctrine depends on some symfony components, we've got to start somewhere.

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

by Seldaek at 2011/09/27 00:36:41 -0700

Also, just for information, the plan is to have `symfony/framework-bundle` be the "framework", with all dependencies to doctrine etc, though we should really only have strict requirements in there, and then in symfony-standard we ship a composer.json that requires the framework-bundle, doctrine-orm and things like that that are not essential to core. Otherwise people don't have a choice about what they use anymore.

Just a comment btw, the json is invalid, all / should be escaped. However json_decode is nice enough to parse those without complaining, browsers do too, even Crockford's json2.js does, so I'm not sure if we should privilege readability over strictness, since it seems nobody really cares about this escaping.

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

by igorw at 2011/09/27 00:41:39 -0700

So, I've implemented all of @stof's suggestions, except (for reasons stated above):

* doctrine to DoctrineBundle
* swiftmailer to SwiftmailerBundle
* twig to TwigBundle
* doctrine-common to Validator
* FrameworkBundle (what exactly does it depend on?)

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

by stof at 2011/09/27 00:52:31 -0700

@igorw at least HttpKernel, Routing, Templating, EventDispatcher, Doctrine Common (annotations cannot be disabled), Translator, Form (optional), Validator (optional), Console (optional). See the service definitions to see the others

@Seldaek FrameworkBundle does not depend on Doctrine, except for Common

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

by beberlei at 2011/09/27 03:15:34 -0700

What does the symfony/ or ext/ prefix control in composer?

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

by Seldaek at 2011/09/27 03:33:52 -0700

symfony/ is just the (mandatory) vendor namespace. Also ext/ has been renamed to ext- now, so it's not in any vendor, and should avoid potential issues.

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

by beberlei at 2011/09/27 05:07:03 -0700

@Seldaek Mandatory? So every package name is "vendor/package"? I like that because previously i thought package names are not namespaced, and thus clashes could occur between different communities easily.

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

by Seldaek at 2011/09/27 05:16:20 -0700

@beberlei: Mandatory. As of yesterday http://packagist.org/ will tell you you have an invalid package name if there's no slash in it. See 1306d1ca82 (diff-3)
2011-09-29 17:27:38 +02:00
Fabien Potencier
41a55ba8d7 Merge branch '2.0'
* 2.0:
  [Validator] added support for grapheme_strlen when mbstring is not installed but intl is installed
  removed separator of choice widget when the separator is null
2011-09-29 16:17:23 +02:00
Fabien Potencier
d429594afb removed separator of choice widget when the separator is null 2011-09-29 10:14:34 +02:00
Fabien Potencier
bfb99bf219 [FrameworkBundle] added a --relative option to assets:install 2011-09-28 17:38:41 +02:00
Fabien Potencier
258a1fd710 moved makePathRelative to Filesystem 2011-09-28 17:37:32 +02:00
Fabien Potencier
8cb0cc67d6 merged branch CodeMeme/assets-install-relative-symlink (PR #1173)
Commits
-------

dd20f01 Fixed assets:install to use a relative path instead of an absolute

Discussion
----------

[2.1] Fixed "assets:install" to create relative instead of absolute symlinks

This is a fairly simple fix so that the symlinks are relative to the resources rather than an absolute path that breaks from machine-to-machine or upon deployment.

We were trying to figure out why styles were messed up for other contributors, but then found that the paths were hard-coded for my machine :)

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

by ericclemmons at 2011/06/04 09:44:11 -0700

Any other thoughts/updates on this?

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

by fabpot at 2011/06/04 22:31:39 -0700

We have such a feature in symfony1 and IIRC it does not work very well. One problem is when you use symlink for some bundles. Then, you should not use a relative symlink as there is a common path between the two.

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

by ericclemmons at 2011/06/05 09:55:00 -0700

Sorry, I didn't think that we would be an issue since the Bundle "Best Practices" states to not include other bundles as dependencies.

If absolute links are a must, then the next alternative is for collaborators to add "/web/bundles" to .gitignore and each person run "assets:install" upon installation/update.

I was personally hoping there were a way to have this versioned for easier deployment.

On Jun 5, 2011, at 12:31 AM, fabpot<reply@reply.github.com> wrote:

> We have such a feature in symfony1 and IIRC it does not work very well. One problem is when you use symlink for some bundles. Then, you should not use a relative symlink as there is a common path between the two.
>
> --
> Reply to this email directly or view it on GitHub:
> https://github.com/symfony/symfony/pull/1173#issuecomment-1303600

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

by henrikbjorn at 2011/06/27 04:56:58 -0700

``` php
<?php
// ...
->addOption('relative', null, InputOption::VALUE_NONE, 'The --symlink option will generate relative paths')
// ...
```

and just default to absolute paths ?

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

by ericclemmons at 2011/06/27 08:37:50 -0700

I'm very supportive of that compromise.  Up to @fabpot if I should add this back in, since relative paths were apparently problematic with symfony1.

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

by sbusch at 2011/07/15 08:46:01 -0700

+1

I'm developing on Mac and the files are mounted on a Linux box which serves the project. The paths are not the same on those two systems. If I accidentally install assets on my Mac the absolute paths won't work on the Linux webserver.

Other scenario: one teammate could add those symlinks by accident to the git repository, which breaks all other installations.

Relative symlinks could help a lot in these cases.

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

by ericclemmons at 2011/07/15 08:47:53 -0700

@sbusch Your issues are the same as mine, which prompted this ticket :)

Until this gets @fabpot's blessing, it's best to simply add `web/bundles` to your `.gitignore` file and tell your users to always run `assets:install --symlink` each time they pull down code & something breaks ;)

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

by sbusch at 2011/07/15 08:58:33 -0700

The handling (calculation) of relative symlinks IMO fits better to the `symlink()` method of `\Symfony\Component\HttpKernel\Util\Filesystem`. Possible method signature:

symfony/src/Symfony/Component/HttpKernel/Util/Filesystem.php:

```php
<?php
// ...

    /**
     * Creates a symbolic link or copy a directory.
     *
     * @param string  $originDir     The origin directory path
     * @param string  $targetDir     The symbolic link name
     * @param Boolean $copyOnWindows Whether to copy files if on Windows
     * @param Boolean $makeRelative  Whether to try to create a relative link
     */
    public function symlink($originDir, $targetDir, $copyOnWindows = false, $makeRelative = false)
    {
```

And what about changing the `--symlink` option to optionally have a value, instead of adding a new depending option? E.g. `--symlink[=absolute|relative]`, with "absolute" as default:

symfony/src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php:

```php
<?php
// ...

class AssetsInstallCommand extends ContainerAwareCommand
{
    /**
     * @see Command
     */
    protected function configure()
    {
        $this
            ->setDefinition(array(
                new InputArgument('target', InputArgument::REQUIRED, 'The target directory (usually "web")'),
            ))
            ->addOption('symlink', null, InputOption::VALUE_OPTIONAL, 'Symlinks the assets instead of copying it. Allowed values: "absolute" (default) and "relative".', 'absolute')
            ->setHelp(<<<EOT
The <info>assets:install</info> command installs bundle assets into a given
directory (e.g. the web directory).

<info>./app/console assets:install web [--symlink]</info>

A "bundles" directory will be created inside the target directory, and the
"Resources/public" directory of each bundle will be copied into it.

To create a symlink to each bundle instead of copying its assets, use the
<info>--symlink</info> option. Use <info>--symlink=relative</info> for relative symlinks.
EOT
            )
            ->setName('assets:install')
        ;
    }

    /**
     * @see Command
     *
     * @throws \InvalidArgumentException When the target directory does not exist
     */
    protected function execute(InputInterface $input, OutputInterface $output)
    {
        if (!is_dir($input->getArgument('target'))) {
            throw new \InvalidArgumentException(sprintf('The target directory "%s" does not exist.', $input->getArgument('target')));
        }

        if ($input->hasOption('symlink'))
        {
            if (!function_exists('symlink')) {
                throw new \InvalidArgumentException('The symlink() function is not available on your system. You need to install the assets without the --symlink option.');
            }
            if (!in_array($input->getOption('symlink'), array('absolute', 'relative'))) {
                throw new \InvalidArgumentException(sprintf('Invalid value "%s" for option "symlink"', $input->getOption('symlink')));
            }
        }

        $filesystem = $this->getContainer()->get('filesystem');

        // Create the bundles directory otherwise symlink will fail.
        $filesystem->mkdir($input->getArgument('target').'/bundles/', 0777);
        foreach ($this->getContainer()->get('kernel')->getBundles() as $bundle) {
            $originDir = $bundle->getPath().'/Resources/public';
            if (is_dir($originDir)) {
                $targetDir = $input->getArgument('target').'/bundles/'.preg_replace('/bundle$/', '', strtolower($bundle->getName()));
                $output->writeln(sprintf('Installing assets for <comment>%s</comment> into <comment>%s</comment>', $bundle->getNamespace(), $targetDir));

                $filesystem->remove($targetDir);

                if ($input->hasOption('symlink')) {
                    $filesystem->symlink($originDir, $targetDir, false, $input->getOption('symlink') == 'relative');
                } else {
                    $filesystem->mkdir($targetDir, 0777);
                    $filesystem->mirror($originDir, $targetDir);
                }
            }
        }
    }
```

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

by sbusch at 2011/07/15 09:04:46 -0700

@ericclemmons: yes, that's our current workaround. I started with manually converting absolute links to relative ones, but that quickly got very annoying ;-)

After that I tried to implement the generation of relative links by myself (where the proposals of my previous comment come from) until I found your PR.

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

by henrikbjorn at 2011/07/18 00:20:38 -0700

@sbush if it defaults to something how would you turn it off ?

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

by stof at 2011/07/18 00:26:16 -0700

@henrikbjorn a default value for the option is used when using ``--symlink`` without the value. If you don't use the option at all, it is disabled.

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

by stof at 2011/07/18 11:58:29 -0700

In fact no. The default value seems to be also used when the option is not set at all. @fabpot is this intended ?

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

by Seldaek at 2011/07/19 05:18:29 -0700

Symlinks on windows, although technically possible, don't quite work with PHP on most setups. Also git doesn't seem to support them either on windows (not sure why not). For those reasons, and although I'm sure this doesn't apply to every project, I would recommend you just have everyone run `assets:install [--symlink]` on their local machine, and make that command run on the server as part of your deployment process.

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

by ericclemmons at 2011/07/19 06:15:34 -0700

Nobody is even entertaining --relative?

On Jul 19, 2011, at 7:18 AM, Seldaek<reply@reply.github.com> wrote:

> Symlinks on windows, although technically possible, don't quite work with PHP on most setups. Also git doesn't seem to support them either on windows (not sure why not). For those reasons, and although I'm sure this doesn't apply to every project, I would recommend you just have everyone run `assets:install [--symlink]` on their local machine, and make that command run on the server as part of your deployment process.
>
> --
> Reply to this email directly or view it on GitHub:
> https://github.com/symfony/symfony/pull/1173#issuecomment-1606463

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

by Gregwar at 2011/08/10 08:56:27 -0700

I agree with the idea of proposing a --relative option, I'm currently working on a Samba mounted filesystem and I'm forced to create manually symlinks to get things working since the paths are not the same
2011-09-28 17:29:06 +02:00
Fabien Potencier
fa57912351 [Translator] fixed merge with 2.0 2011-09-28 17:13:00 +02:00
Fabien Potencier
885bb33791 merged 2.0 2011-09-28 16:08:31 +02:00
xaav
9af2342076 [Translation] Added the gettext loaders 2011-09-28 10:24:34 +02:00
Fabien Potencier
0131a69e33 [FrameworkBundle] tweaked some error messages 2011-09-28 09:15:53 +02:00
Fabien Potencier
bcc7357e55 merged branch aerialls/getuser (PR #1990)
Commits
-------

f7bf7b5 fixed condition
181332b added a Controller:getUser() shortcut to recover the current user

Discussion
----------

[2.1] added a Controller:getUser() shortcut to recover the current user
2011-09-28 09:13:48 +02:00
Andrej Hudec
5c060d15e9 Fix for {@inheritdoc} phpDoc tag. 2011-09-28 10:00:17 +03:00
Igor Wiedler
731b28bb92 [composer] add missing deps for FrameworkBundle 2011-09-27 20:03:59 +02:00
Fabien Potencier
c13b4e2b55 fixed fallback catalogue mechanism in Framework bundle 2011-09-27 17:18:11 +02:00
Fabien Potencier
063e6f9ae6 merged branch Seldaek/commands (PR #1470)
Commits
-------

d675c28 [FrameworkBundle] Use Router instead of RouterInterface
ae7ae8d [FrameworkBundle] Moved router_listener from web to router.xml since it depends on the router
35a9023 [FrameworkBundle] Added isEnabled to Router commands, fixes #1467
536d979 [Console] Added Command::isEnabled method that defines whether to add the command or not

Discussion
----------

[2.1] [Console] Added Command::isEnabled method

This addresses #1467.

The idea is to allow commands to evaluate whether they can run or not, since they are automatically registered.

- It's useful for the two router:* commands since they're optional (router can be disabled), but part of the FrameworkBundle that is not really optional.
- It could be useful for third party code as well.
- It's BC.
- aa95bb0d395810b29a3e654673e130736d9d1080 should address the issue in #1467, while the other commits just make sure the command is not registered at all if the router isn't standard.

One issue remains though:

- A few other services like twig helpers get the `ròuter` injected, this means that if there is really **no** router service defined, there is still an error. I'm not sure how to fix those beyond adding `on-invalid="null"` but I'm not sure if that's desirable. I guess we could argue that the router is a big candidate for replacement/suppression, and as such it should be truly optional, but if we do it I don't know where it'll lead. I don't want to end up in a situation where half the dependencies are optional to support every possible combination. @fabpot wdyt?

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

by kriswallsmith at 2011/06/28 16:19:46 -0700

I'd rather see us not register a command instead of register and then disable it. Can we do the same thing you've done here in the bundle's registerCommands() method?

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

by Seldaek at 2011/06/28 16:51:36 -0700

Note that it's never really registered. During the registration it's checked and skipped if not enabled.

However, doing it as you suggest means overriding/copy-pasting all the code from the core Bundle class, which I don't like so much. It also means adding code specific to those two commands in a somewhat unrelated place, which I also don't like.

I'm not saying the current solution is perfect, but from the alternatives I considered, it's the best I have found.

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

by stof at 2011/09/04 04:58:04 -0700

@Seldaek your branch conflicts with master. could you rebase it ?

@fabpot what do you think about this PR ?

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

by Seldaek at 2011/09/04 08:39:05 -0700

Rebased
2011-09-27 15:48:10 +02:00
Igor Wiedler
d535afeb98 [composer] fix monolog-bridge composer.json, add more inter-component deps 2011-09-27 09:33:21 +02:00
Jeremy Mikola
6555e28d57 Remove unnecessary use statement 2011-09-26 19:54:19 -04:00
Jeremy Mikola
369f181005 [FrameworkBundle] Add request scope to assets helper only if needed
Builds upon aead4a9836180cabae4d47fe27c634dcd79ac8f2, which prematurely removed request scoping from the assets templating helper in all cases. The helper need only be request-scoped if one or more request-scoped packages (e.g. PathPackages) are injected into it. This change makes it possible to utilize the assets helper outside of a request (e.g. during a console script).

To ensure that the assets helper is not assigned a request scope, all asset base URL's must be defined for all packages (default and any named) and both protocols: HTTP and SSL. The included test config fixtures concisely accomplish this by specifying a single HTTPS URL as the base URL for our default and named package, since FrameworkExtension's Configuration conveniently registers this URL for both protocols.
2011-09-26 19:54:12 -04:00
Jeremy Mikola
d6b915a174 [FrameworkBundle] Assets templating helper does not need request scope
No other helpers have request scope and the assets helper's parameters don't appear to depend on the request in any way, so this appears to be unnecessary. As-is, request scope here prevents use of the assets helper from a console command that may need to internally render a template.
2011-09-26 19:54:05 -04:00
Igor Wiedler
9ade639bb4 [composer] add composer.json 2011-09-27 00:55:43 +02:00
Jayson Xu
9817772134 add zh-CN translation 2011-09-27 00:51:22 +08:00
Jayson Xu
416eaa947f add validator's zh_CN translation 2011-09-26 02:58:23 +08:00
Lukas Kahwe Smith
55b572d4f1 fixed getting the alias for a namespace 2011-09-25 14:23:16 +02:00
Lukas Kahwe Smith
2b89e15bfb use getObjectNamespace() in getEntityNamespace() 2011-09-25 13:51:18 +02:00
Fabien Potencier
902bbf2ba0 merged branch lsmith77/template_locator (PR #2128)
Commits
-------

afc0971 make it easier to customize the cache lookup in the TemplateLocator

Discussion
----------

make it easier to customize the cache lookup in the TemplateLocator

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

by fabpot at 2011/09/22 01:21:56 -0700

Do you any use case for that?

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

by lsmith77 at 2011/09/22 01:27:06 -0700

Yes in the ThemeBundle we override the default cache to include the key + theme:
https://github.com/liip/liipthemebundle/pull/9/files#L7R53

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

by lsmith77 at 2011/09/22 01:29:18 -0700

though i just thought about it .. if we do not put this into 2.0, it might not be worth the trouble.

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

by pjedrzejewski at 2011/09/22 02:19:42 -0700

+1 for this.
2011-09-23 21:00:46 +02:00
Lukas Kahwe Smith
6e87d01513 fix tests 2011-09-23 09:46:30 +02:00
Lukas Kahwe Smith
13c2f33af8 added a default implementation of the ManagerRegistry integrating the container
attempted to maintain BC as good as possible, but RegistryInterface::getRepository() had to be dropped from RegistryInterface. Its still part of the ManagerRegistry, so its only a BC break for people using RegistryInterface to create their own implementation
2011-09-23 09:26:24 +02:00
excelwebzone
58d78f09c6 Updated the hebrew translations 2011-09-22 17:09:12 -07:00
Fabien Potencier
50570ba819 merged branch yethee/ru_translation (PR #2238)
Commits
-------

e1aabd2 [FrameworkBundle] Updated the Russian translations.

Discussion
----------

[FrameworkBundle] Updated the Russian translations.

Added translations for a new error messages of image validator.
Added translations for the user password validator.
2011-09-22 09:36:04 +02:00
Deni
e1aabd24e4 [FrameworkBundle] Updated the Russian translations.
Added translations for a new error messages of image validator.
Added translations for the user password validator.
2011-09-22 11:33:20 +04:00
Joseph Bielawski
4dae5b8fca [WebProfilerBundle] Cleanuped css 2011-09-22 10:19:19 +03:00
Fabien Potencier
a0d0124639 [WebProfilerBundle] tweaked profiler CSS 2011-09-22 09:11:17 +02:00
Fabien Potencier
c9ddd6fd8b [WebProfilerBundle] moved the token not found error to the new info page 2011-09-22 09:05:42 +02:00
Fabien Potencier
e98584e2f3 [WebProfilerBundle] tweaked some templates 2011-09-22 09:01:35 +02:00
Fabien Potencier
0547059250 merged branch stloyd/profile_info (PR #1594)
Commits
-------

fea74db Added information page with better messages for Profiler

Discussion
----------

[WebProfiler] Added information page with better messages

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

by stloyd at 2011/08/30 23:29:27 -0700

@fabpot Any decision about this ?
2011-09-22 08:59:08 +02:00
Fabien Potencier
db3a2f2359 [WebProfileBundle] fixed unit tests 2011-09-22 08:30:34 +02:00
Fabien Potencier
2b27c38e7f [WebProfilerBundle] fixed height of the toolbar 2011-09-22 08:28:02 +02:00
Fabien Potencier
56b6d537d6 [WebProfilerBundle] removed normal as a valid position for the toolbar as it is only to be used by the profiler 2011-09-22 08:27:40 +02:00
Fabien Potencier
3e90ba4f76 [WebProfileBundle] added missing position attribute in XSD 2011-09-22 08:27:09 +02:00
Fabien Potencier
916e4b1363 merged branch alexandresalome/profiler-toolbar-position (PR #2114)
Commits
-------

132fbe3 [WebProfilerBundle] Merge position and css_position
defdb82 [WebProfilerBundle] Remove unused line
69a50ab [WebProfilerBundle] Add the posibility to specify position of toolbar

Discussion
----------

[WebProfilerBundle] Add the posibility to specify position of toolbar

I'm facing a project where everything is at the bottom of the page, positioned with CSS.

This PR adds the possibility to specify the position of the toolbar, with configuration :

    web_profiler:
        toolbar: true
        intercept_redirects: false
        css_position:        top

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

by stof at 2011/09/06 12:11:27 -0700

Looking at the code rendering the toolbar, there is already a ``position`` parameter used to display the toolbar on top in the profiler. Maybe we could look into reusing it instead of having a second one named ``css_position``.
But the phpdoc says ``bottom, normal, or null -- automatically guessed``. Using ``bottom`` will result in ``position: bottom`` in the CSS, which is broken. @fabpot is it simply a left-over of a previous version ?

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

by alexandresalome at 2011/09/16 00:56:11 -0700

I merged parameters and changed the documentation for 3 values : ```bottom, top or normal```.
2011-09-22 08:14:15 +02:00
Fabien Potencier
e473ea109e merged branch symfony/security_user_validator (PR #2232)
Commits
-------

7d3c2df [SecurityBundle] added a validator for the user password

Discussion
----------

[SecurityBundle] added a validator for the user password

This validator is useful when you want to validate that an input value
is equal to the user current password (in a form where the user can change
his password for instance).

Note that this should not be used to validate a login form as this is
done automatically by the built-in security mechanism.

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

by Palleas at 2011/09/21 08:36:14 -0700

This is kinda what I wrote for my project 2 days ago, I'm definitely +1 on this ;-)

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

by stealth35 at 2011/09/21 08:45:55 -0700

👍
2011-09-21 20:22:09 +02:00
Alif Rachmawadi
ad208d9dae added trans-unit-41 for 2.0 2011-09-22 01:01:06 +07:00
Fabien Potencier
7d3c2df98d [SecurityBundle] added a validator for the user password
This validator is useful when you want to validate that an input value
is equal to the user current password (in a form where the user can change
his password for instance).

Note that this should not be used to validate a login form as this is
done automatically by the built-in security mechanism.
2011-09-21 16:30:46 +02:00
Alif Rachmawadi
e13998d1fd updated indonesian translation for image validator 2011-09-21 19:21:05 +07:00
Fabien Potencier
01a24db500 merged branch schmittjoh/translationFixes (PR #2213)
Commits
-------

c0e6118 yet another fix
cb9383d some more fixes
7a20b89 fixes some typos
ac765fc avoid circular references
9b025b7 fixed typo

Discussion
----------

Translation fixes
2011-09-20 07:43:26 +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
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
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
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
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
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
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
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
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
Denis Klementjev
fd4d241b17 Profiler session import fixed. 2011-09-16 13:51:26 +02:00
Fabien Potencier
bede42065e [Config] fixed FileResource usage of is_file (we must use file_exists here as the resource can be a file or a directory, reverts #2057) 2011-09-16 13:20:41 +02:00
alexandresalome
132fbe3b47 [WebProfilerBundle] Merge position and css_position 2011-09-16 09:51:17 +02:00
Emil Einarsson
aa8e029e65 Swedish translation fix. 2011-09-15 17:36:05 +02:00
Fabien Potencier
3a4d1a6a22 merged 2.0 branch 2011-09-15 07:39:20 +02:00
Fabien Potencier
27ba003e5e [HttpFoundation] changed the strategy introduced in a5ccda47b4 to fix functional tests and still allow to call save more than once for a Session 2011-09-14 20:54:45 +02:00
Fabien Potencier
532b0b6b59 merged branch jdreesen/trans-fix-1 (PR #2173)
Commits
-------

e98cbc3 fixed typo

Discussion
----------

Fixed typo in the hebrew translation file
2011-09-14 16:48:19 +02:00
Magnus Nordlander
b15d80edc9 Added missing translation for Swedish 2011-09-14 16:24:18 +02:00
jdreesen
e98cbc3077 fixed typo 2011-09-14 11:59:16 +02:00
Fabien Potencier
f9ecdfeb05 [FrameworkBundle] added sc parameters replacement in route requirements 2011-09-14 09:19:55 +02:00
Fabien Potencier
fabec37edc [FrameworkBundle] added tests for DIC parameters replacements in route defaults 2011-09-14 09:06:00 +02:00
Fabien Potencier
400159de4f [FrameworkBundle] made DIC placeholders replacement in route defaults only when the parameter exists in the container 2011-09-14 08:49:02 +02:00
Fabien Potencier
53b4cd8c9c [FrameworkBundle] made code more robust 2011-09-14 08:48:23 +02:00
Fabien Potencier
92d35c81c0 [FrameworkBundle] fixed CS and phpdoc 2011-09-14 08:47:38 +02:00
Fabien Potencier
8faf27864d merged branch mvrhov/route_dic_params (PR #1934)
Commits
-------

13b77bf Treat defaults enclosed between % as parameters from dic This allows as to define default like this

Discussion
----------

[Route] Treat defaults enclosed between % as parameters from dic

This allows as to define default like this

foo:
    pattern:  /{_locale}/login
    defaults:
        _controller: my_login_controller:loginAction
        _locale: %session.default_locale%

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

by lsmith77 at 2011/08/10 07:00:14 -0700

this is a bit of a BC break .. but in general it does address a huge need for being able to make routes more easily configurable.

also didnt check this, but we should make sure that this doesnt open any security issues.

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

by maoueh at 2011/08/10 08:31:18 -0700

Hi,

There is an issue pending for the same feature here #1718. Maybe this one could be linked to #1718 somehow.

Regards,
Matt

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

by fabpot at 2011/09/12 23:51:53 -0700

@lsmith77: Why is it a BC break?

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

by lsmith77 at 2011/09/13 00:04:46 -0700

well its only a BC break on the off chance that someone puts stuff enclosed in % in the defaults atm and does not expect them to be interpreted as parameters. not very likely. but at the least we might want to first check if the parameter exists before replacing it.

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

by mvrhov at 2011/09/13 23:28:48 -0700

So, do I check if parameter exists inside dic and throw a notice if not, or do I just fix the comment?
2011-09-14 08:42:27 +02:00
excelwebzone
c05ef6ce99 Added trans-unit "41" (hebrew translation) 2011-09-13 18:47:49 -07:00
excelwebzone
ce056d6b02 Updated hebrew translation for validators 2011-09-13 07:21:52 -07:00
Fabien Potencier
affb0cbca2 merged branch stealth35/trans_rb (PR #2136)
Commits
-------

e6e5146 [Translation] now support ResourceBundle

Discussion
----------

[2.1][Translation] now support ResourceBundle

support `.res` and `.dat` bundles

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

by marijn at 2011/09/08 08:59:39 -0700

There are a few references to `ressource`, I guess that is a typo...

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

by stealth35 at 2011/09/08 09:13:32 -0700

@marijn thank, done

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

by fabpot at 2011/09/11 00:42:37 -0700

Is it possible to add a dumper like we have for all other loaders?

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

by stof at 2011/09/11 03:46:39 -0700

Btw, you need to rebase your branch as it conflicts with master

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

by stealth35 at 2011/09/11 04:04:23 -0700

@fabpot it's more difficult (or the easy way it's to use `exec` with `derb`), I can create the text resources
@stof oki

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

by fabpot at 2011/09/11 23:52:19 -0700

@stealth35: Can you remove the `@api` tags? We will review what is included into the public API later on. thanks.

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

by stealth35 at 2011/09/12 04:18:07 -0700

@fabpot done
2011-09-13 08:49:05 +02:00
stealth35
e6e5146ccb [Translation] now support ResourceBundle 2011-09-12 13:17:14 +02:00
Martin Hasoň
b9b60843aa [FrameworkBundle] Updated Czech translations for image validator 2011-09-10 16:55:59 +02:00
H. Westphal
3e2f1a4b13 Removed executable bits from all php files 2011-09-09 15:16:17 +02:00
Fabien Potencier
18d3dfe0bf merged branch snc/chmod-fixes (PR #2130)
Commits
-------

a0a97c6 Removed executable bits from all php files

Discussion
----------

Removed executable bits from all PHP files

Some files had a file mode of 755 and this PR changes them to 644. The reason behind this is that git always thinks that those files are changed when accessing the repository via a samba share on windows (tested with PhpStorm).

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

by fabpot at 2011/09/09 05:51:30 -0700

That was on my radar too. Can you do the same for the 2.0 branch?
2011-09-09 14:51:44 +02:00
Michel Salib
ef322f680d -- add command that extracts translation messages from templates
-- add missing files

-- tweak translation command files

-- dumpers are now responsive for writting the files

-- moved the twig extractor the bridge

-- clear temp files after unit tests
-- check the presence of dumper in translation writer

-- General cleaning of the code

-- clean phpDoc

-- fix PHPDoc

-- fixing class name in configuration

-- add unit tests for extractors (php and twig)

-- moved test to correct location

-- polish the code

-- polish the code
2011-09-09 10:23:54 +02:00
H. Westphal
a0a97c6a22 Removed executable bits from all php files 2011-09-07 22:51:20 +02:00
Lukas Kahwe Smith
afc097118f make it easier to customize the cache lookup in the TemplateLocator 2011-09-07 20:02:35 +02:00
Fabien Potencier
49e1eee2a1 merged branch craue/patch-12 (PR #2116)
Commits
-------

b7c2a2e [FrameworkBundle] fixed typo in German validator translation

Discussion
----------

[FrameworkBundle] fixed typo in German validator translation
2011-09-07 07:40:28 +02:00
Michele Orselli
a7f0aabb02 fix italian translation for branch 2.0 2011-09-07 00:00:09 +02:00
Michele Orselli
8198078d96 updated italian translation for validators 2011-09-06 22:35:40 +02:00
Christian Raue
b7c2a2e70b [FrameworkBundle] fixed typo in German validator translation 2011-09-06 22:44:30 +03:00
Fabien Potencier
89df6bbfc4 merged branch jdreesen/trans-update-2 (PR #2112)
Commits
-------

1134c1a [Validator] Fixed typo in Image constraint
428a01c Merge branch 'master' of git://github.com/symfony/symfony into trans-update-2
3843afa [FrameworkBundle] Improved German validator translation
ac54080 [FrameworkBundle] Updated German translations for image validator

Discussion
----------

Updated/improved german validator translation & fixed typos in Image constraint
2011-09-06 21:08:58 +02:00
alexandresalome
defdb82372 [WebProfilerBundle] Remove unused line 2011-09-06 21:08:32 +02:00
alexandresalome
69a50abcf8 [WebProfilerBundle] Add the posibility to specify position of toolbar 2011-09-06 20:42:14 +02:00
Arnout Boks
1297504116 [FrameworkBundle] Added Dutch translations for new error messages in image validator 2011-09-06 17:38:09 +02:00
jdreesen
3843afab84 [FrameworkBundle] Improved German validator translation 2011-09-06 16:53:23 +02:00
jdreesen
ac540809c2 [FrameworkBundle] Updated German translations for image validator 2011-09-06 16:43:48 +02:00
Fabien Potencier
227eebc0fa merged branch jalliot/updated-french-trans (PR #2106)
Commits
-------

f23413c Updated french translations for image validator

Discussion
----------

Updated french translations for image validator
2011-09-06 13:55:04 +02:00
Fabien Potencier
924b9f7fd1 merged branch stloyd/patch-4 (PR #2108)
Commits
-------

7139154 [Validator] Translate image validation errors into polish

Discussion
----------

[2.1][Validator] Translate image validation errors into polish
2011-09-06 13:54:54 +02:00
Fabien Potencier
bde551ab70 [FrameworkBundle] fixed typo 2011-09-06 12:56:36 +02:00
Joseph Bielawski
7139154b99 [Validator] Translate image validation errors into polish 2011-09-06 12:37:32 +03:00
Jordan Alliot
f23413cd58 Updated french translations for image validator 2011-09-06 10:14:51 +01:00
Fabien Potencier
1c0b48930d Merge branch '2.0'
* 2.0:
  [Validator] Sync polish translation
  [FrameworkBundle] sanitize target arg in asset:install command
  few optimisations for XliffFileLoader and XmlFileLoader
  [FrameworkBundle] Sync the Russian translations
  [FrameworkBundle] Added Dutch validator translation for trans-unit 41
  [FrameworkBundle] Updated German validator translation
  [FrameworkBundle] Fixed a typo in the translation file per @PeymanHR
2011-09-06 09:00:04 +02:00
Fabien Potencier
100c644a05 [FrameworkBundle] fixed typo 2011-09-06 08:59:53 +02:00
Fabien Potencier
e4654745c7 [FrameworkBundle] added CSV translation loader and dumper as services 2011-09-06 08:07:33 +02:00
Fabien Potencier
6c9331650f merged branch beberlei/QtTranslations (PR #1154)
Commits
-------

f2761dd Fix typo and include suggestion by Stof
4ac380e Adjust QtTranslations patch and include QtTranslationsDumper + test aswell
5712798 Adjust QtTranslationLoader to throw RuntimeException
21b29c2 Merge symfony/master
6bf43a1 [Translation] Add .ts as file extension to search for Qt Translation files.
5808715 [Translation] Add Qt Translation component with tests

Discussion
----------

[2.1] Qt translations

Add support for QT translations - it has a GUI and www.crowdin.net supports it.

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

by stof at 2011/05/30 07:24:48 -0700

You also need to register it in FrameworkBundle.

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

by tristanbes at 2011/06/26 12:08:47 -0700

crowdin seems to be a cool service. didn't know about this website. thanks

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

by fabpot at 2011/07/11 02:58:31 -0700

Just for the record: I've just removed all usage of `\Exception` in Symfony2 master:

6a7359389d

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

by beberlei at 2011/07/11 03:02:14 -0700

I will adjust the PR.

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

by tristanbes at 2011/08/28 11:10:02 -0700

Any news @beberlei ?

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

by beberlei at 2011/08/29 01:07:28 -0700

Yes, i have to allocate some time. Havent managed to do so yet.

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

by stof at 2011/09/04 05:28:16 -0700

@beberlei the PR also need to be rebased as it conflicts with master.
2011-09-06 08:00:21 +02:00
Fabien Potencier
a00c1f5927 merged branch Wotre/profiler_mongodb (PR #1784)
Commits
-------

41b7a19 Updated the tests so that tests will be marked as skipped when there is no MongoDB server present!
233c7db Updated the code to follow the symfony coding standards
7b24de5 Updated the code to follow the symfony coding standard using stof his remarks
fbcbdde - Fixed a small bug - Updated some phpdoc
00fdfec Added a MongoDbProfilerStorage engine

Discussion
----------

[2.1] [HttpKernel] MongoDb storage for Profiler

As a documentbased database like MongoDB is [supposedly fantastic in logging](http://blog.mongodb.org/post/172254834/mongodb-is-fantastic-for-logging) I implemented a storage engine for the profiler that should enable us to use this database as storage for this.

Activate it using this way:

    framework:
        profiler:
            dsn:     mongodb://user:pass@location/database/collection

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

by stof at 2011/07/24 11:23:06 -0700

btw, the MongoDB session storage has already be rejected from the core so this should probably be moved to the DoctrineMongoDBBundle (even if it uses only the PHP extension and not Doctrine). @fabpot thoughts about this ?

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

by Wotre at 2011/07/24 11:52:56 -0700

Just my personal opinion, if it is prefered that way I will move this into the DoctrineMongoDBBundle.

While it is reasonable to bundle all Mongo related things together, I do believe that in the case of logging we want to avoid as many depencies as possible. Some exceptions can occur pretty early inside the framework, and it would be a shame if those aren't logged because this layer is written on top of doctrine. I'm not exactly familliar enough with the symfony internals as I only started using it a few days ago, but I can imagine that this can make a difference with some exceptions.

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

by stof at 2011/07/24 11:59:10 -0700

I don't ask you to use Doctrine in this code. It is fine to use the extension directly if it is enough.

Btw, the profiler is *not* used early. :)

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

by Wotre at 2011/07/26 10:45:05 -0700

So... Any final remark whether this should be moved to [the DoctrineMongoDBBundle](https://github.com/symfony/DoctrineMongoDBBundle) or not?

If it has to be moved, any comment on where in that bundle this should be put?

Also, if it has to be moved, how can we arrange the configuration using DI? Currently I've put a line in the FrameworkExtension file to use this engine for everything with a $dsn starting with mongodb; I imagine this kind of ugly depency can't really exist between the FrameworkBundle and another one.

Although it seems completely illogical to me, I will move it, but I do need some directions on how to elegantly do this...

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

by stof at 2011/07/26 11:03:04 -0700

@fabpot what do you think ?

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

by stof at 2011/09/04 01:28:48 -0700

@fabpot what do you think about the place where this should be done ?
2011-09-06 07:53:28 +02:00
Fabien Potencier
ed472d36b7 merged branch alexandresalome/new-profiler-storage (PR #1772)
Commits
-------

9f0bd03 [HttpKernel] Update tests for FileProfilerStorage
b7032bc [HttpKernel] Update FileProfileStorage to search from EOF
188a5fa [HttpKernel] Override the existing tokens in FileProfilerStorage
b1b1424 [HttpKernel] Delete folders in the profiler cache
88bc3ec [HttpKernel] Fixes standards of FileProfilerStorage
affe66c Merge remote-tracking branch 'origin/master' into new-profiler-storage
ea916c3 [HttpKernel] Coding convention for the file profiler storage
9ae2c8d [HttpKernel] CS in file storage
b415efd [HttpKernel] Add a test for semicolon in file storage test
1c1215f [HttpKernel] Use subfolders for better storage in file storage of profiler
4b1dc1f [HttpKernel] Fix the folder attribute of file storage to private
70f73e1 [HttpKernel] Fix tests for the file storage of profiler
d5313d9 [HttpKernel] Add tests for the file profiler storage
09fc0a2 [HttpKernel] Add Symfony credits to the file storage class for the profiler
d1d5892 [HttpKernel] Finalize the file storage for the profiler
2f65cf2 Add POC for file storage system

Discussion
----------

[2.1] [HttpKernel] File storage for profiler

Symfony2 has some problems when dealing with multiple concurrency queries in the SQLite storage, resulting in a timeout error or terrible lack.

I've implemented after discussions with @fabpot a filesystem storage.

Enable it in your project with :

    framework:
        profiler:
          dsn:             "file:%kernel.cache_dir%/profiler"

I also studied the possibility to store only big data string in files and rest in the SQLite, but not concluant.

Results of my measures (4 concurrency, 120 total) :

* SQLite with data : 1057ms
* SQLite without data : 615ms
* MySQL : 40ms
* This File storage : 54ms

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

by alexandresalome at 2011/07/22 12:01:10 -0700

An idea for the find method : a csv file containing ip;url;token

The iteration could be done over a big file, without loading the whole file in memory.

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

by alexandresalome at 2011/07/23 14:22:32 -0700

OK new version, with as explained previously : a CSV file containing the index + file for each profile.

The speed is similar to the speed of MySQL, and no memory overhead should occur with this solution.

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

by alexandresalome at 2011/07/23 14:37:14 -0700

Hm... Created tests, duplicated from SqliteProfilerStorageTest.

Any idea on how to put this code in common ? Is it usual to create a base class for 2 tests ?

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

by alexandresalome at 2011/07/23 14:48:39 -0700

Just tested with 24.000 requests, the 24.001'th request still takes less than 50ms to execute.

The index file is about 2Mb, and iterating the whole file is fast.

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

by alexandresalome at 2011/07/23 14:53:19 -0700

I've filled the file with 120Mb of data, requests are still less than 50ms for executing.

Iterating the index takes more than 30s (so it crashed), but it's because of the amount of lines. 30 seconds = 1,400,000 lines in this computer. The file = 1,500,000 lines

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

by alexandresalome at 2011/07/23 14:56:54 -0700

I've tested it with Linux, is someone can test with Windows

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

by stloyd at 2011/07/24 00:32:32 -0700

IMO to speedup it a bit more and not end up with "crash" (to not end with "limit" of files per directory, also to many files in dir slow down every OS) you should use same method to write as Twig, split up files in to directories. If you do this you can speed up index more, because you can create smaller one per directory.

Also you should fix CS (coding standards).

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

by stloyd at 2011/07/24 02:10:20 -0700

Tested on Win 7, seems ok. Similar speed to sqlite, dunno why ;-) but used a bit less of memory.

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

by alexandresalome at 2011/07/24 02:13:21 -0700

Did you tried with concurrent requests ? It makes sense when you use assetic
and your browser hits the application 4 times simultaneously for CSS
generation

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

by alexandresalome at 2011/07/24 02:17:23 -0700

I used Apache Benchmark for producing results :

    ab -c 4 -n 120 URL

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

by alexandresalome at 2011/07/24 02:56:55 -0700

OK I used subfolders, based on last characters (because the first part of token is mostly the same between queries.

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

by stof at 2011/09/04 01:27:15 -0700

@fabpot any news about it ? Can it be merged ?
2011-09-06 07:45:55 +02:00
Fabien Potencier
63db2357c5 merged branch stealth35/asset_com_v2 (PR #2094)
Commits
-------

3a7e038 [FrameworkBundle] sanitize target arg in asset:install command

Discussion
----------

[FrameworkBundle] sanitize target arg in asset:install command

`php app/console assets:install web/`

(removed tailing /)

 before
`Installing assets for Symfony\Bundle\FrameworkBundle into web//bundles/framework`
after
`Installing assets for Symfony\Bundle\FrameworkBundle into web/bundles/framework`
2011-09-06 07:37:26 +02:00
stloyd
83254b8b37 [Validator] Sync polish translation 2011-09-05 18:55:50 +02:00
stealth35
3a7e038fb9 [FrameworkBundle] sanitize target arg in asset:install command 2011-09-05 15:17:10 +02:00
Deni
515fe27ce8 [FrameworkBundle] Sync the Russian translations 2011-09-05 13:58:36 +04:00
Fabien Potencier
747dc3f73b merged branch aboks/dutch_validator_translations (PR #2086)
Commits
-------

8cf7990 [FrameworkBundle] Added Dutch validator translation for trans-unit 41

Discussion
----------

[FrameworkBundle] Added Dutch validator translation for trans-unit 41

This message was added in #2065.
2011-09-05 09:28:08 +02:00
Arnout Boks
8cf79903e5 [FrameworkBundle] Added Dutch validator translation for trans-unit 41 2011-09-05 09:16:00 +02:00
Jordi Boggiano
d675c28123 [FrameworkBundle] Use Router instead of RouterInterface 2011-09-04 21:53:06 +02:00
Benjamin Eberlei
f2761dd627 Fix typo and include suggestion by Stof 2011-09-04 20:47:45 +02:00
Benjamin Eberlei
4ac380e016 Adjust QtTranslations patch and include QtTranslationsDumper + test aswell 2011-09-04 20:43:59 +02:00
Benjamin Eberlei
21b29c201b Merge symfony/master 2011-09-04 20:25:40 +02:00
Jordi Boggiano
ae7ae8d7c6 [FrameworkBundle] Moved router_listener from web to router.xml since it depends on the router 2011-09-04 17:15:08 +02:00
Jordi Boggiano
35a9023b3e [FrameworkBundle] Added isEnabled to Router commands, fixes #1467 2011-09-04 17:12:35 +02:00
jdreesen
df3bde472e [FrameworkBundle] Updated German validator translation 2011-09-04 16:04:35 +02:00
Christophe Coevoet
ca6299dc6b [FrameworkBundle] Fixed a typo in the translation file per @PeymanHR
Closes #2082
2011-09-04 10:54:39 +02:00
Fabien Potencier
e7b2d2d659 merged 2.0 branch 2011-09-04 09:28:37 +02:00
Vincent
0224a34bb1 Fixes typo on ACL Doctrine cache. 2011-09-01 11:35:36 +03:00
Fabien Potencier
9a8f9f7329 merged branch brikou/uniqueEntity_message (PR #2065)
Commits
-------

eb8f3cb added uniqueEntity message translation (fr)
df9f223 added missing french translations
f4c133e removed trailing dot to make it consistent with other validator messages

Discussion
----------

[Translation] Unique Entity message

I've added the translation of uniqueEntity validation message, I've used ``trans-unit id="41"`` which seems to be unused
2011-08-31 12:40:38 +02:00
clombardot
2cfa22ca54 Fix Method ContainerAwareEventDispatcher::hasListeners 2011-08-31 10:39:33 +02:00
Brikou CARRE
eb8f3cb723 added uniqueEntity message translation (fr) 2011-08-31 09:16:30 +02:00
Brikou CARRE
df9f223b43 added missing french translations 2011-08-31 09:12:51 +02:00
Thomas Rabaix
74cbf96418 fix directory resource 2011-08-30 12:47:56 +02:00
Fabien Potencier
0eae562cb2 converted file_exists calls to either is_file or is_dir where it makes sense 2011-08-29 15:28:26 +02:00
Michel Salib
6278fcb306 -- add dumpers for translation component
-- update license and phpDoc

-- fix CS

-- remove pot file loader

-- add unit tests
2011-08-29 14:06:21 +02:00
alexandresalome
affe66c949 Merge remote-tracking branch 'origin/master' into new-profiler-storage 2011-08-29 13:44:52 +02:00
Jordan Alliot
24bacdcd3b Ignore VCS files in assets:install command (closes #2025) 2011-08-26 09:36:52 +01:00
Jeremy Mikola
84c1719335 [FrameworkBundle] Avoid listener key conflicts in ContainerAwareEventDispatcher
Since the key was previously concatenating service ID and method without a separator, it's possible that two different listeners could conflict (e.g. service/method pairs: foo/bar and fo/obar).
2011-08-24 15:05:22 -04:00
Fabien Potencier
536538fb83 [DoctrineBundle] removed an unused and confusing parameter (the connection class can be changed via the wrapper_class setting of a connection) 2011-08-24 18:08:06 +02:00
Fabien Potencier
0fc0f99b9d fixed CS 2011-08-24 17:06:56 +02:00
Fabien Potencier
8cdedd13c5 merged branch Seldaek/toolbar_debugging (PR #2019)
Commits
-------

89f477e [WebProfilerBundle] Throw exception if a collector template isn't found
6ca72cf [WebProfilerBundle] Allow .html.twig in collector template names

Discussion
----------

WDT debugging

While implementing collectors I did a mistake in the template name and it never told me, so I was left wondering why my stuff didn't show up. Not so nice IMO. Also the first commit is to allow template names to be specified fully. I don't see why this shouldn't be allowed, since it is the way you specify templates everywhere else.
2011-08-24 17:06:22 +02:00
Fabien Potencier
d7f078929c [FrameworkBundle] fixed duplicated RequestContext instances 2011-08-24 15:10:47 +02:00
Jordi Boggiano
89f477eb0a [WebProfilerBundle] Throw exception if a collector template isn't found 2011-08-24 13:53:49 +02:00
Jordi Boggiano
6ca72cf9ac [WebProfilerBundle] Allow .html.twig in collector template names 2011-08-24 10:37:03 +02:00
Gregwar
0e00e3ff4c [DoctrineBundle] CS 2011-08-23 21:21:15 +02:00
Joseph Bielawski
06162e7986 [WebProfiler] Use proper Response function to check is it an redirection 2011-08-24 00:44:06 +03:00
hidenorigoto
bc7edfeb24 [FrameworkBundle] changed resource filename of Japanese validator translation 2011-08-23 01:14:50 +09:00
Julien Brochet
f7bf7b5a25 fixed condition 2011-08-19 17:42:14 +02:00
Julien Brochet
181332b4d4 added a Controller:getUser() shortcut to recover the current user 2011-08-19 16:43:43 +02:00
Joseph Bielawski
6e7c375a3d [FrameworkBundle] Cleanup schema file 2011-08-19 21:50:39 +03:00
Victor Berchet
1515912e2e [SecurityBundle] Fix autoloading in tests (autoload.php overrides autoload.php.dist when it exists) 2011-08-18 09:27:14 +02:00
Grégoire Passault
0c4b79396b [DoctrineBundle] Fixed performances issues on "On-demand" proxy file
generation
2011-08-16 12:29:33 +02:00
Grégoire Passault
e866a678d2 [DoctrineBundle] Tries to auto-generate the missing proxy files on the
autoloader
2011-08-16 11:51:41 +02:00
Fabien Potencier
283097db09 Revert "expanded namespaces within phpdoc (special for PhpStorm)"
This reverts commit 6e7439e73a.
2011-08-13 19:27:36 +02:00
Fabien Potencier
0ad6e4267c merged branch ornicar/swiftmailerNonFileSpool (PR #1868)
Commits
-------

ee5b9ce [SwiftmailerBundle] Allow non-file spools

Discussion
----------

[SwiftmailerBundle] Allow non-file spools

Actually if I have the following configuration:

    swiftmailer:
        spool:
            type:   not_file
            path:   some_path

The DIC compiler will complain:

    'The service "swiftmailer.spool.file" has a dependency on
    a non-existent parameter "swiftmailer.spool.file.path"

Because the file spool service is declared no matter the spool type configured.
And it requires the file.path, which is not available.

This patch aims to load the file spooler only if required by the
configuration.

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

by cystbear at 2011/07/29 16:36:04 -0700

Nice catch Thibault.
2011-08-13 11:07:52 +02:00
Fabien Potencier
ef9439dc72 merged branch gimler/master (PR #1894)
Commits
-------

86f888f fix https default port check

Discussion
----------

fix https default port check

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

by Abhoryo at 2011/08/03 03:26:15 -0700

I think it's better to delete $httpsPort variable from the prototype and use only $httpPort variable.

public function urlRedirectAction($path, $permanent = false, $scheme = null, $httpPort = 80)
...
        $port = '';
        if (('http' === $scheme && 80 != $httpPort)  || ('https' === $scheme && 443 != $httpPort)) {
            $port = ':'.$httpPort;
        }

But if this method is already used with the $httpsPort variable elsewhere, your change is ok with me.

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

by gimler at 2011/08/03 04:52:08 -0700

You can use different ports for http and https so when you call the function $scheme = null than it use the $request->getScheme() so you must add both ports so i think it is not a good idea to merge the http and https vars.

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

by gimler at 2011/08/03 04:53:17 -0700

damn sorry i have accidentally close the pull request ;(

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

by stof at 2011/08/03 05:13:24 -0700

I agree with @gimler. Merging them as a single parameter does not make sense here

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

by Abhoryo at 2011/08/03 05:33:12 -0700

I've juste think it's weird to set a useless parameter ($httpPort) when you want to use the last parameter ($httpsPort).
And I don't think someone want http protocole on 433 or https on 80 ?

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

by stof at 2011/08/03 05:35:16 -0700

@Abhoryo what if you are using this controller in a general way, without knowing by advance if the handled request is a secure one ? You need both parameters.
If you need to change the https port by keeping the default http port, you indeed need to pass it but blame PHP: it does not support named parameters.

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

by Abhoryo at 2011/08/03 06:02:18 -0700

Ok, right.
2011-08-13 10:54:56 +02:00
Miha Vrhovnik
13b77bf29a Treat defaults enclosed between % as parameters from dic
This allows as to define default like this

foo:
    pattern:  /{_locale}/login
    defaults:
        _controller: my_login_controller:loginAction
        _locale: %session.default_locale%
2011-08-10 13:34:58 +02:00
realmfoo
4f9d229e78 The trace argument value could be string ("*DEEP NESTED ARRAY*") 2011-08-10 12:08:47 +04:00
realmfoo
6e7439e73a expanded namespaces within phpdoc (special for PhpStorm) 2011-08-10 11:16:31 +04:00
Fabien Potencier
db713ea34d merged branch mvrhov/patch-1 (PR #1902)
Commits
-------

e78bc32 Fixed: Notice: Undefined index: enable_annotations in ...

Discussion
----------

Fixed: Notice: Undefined index: enable_annotations in ...

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

by stloyd at 2011/08/04 03:57:49 -0700

IMO `isset()` should be good enough here.

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

by stof at 2011/08/04 04:18:20 -0700

I don't see how such a notice could occur. There is a default value for this node so as soon as the validation node exists, there will be a value for this node. Could you give an example of configuration that causes the notice ?

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

by mvrhov at 2011/08/04 04:23:33 -0700

I don't have any validation node set up in my config in such a case it seems that sub nodes doesn't get build. So it seems that I found a bug in config builder.

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

by stof at 2011/08/04 04:54:05 -0700

This is in fact due to a hackish stuff in the DI extension. It changes the configuration after using the Config component to merge them in the case where you enable the forms without enabling the validator, to force enabling it.
2011-08-08 23:23:53 +02:00
Fabien Potencier
860ae77d24 merged branch weaverryan/doctrine_generate_entities_output (PR #1920)
Commits
-------

ba6a09d [DoctrineBundle] Adding a message in doctrine:generate:entities to notify people when a backup file is created

Discussion
----------

[DoctrineBundle] Adding a message in doctrine:generate:entities to notify

Hey guys!

This adds a message to the doctrine:generate:entities command when a backup file is created. This is because the backup file causes confusion in some cases (where did it come from?) and in rare cases - for reasons I don't know yet - the backup file causes "Cannot redeclare class ..." errors.

This is a not a BC-break, but of course could potentially cause an issue if there's some edge case that line 112 doesn't consider. For that reason, I'm pulling against master instead of 2.0.

Thanks!
2011-08-08 23:21:15 +02:00
Ryan Weaver
6738d2b6f8 [FrameworkBundle] Adding information about exactly which cache is being cleared. 2011-08-07 14:02:33 -05:00
Ryan Weaver
ba6a09d452 [DoctrineBundle] Adding a message in doctrine:generate:entities to notify people when a backup file is created 2011-08-07 13:41:19 -05:00
Miha Vrhovnik
e78bc327d6 Fixed: Notice: Undefined index: enable_annotations in ... 2011-08-04 13:56:01 +03:00
Gordon Franke
86f888f91c fix https default port check 2011-08-03 09:14:32 +02:00
ornicar
ee5b9cefda [SwiftmailerBundle] Allow non-file spools
Actually if I have the following configuration:

    swiftmailer:
        spool:
            type:   not_file
            path:   some_path

The DIC compiler will complain:

    'The service "swiftmailer.spool.file" has a dependency on
    a non-existent parameter "swiftmailer.spool.file.path"

Because the file spool service is declared no matter the spool type configured.
And it requires the file.path, which is not available.

This patch aims to load the file spooler only if required by the
configuration.
2011-07-29 16:25:23 -07:00
Ryan Weaver
b8ee401028 Making the english smoother in command help description 2011-07-29 11:28:15 -05:00
Fabien Potencier
c639d8df61 merged branch mbontemps/translation (PR #1848)
Commits
-------

c43aba9 Add a french translation

Discussion
----------

Add a french translation
2011-07-29 10:50:07 +02:00
Fabien Potencier
100eaf1e92 merged branch mbontemps/spelling (PR #1847)
Commits
-------

377128e Fix french spelling

Discussion
----------

Fix french spelling
2011-07-29 10:49:57 +02:00
Fabien Potencier
34eb972415 merged branch yethee/cn_translations (PR #1853)
Commits
-------

cf598de [FrameworkBundle] Updated the Chinese translations by @heccjj
e16ddcf [FrameworkBundle] Renamed validators.cn.xliff to validators.zh_CN.xliff
62da90a [FrameworkBundle] Fixed the Chinese translations by @heccjj
057cf2f Edited src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.cn.xliff via GitHub

Discussion
----------

[FrameworkBundle] Updated the Chinese translations
2011-07-29 09:29:35 +02:00
Deni
cf598de945 [FrameworkBundle] Updated the Chinese translations by @heccjj 2011-07-28 17:59:03 +04:00
Matthieu Bontemps
c43aba9a8e Add a french translation 2011-07-28 11:01:00 +02:00
Matthieu Bontemps
377128ec8a Fix french spelling 2011-07-28 10:51:06 +02:00
Fabien Potencier
bcf5cebcff merged branch pborreli/last-day-typo (PR #1845)
Commits
-------

de5374e [Various] Typos

Discussion
----------

[Various] Typos
2011-07-28 10:39:55 +02:00
Pascal Borreli
de5374ebac [Various] Typos 2011-07-28 10:28:20 +02:00
Hugo Hamon
41fe82656b [SwiftmailerBundle] harmonized commands documentation by changing ./app/console to php app/console. 2011-07-28 10:01:26 +02:00
Hugo Hamon
08072e4595 [FrameworkBundle] harmonized commands documentation by changing ./app/console to php app/console. 2011-07-28 10:01:00 +02:00
Hugo Hamon
ec9c0aab64 [DoctrineBundle] harmonized commands documentation by changing ./app/console to php app/console. 2011-07-28 10:00:47 +02:00
Hugo Hamon
1c082b8133 [FrameworkBundle] added short description for the assets:install command. 2011-07-28 09:52:34 +02:00
Hugo Hamon
e16ccaac71 [SecurityBundle] added short description and help for the init:acl command. 2011-07-28 09:49:02 +02:00
Hugo Hamon
e90efdc383 [DoctrineBundle] removed extra point at the end of the commands' short descriptions. 2011-07-28 09:48:27 +02:00
Casper Valdemar Poulsen
7d5785ea9d Fixed message 8 2011-07-28 08:27:31 +02:00
Casper Valdemar Poulsen
8ef3647df7 Updated danish validator translation 2011-07-28 08:12:00 +02:00
Fabien Potencier
79c11c3351 merged branch irmantas/master (PR #1839)
Commits
-------

9ac711f Added lithuanian validators translation

Discussion
----------

Added translation

Added lithuanian validators translation
2011-07-28 07:06:55 +02:00
excelwebzone
2fca9b748b Some small hebrew fixes 2011-07-27 17:28:06 -07:00
Irmantas
9ac711f687 Added lithuanian validators translation 2011-07-28 00:15:36 +03:00
excelwebzone
8b77d4d24b Hebrew translations updated 2011-07-27 07:02:52 -07:00
umpirsky
56e92e940a Fixed Serbian translation. 2011-07-27 14:57:13 +02:00
Fabien Potencier
f18d71f139 merged branch danielcsgomes/master (PR #1832)
Commits
-------

336e4d4 some minor corrections to pt_PT translation

Discussion
----------

some minor corrections to pt_PT translation
2011-07-27 14:30:40 +02:00
Daniel Gomes
336e4d47e6 some minor corrections to pt_PT translation 2011-07-27 14:28:26 +02:00
Fabien Potencier
de04779eef merged branch doup/euskara_translations (PR #1831)
Commits
-------

363fed4 Euskara translations updated

Discussion
----------

Euskara translations updated
2011-07-27 14:21:05 +02:00
doup
363fed48ee Euskara translations updated 2011-07-27 14:15:55 +02:00
Fabien Potencier
824ee13990 merged branch yethee/ru_translation (PR #1830)
Commits
-------

e7c07c4 [FrameworkBundle] Updated the Russian translations.

Discussion
----------

[FrameworkBundle] Updated the Russian translations.
2011-07-27 14:10:57 +02:00
Deni
e7c07c49a2 [FrameworkBundle] Updated the Russian translations. 2011-07-27 15:42:03 +04:00
Daniel Gomes
00e10f9a44 updated pt_PT translation 2011-07-27 12:59:56 +02:00
Martin Hason
1d90b43a4f [FrameworkBundle] updated czech translation 2011-07-27 12:35:15 +02:00
Deni
e16ddcfd30 [FrameworkBundle] Renamed validators.cn.xliff to validators.zh_CN.xliff 2011-07-27 12:16:47 +04:00
Deni
62da90ad62 [FrameworkBundle] Fixed the Chinese translations by @heccjj
Merge remote-tracking branch 'heccjj/patch-1' into cn_translations
2011-07-27 12:02:44 +04:00
Fabien Potencier
8700cd6154 fixed CS 2011-07-27 08:27:46 +02:00
Fabien Potencier
c248f8123d merged branch craue/patch-9 (PR #1787)
Commits
-------

c558b78 avoid rendering the `ChoiceType` separator if all `choices` are `preferred_choices`

Discussion
----------

avoid rendering the `ChoiceType` separator if all `choices` are `preferred_choices`

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

by fabpot at 2011/07/24 00:51:21 -0700

The same change should be made to the PHP template.

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

by fabpot at 2011/07/25 00:31:39 -0700

I forgot to ask you to add some unit tests too. Thanks.

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

by craue at 2011/07/25 10:23:34 -0700

Are you asking for PHPUnit tests? If so, unfortunately, I'm not able to add those because I haven't used PHPUnit yet. ;)

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

by lenar at 2011/07/25 12:47:51 -0700

I would prefer ```choises | length``` without spaces as everywhere else.

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

by lenar at 2011/07/25 12:50:32 -0700

@fabpot: Since <option disabled> is unclickable in browser (by HTML spec) this really doesn't change anything (something not there is as unclickable) except the the look when rendered. I have hard time to imagine what could become unit-testable here by this change.

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

by stof at 2011/07/25 13:03:47 -0700

@lenar unit testing is not about what the browser could do. What should be unit-tested is that an example will only preferred choices does not output the separator, which is exactly what this PR is about

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

by stof at 2011/07/25 13:04:03 -0700

@lenar unit testing is not about what the browser could do. What should be unit-tested is that an example will only preferred choices does not output the separator, which is exactly what this PR is about

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

by lenar at 2011/07/25 13:08:33 -0700

@stof: ok, put this way you are definitely right.

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

by craue at 2011/07/25 13:37:50 -0700

@lenar: You're right about the spaces. I'm using them in my projects but will remove them here for the sake of consistency.

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

by stloyd at 2011/07/25 13:40:40 -0700

@craue I will write today/tomorrow test to cover your code and send you PR.

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

by craue at 2011/07/25 14:00:26 -0700

@stloyd: That would be nice. But I'm still not that familiar with Git(Hub). Is there anything I have to take care of?

Also, I'd like to squash my three commits into one ... if this is possible for an open PR and if I find out how to do that easily. :D

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

by fabpot at 2011/07/26 00:18:22 -0700

@craue: yes, you should squash your commits into one and use `--force` when you push (the PR will automatically be updated accordingly).
2011-07-27 07:59:53 +02:00
Fabien Potencier
bddfb9f052 merged branch husinluck/master (PR #1822)
Commits
-------

0832f4d Updated Persian translation
2a4fca8 translated validators resources into Persian

Discussion
----------

Persian translation

Added Persian validator translations
2011-07-27 07:43:45 +02:00
Fabien Potencier
1c564f39ca merged branch dlsniper/patch-1 (PR #1820)
Commits
-------

be4b77d Updated Romanian translation

Discussion
----------

Updated Romanian translation

Updated Romanian translation for validation messages to match the latest messages.
2011-07-27 07:43:39 +02:00
Hossein Bukhamsin
0832f4d92f Updated Persian translation 2011-07-27 09:31:14 +04:30
Hossein Bukhamsin
2a4fca8f8f translated validators resources into Persian 2011-07-27 09:18:19 +04:30
heccjj
057cf2fc97 Edited src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.cn.xliff via GitHub 2011-07-27 10:21:49 +08:00
Arnout Boks
9883c603a7 [FrameworkBundle] Updated Dutch validator translations 2011-07-27 00:07:10 +02:00
dlsniper
be4b77d407 Updated Romanian translation 2011-07-27 01:00:05 +03:00
Fabien Potencier
b56a40c9b6 merged branch stloyd/patch-8 (PR #1819)
Commits
-------

fe8e0ad [Validator] Sync polish translation

Discussion
----------

[Validator] Sync polish translation
2011-07-26 20:50:06 +02:00
Fabien Potencier
9b6a7c996d merged branch xmontana/patch-1 (PR #1818)
Commits
-------

321dd45 Updated spanish and catalan translations

Discussion
----------

Updated spanish and catalan translations

Added new translations based on the indonesian updated file.
2011-07-26 20:49:40 +02:00
Joseph Bielawski
fe8e0ad414 [Validator] Sync polish translation 2011-07-26 21:37:22 +03:00
Xavier Montaña Carreras
321dd45eea Updated spanish and catalan translations 2011-07-26 20:15:58 +02:00
Alif Rachmawadi
a66a0ff076 updated missing validator translation #8 2011-07-27 00:06:51 +07:00
Alif Rachmawadi
c95f4619e6 Updated indonesian translation 2011-07-26 22:12:00 +07:00
Fabien Potencier
cae31a72c2 merged branch jdreesen/fix-02 (PR #1814)
Commits
-------

b6ff4d8 [FrameworkBundle] Updated German validator translation

Discussion
----------

[FrameworkBundle] Updated German validator translation
2011-07-26 15:15:45 +02:00
jdreesen
b6ff4d837b [FrameworkBundle] Updated German validator translation 2011-07-26 14:49:09 +02:00
Rostyslav Kinash
6d56f741f4 Fixed typo in ukrainian validator messages translation 2011-07-26 15:08:50 +03:00
Rostyslav Kinash
5d6ec70b88 Added ukrainian validator transaltions 2011-07-26 14:38:53 +03:00
Christian Raue
c558b78bc6 avoid rendering the ChoiceType separator if all choices are preferred_choices 2011-07-26 12:55:46 +02:00
Fabien Potencier
5c13835d21 merged branch aboks/event_trace (PR #1786)
Commits
-------

9d8e6f6 [FrameworkBundle] Changed TraceableEventDispatcher to log calls to event listeners _before_ actually calling them

Discussion
----------

[FrameworkBundle] Log calls to event listereners _before_ calling them

The current implementation of `TraceableEventDispatcher` logs calls to event listeners _after_ actually calling them. This leads to strange logs when an event listener triggers another event.

For example, if I attach some `LoginListener` to the `security.interactive_login`-event, the log will look something like this:
<pre>
...
User "myusername" has been authenticated successfully
Notified event "security.interactive_login" to listener "MyVendor\MyBundle\EventListener\LoginListener::onSecurityInteractiveLogin".
Notified event "kernel.request" to listener "Symfony\Component\Security\Http\Firewall::onKernelRequest".
...
</pre>
From the logs it looks like the `kernel.request` event was fired after the user was authenticated, whereas it was actually the listener to `kernel.request` that caused the user to be authenticated.

By logging the call to the event listener _before_ calling it, the logs will look like this:
<pre>
...
Notified event "kernel.request" to listener "Symfony\Component\Security\Http\Firewall::onKernelRequest".
Notified event "security.interactive_login" to listener "MyVendor\MyBundle\EventListener\LoginListener::onSecurityInteractiveLogin".
User "myusername" has been authenticated successfully
...
</pre>
In my opinion this makes the causal relationship between the events clearer.

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

by stof at 2011/07/24 11:18:48 -0700

👍 for this.
2011-07-26 09:24:48 +02:00
Fabien Potencier
18b1a66c2a partially reverted previous commit 2011-07-26 09:22:13 +02:00
Fabien Potencier
91a41020a8 merged branch sasezaki/BrowserKit_useragent (PR #1789)
Commits
-------

266e60e Don't tell a lie to every WebServers

Discussion
----------

Please don't tell a lie to every WebServers

Fake Useragent name should be only in test case .
2011-07-26 09:21:10 +02:00
Fabien Potencier
195a66fd9d merged branch stloyd/patch-6 (PR #1800)
Commits
-------

03bd20f FrameworkExtension - Remove unused variable

Discussion
----------

FrameworkExtension - Remove unused variable
2011-07-26 09:19:24 +02:00
Fabien Potencier
72201a2485 merged branch 1ed/hungarian-validator-messages (PR #1803)
Commits
-------

987eb54 [FrameworkBundle] updated hungarian validator messages

Discussion
----------

[FrameworkBundle] updated hungarian validator messages
2011-07-26 09:06:25 +02:00
Fabien Potencier
04ac1fdba2 [Routing] changed UrlGeneratorInterface::generate() signature to allow passing objects instead of arrays 2011-07-26 08:00:41 +02:00
Gábor Egyed
987eb54199 [FrameworkBundle] updated hungarian validator messages 2011-07-26 00:55:17 +02:00
Joseph Bielawski
03bd20fafc FrameworkExtension - Remove unused variable 2011-07-25 05:33:12 -07:00
sasezaki
266e60e7a2 Don't tell a lie to every WebServers 2011-07-24 14:01:26 +09:00
alexandresalome
2f65cf29bf Add POC for file storage system 2011-07-23 22:53:52 +02:00
Wouter Van Hecke
00fdfec860 Added a MongoDbProfilerStorage engine 2011-07-23 20:05:48 +02:00
Fabien Potencier
169f1b57f1 [FrameworkBundle] added a note about why we cannot include Controller in the compiled classes 2011-07-23 16:40:25 +02:00
Marcel Beerta
77802efe4e fixes #1779 2011-07-23 07:02:50 -07:00
Arnout Boks
9d8e6f677e [FrameworkBundle] Changed TraceableEventDispatcher to log calls to event listeners _before_ actually calling them 2011-07-23 10:49:25 +02:00
Fabien Potencier
20a704431e [SecurityBundle] fixed typo in tests 2011-07-22 14:50:38 +02:00
Fabien Potencier
aab0bf7e2c merged branch schmittjoh/httpUtilFixes (PR #1739)
Commits
-------

eae6a77 fixed wrong case
d0a175b fixes #1659
f300ede fixes several bugs
a4f05ac added some tests

Discussion
----------

Http util fixes

Fixes several bugs in the http utils.

Please don't add anymore features without sufficient tests. Especially for the Security\Http namespace, regressions are very likely otherwise.

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

by fabpot at 2011/07/19 22:37:26 -0700

Tests do not pass for me:

    There were 2 errors:

    1) Symfony\Bundle\SecurityBundle\Tests\Functional\LocalizedRoutesAsPathTest::testLoginLogoutProcedure with data set #0 ('en')
    InvalidArgumentException: The current node list is empty.

    .../src/Symfony/Component/DomCrawler/Crawler.php:604
    .../src/Symfony/Bundle/SecurityBundle/Tests/Functional/LocalizedRoutesAsPathTest.php:16

    2) Symfony\Bundle\SecurityBundle\Tests\Functional\LocalizedRoutesAsPathTest::testLoginLogoutProcedure with data set #1 ('de')
    InvalidArgumentException: The current node list is empty.

    .../src/Symfony/Component/DomCrawler/Crawler.php:604
    .../src/Symfony/Bundle/SecurityBundle/Tests/Functional/LocalizedRoutesAsPathTest.php:16

    --

    There were 4 failures:

    1) Symfony\Bundle\SecurityBundle\Tests\Functional\LocalizedRoutesAsPathTest::testAccessRestrictedResource with data set #0 ('en')
    Failed asserting that two strings are equal.
    --- Expected
    +++ Actual
    @@ @@
    -http://localhost/en/login
    +http://localhost/login

    .../src/Symfony/Bundle/Securitybundle/Tests/Functional/WebTestCase.php:22
    .../src/Symfony/Bundle/SecurityBundle/Tests/Functional/LocalizedRoutesAsPathTest.php:38

    2) Symfony\Bundle\SecurityBundle\Tests\Functional\LocalizedRoutesAsPathTest::testAccessRestrictedResource with data set #1 ('de')
    Failed asserting that two strings are equal.
    --- Expected
    +++ Actual
    @@ @@
    -http://localhost/de/login
    +http://localhost/login

    .../src/Symfony/Bundle/Securitybundle/Tests/Functional/WebTestCase.php:22
    .../src/Symfony/Bundle/SecurityBundle/Tests/Functional/LocalizedRoutesAsPathTest.php:38

    3) Symfony\Bundle\SecurityBundle\Tests\Functional\LocalizedRoutesAsPathTest::testAccessRestrictedResourceWithForward with data set #0 ('en')
    HTTP/1.0 302 Found
    Cache-Control:  no-cache
    Content-Length: 299
    Content-Type:   text/html; charset=UTF-8
    Date:           Wed, 20 Jul 2011 05:36:27 GMT
    Location:       http://localhost/login
    Set-Cookie: PHPSESSID=11c9c6a7e7620e13bddef223a5ba46d9; path=/; domain=

    <html>
        <head>
            <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
            <meta http-equiv="refresh" content="1;url=http://localhost/login" />
        </head>
        <body>
            Redirecting to <a href="http://localhost/login">http://localhost/login</a>.
        </body>
    </html>
    Failed asserting that <integer:0> matches expected <integer:1>.

    .../src/Symfony/Bundle/SecurityBundle/Tests/Functional/LocalizedRoutesAsPathTest.php:50

    4) Symfony\Bundle\SecurityBundle\Tests\Functional\LocalizedRoutesAsPathTest::testAccessRestrictedResourceWithForward with data set #1 ('de')
    HTTP/1.0 302 Found
    Cache-Control:  no-cache
    Content-Length: 299
    Content-Type:   text/html; charset=UTF-8
    Date:           Wed, 20 Jul 2011 05:36:28 GMT
    Location:       http://localhost/login
    Set-Cookie: PHPSESSID=2bbe63786a088471ade3717917f4ba4f; path=/; domain=

    <html>
        <head>
            <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
            <meta http-equiv="refresh" content="1;url=http://localhost/login" />
        </head>
        <body>
            Redirecting to <a href="http://localhost/login">http://localhost/login</a>.
        </body>
    </html>
    Failed asserting that <integer:0> matches expected <integer:1>.

    .../src/Symfony/Bundle/SecurityBundle/Tests/Functional/LocalizedRoutesAsPathTest.php:50

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

by schmittjoh at 2011/07/19 23:47:29 -0700

I fixed a wrong case, but I couldn't reproduce the other errors (tested on Ubuntu).

My guess is that the temporary directory on your machine couldn't be deleted for some reason, and the test runs with the configuration of some of the previous tests.

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

by fabpot at 2011/07/20 00:28:41 -0700

That does not make any difference for me. For instance, in `LocalizedRoutesAsPathTest::testLoginLogoutProcedure()`, the first request to `'/'.$locale.'/login'` returns the following Response:

    <html>
        <head>
            <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
            <meta http-equiv="refresh" content="1;url=http://localhost/login" />
        </head>
        <body>
            Redirecting to <a href="http://localhost/login">http://localhost/login</a>.
        </body>
    </html>

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

by schmittjoh at 2011/07/20 00:31:34 -0700

That's weird, did you make sure that the temporary directory does not exist?

``rm -Rf /tmp/StandardFormLogin/``

On Wed, Jul 20, 2011 at 9:28 AM, fabpot <
reply@reply.github.com>wrote:

> That does not make any difference for me. For instance, in
> `LocalizedRoutesAsPathTest::testLoginLogoutProcedure()`, the first request
> to `'/'.$locale.'/login'` returns the following Response:
>
>    <html>
>        <head>
>            <meta http-equiv="Content-Type" content="text/html;
> charset=utf-8" />
>            <meta http-equiv="refresh" content="1;url=
> http://localhost/login" />
>        </head>
>        <body>
>            Redirecting to <a href="http://localhost/login">
> http://localhost/login</a>.
>        </body>
>    </html>
>
> --
> Reply to this email directly or view it on GitHub:
> https://github.com/symfony/symfony/pull/1739#issuecomment-1613504
>

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

by fabpot at 2011/07/20 00:33:40 -0700

Yes, I've just checked and the directory does not exist.

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

by schmittjoh at 2011/07/20 00:39:55 -0700

Sorry, I can't reproduce it on Ubuntu and unless someone wants to sponsor me a Mac, there is not much I can do.
2011-07-22 14:45:54 +02:00
Fabien Potencier
5d9bd6da4f [TwigBundle] fixed XSS in the exception template 2011-07-22 13:42:59 +02:00
Fabien Potencier
9bf6216a85 added missing ' escaping 2011-07-22 13:37:23 +02:00
marc.weistroff
2b4cc9bd06 [Form] Changed collection prototype rendering.
Based on PR 1500. It is now rendered inside an attribute of collection
tag.
2011-07-22 11:01:55 +02:00
Fabien Potencier
e776d5dbce [FrameworkBundle] tweaked compiled class cache 2011-07-21 22:32:50 +02:00
Fabien Potencier
cede13e8cc [FrameworkBundle] moved the SessionListener to the session.xml configuration file 2011-07-21 22:32:21 +02:00
Fabien Potencier
ccda267c36 [FrameworkBundle] fixed wrong order in classes to compile 2011-07-21 21:44:10 +02:00
Fabien Potencier
b06a5dfcf3 merged branch andreia/master (PR #1760)
Commits
-------

350f207 Update the CSRF message

Discussion
----------

Update the CSRF message

Update the CSRF message
2011-07-21 20:57:10 +02:00
Fabien Potencier
3749ad43f4 moved the Exception listener from FrameworkBundle to TwigBundle as it relies on Twig being enabled
This commit also fixes exception pages when Twig is not enabled as a templating engine.
Instead of just displaying the raw Twig template as before, we now fallback to the default
exception handler introduced some time ago.
2011-07-21 19:24:04 +02:00
Andreia Bohner
350f2076ba Update the CSRF message 2011-07-21 12:47:42 -03:00
Andreia Bohner
cb37572b58 Update the Brazilian Portuguese validator translations and fix typo 2011-07-20 21:58:46 -03:00
Andreia Bohner
e0e4778fe6 Revert "Update the Brazilian Portuguese validator translations and fix typo"
This reverts commit 63f0707df6.
2011-07-20 21:00:45 -03:00
Andreia Bohner
63f0707df6 Update the Brazilian Portuguese validator translations and fix typo 2011-07-20 20:51:35 -03:00
Martin Schuhfuss
79e4ed661b simplified assignment 2011-07-20 17:29:23 +02:00
Martin Schuhfuss
04302ffe98 simplified ternary-operator 2011-07-20 17:27:36 +02:00
Martin Schuhfuss
3a285c1548 fixed handling of null-values in attribute- and query-arrays
when esi is enabled and internal uris are generated for esi-tags, an
attribute-array consisting entirely of null-values isn't handled correctly.

The reason is that php's `http_build_query()`-method outputs an empty string
for such arrays:

    http_build_query(array('foo' => '')) == 'foo='
    http_build_query(array('foo' => null)) == ''

In the latter case, the generation of an URI in `HttpKernel::generateInternalUri()`
generates an URI that could not be matched by the corresponding route (ex.
`_internal/Controller/.html` opposed to `_internal/Controller/none.html` which
should be expected).

This commit adds a possible solution as well as a simple test for this issue.
2011-07-20 17:03:20 +02:00
Johannes Schmitt
eae6a773c6 fixed wrong case 2011-07-20 08:43:26 +02:00
Johannes Schmitt
d0a175b6cd fixes #1659 2011-07-19 20:51:30 +02:00
Fabien Potencier
d3a69e3531 [DoctrineBundle] renamed RegistryInterface::getEntityManagerForObject() to getEntityManagerForClass() 2011-07-19 19:24:57 +02:00
Johannes Schmitt
f300edebe4 fixes several bugs 2011-07-19 16:21:58 +02:00
Johannes Schmitt
a4f05ac7ab added some tests 2011-07-19 14:50:39 +02:00
Fabien Potencier
dafa4d28d6 [FrameworkBundle] made another small optimization for functional tests 2011-07-19 13:11:12 +02:00
Fabien Potencier
1454d61ad5 [FrameworkBundle] made a huge speed optimization for functional tests 2011-07-19 12:51:57 +02:00
Fabien Potencier
d2e9f14597 merged branch schmittjoh/routerFix (PR #1720)
Commits
-------

9bcce9f fix tests
fc4787a fix non-extensible router

Discussion
----------

Router fix

Right now, the router is hard to overwrite (you need always a compiler pass). This commit fixes this.

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

by fabpot at 2011/07/18 01:15:36 -0700

Why do you need a complier pass to override the router?

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

by schmittjoh at 2011/07/18 01:47:47 -0700

How would you suggest to overwrite it?

Basically, I want to do something like this:

```yml
services:
    router:
         parent: router.default
         class: MyClass
         calls:
             - [moreDeps, []]
```

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

by Seldaek at 2011/07/18 05:07:19 -0700

Then maybe we should somehow support redefining services with the same name while keeping the old one as parent, otherwise we need this foo.default for every service out there?

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

by fabpot at 2011/07/18 06:30:34 -0700

as @Seldeak said, why do that for the router and not all services?

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

by schmittjoh at 2011/07/18 06:38:39 -0700

I have designed the SecurityBundle this way where extension is encouraged.

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

by schmittjoh at 2011/07/18 11:15:57 -0700

I should add that this is mainly a problem for services where you still want to use the semantic configuration that is provided by the bundle. For services which are not configured by the extension, this is not so much of an issue.

Anyway, if you don't want to merge it, just close the PR. I have no problem with using a compiler pass.

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

by fabpot at 2011/07/18 11:55:11 -0700

We already have such a case with translator and translator.real. I will review the existing services to see where it makes sense to implement the same strategy.

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

by Seldaek at 2011/07/18 12:20:55 -0700

I guess you'd do it anyway, but we should pick a winner between .real and .default

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

by lsmith77 at 2011/07/18 12:26:52 -0700

I would prefer ".default" as ".real" always confused me.
2011-07-19 12:06:28 +02:00
Fabien Potencier
b4b8f35da2 renamed translator.real to translator.default 2011-07-19 12:05:51 +02:00
Fabien Potencier
3e2ba60738 merged branch geoffreytran/assetic-debug-performance (PR #1728)
Commits
-------

8e169e4 Improved performance when assetic's use_controller is enabled

Discussion
----------

Improved performance when assetic's use_controller is enabled

When assetic's use_controller is enabled, assetic has to loop through all the templates and create TemplateReferences through the assetic FileResource. This in turn causes a lot of calls to getLogicalName() leading to 5x the calls to the TemplateReference's get() (16k in my case). By accessing the protected field directly compared to using get() we achieve better performance during development (33% in my case).

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

by beberlei at 2011/07/18 11:22:43 -0700

+1 - assetic is a huge performance drain for my app in dev mode aswell.
2011-07-18 20:57:08 +02:00
Fabien Potencier
c3a060e368 updated all core extensions to use the new shortcut method 2011-07-18 17:46:00 +02:00
Fabien Potencier
e2eb601ebd [FrameworkBundle] fixed absolute paths to the cache directory after running cache:clear (closes #1725) 2011-07-18 17:38:41 +02:00
Fabien Potencier
3104a8ab22 oops 2011-07-18 16:14:13 +02:00
Fabien Potencier
8fc9547da5 [FrameworkBundle] fixed session support in functional tests when using several clients in the same process 2011-07-18 16:13:26 +02:00
Fabien Potencier
f9229fe6d8 [Doctrine] added XML support for previous merge 2011-07-18 14:42:48 +02:00
Fabien Potencier
ab94d125b8 merged branch noelg/fix-doctrineconfiguration-dql (PR #1719)
Commits
-------

872d308 [DoctrineBundle] Allowed to configure dql functions without using the multiple entity mangers syntax

Discussion
----------

[DoctrineBundle] Allowed to configure dql functions using the single EM syntax

[DoctrineBundle] Allowed to configure dql functions without using the multiple entity managers syntax
2011-07-18 14:37:42 +02:00
Johannes Schmitt
9bcce9fcdb fix tests 2011-07-18 10:10:04 +02:00
Johannes Schmitt
fc4787ac90 fix non-extensible router 2011-07-18 10:06:01 +02:00
Noel GUILBERT
872d308e9c [DoctrineBundle] Allowed to configure dql functions without using the multiple entity mangers syntax 2011-07-18 19:51:38 +12:00
excelwebzone
0d39cbb2d3 Fixed grammar 2011-07-17 09:35:52 -07:00
excelwebzone
254ce24a11 Translated missed row 2011-07-17 09:27:04 -07:00
Fabien Potencier
ebaf290d0a merged branch doup/euskara_translations (PR #1714)
Commits
-------

39e476f Basque translations added.
6f650f8 Basque file added

Discussion
----------

Euskara translations

Basque (euskara) translations added.
2011-07-17 07:49:14 +02:00
doup
39e476f921 Basque translations added. 2011-07-16 23:02:24 +02:00
Fabien Potencier
c7b18887f8 merged branch xmontana/patch-1 (PR #1710)
Commits
-------

b64c15a Updated spanish translation

Discussion
----------

Updated spanish translation
2011-07-16 18:22:45 +02:00
xmontana
b64c15a17a Updated spanish translation 2011-07-16 00:59:04 -07:00
Geoffrey Tran
8e169e4457 Improved performance when assetic's use_controller is enabled
When assetic's use_controller is enabled, assetic has to loop through all the templates and create TemplateReferences through the assetic FileResource. This in turn causes a lot of calls to getLogicalName() leading to 5x the calls to the TemplateReference's get() (16k in my case). By accessing the protected field directly compared to using get() we achieve better performance during development (33% in my case).
2011-07-15 20:52:23 -05:00
Costin Bereveanu
5395c6c675 Few RO translation tweaks 2011-07-15 02:46:38 -07:00
Johannes Schmitt
af6d4e4c8e changed test 2011-07-15 10:29:16 +02:00
Johannes Schmitt
6d1eb48a9b fixes a bug during session initialization in test environment 2011-07-15 10:23:38 +02:00
doup
6f650f8e8d Basque file added 2011-07-15 02:16:30 +02:00
Fabien Potencier
6a264979d1 merged branch erheme318/mongolian_translation (PR #1695)
Commits
-------

3e092b5 Updated the Mongolian validator translations

Discussion
----------

Updated the Mongolian validator translations
2011-07-14 18:33:39 +02:00
Fabien Potencier
0dd44898ce merged branch erheme318/master (PR #1694)
Commits
-------

e09bc30 Added the Mongolian validator translations

Discussion
----------

Added the Mongolian validator translations
2011-07-14 18:29:20 +02:00
erheme318
3e092b5bfc Updated the Mongolian validator translations 2011-07-14 14:55:06 +07:00
Fabien Potencier
12b1875b88 merged branch schmittjoh/testSessionListenerFix (PR #1691)
Commits
-------

e94eb0b fixes a bug in the test session listener

Discussion
----------

fixes a bug in the test session listener
2011-07-14 08:16:53 +02:00
erheme318
e09bc3015d Added the Mongolian validator translations 2011-07-14 09:14:38 +07:00
Johannes Schmitt
e94eb0b7e0 fixes a bug in the test session listener 2011-07-14 00:54:12 +02:00
Fabien Potencier
093c0c7163 merged branch hason/czech_translation (PR #1682)
Commits
-------

6f859a4 [FrameworkBundle] Updated the Czech validator translations

Discussion
----------

[FrameworkBundle] Updated the Czech validator translations
2011-07-13 18:20:39 +02:00
Martin Hason
6f859a4e04 [FrameworkBundle] Updated the Czech validator translations 2011-07-13 18:16:11 +02:00
xmontana
ba7ec9b98b Edited src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.ca.xliff via GitHub 2011-07-13 09:14:00 -07:00
Fabien Potencier
f0a75e8358 merged branch aboks/dutch_translations (PR #1679)
Commits
-------

61de80d [FrameworkBundle] Updated the Dutch validator translations for the changes in 95f7eedd63

Discussion
----------

[FrameworkBundle] Updated the Dutch validator translations

[FrameworkBundle] Updated the Dutch validator translations for the changes in 95f7eedd63
2011-07-13 16:42:29 +02:00
Arnout Boks
61de80d414 [FrameworkBundle] Updated the Dutch validator translations for the changes in 95f7eedd63 2011-07-13 16:36:57 +02:00
Christian Raue
7992ce6796 fixed German validator translation again (see #1676) 2011-07-13 06:59:52 -07:00
Christian Raue
374c53ab47 fixed German validator translation 2011-07-13 06:02:09 -07:00
Fabien Potencier
c881379fe7 merged branch marcw/doctrine-bridge-security (PR #1672)
Commits
-------

66c698a Updated update.md
b33e1ba [SecurityBundle] Reported namespace change of EntityUserProvider
26e96c4 [DoctrineBridge] Changed namespace of EntityUserProvider[B
1633cb3 [Security] Moved EntityUserProvider to Doctrine Bridge

Discussion
----------

[2.1] Moved EntityUserProvider class from Security Component to Doctrine Bridge

I guess that this should better be placed in the Doctrine Bridge.

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

by henrikbjorn at 2011/07/13 00:00:39 -0700

Missing entry in UPDATE.md

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

by schmittjoh at 2011/07/13 00:34:10 -0700

What is our distribution strategy for these bridges?

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

by stof at 2011/07/13 00:53:29 -0700

@schmittjoh Each bridge (Doctrine, Twig, Monolog) is available as a separate repo just like the components.

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

by schmittjoh at 2011/07/13 00:57:41 -0700

I've just checked, but we don't seem to have PEAR packages for these.

If we make this change, then it should still be easy to install the component because there is no benefit of moving this class there. The bridges are mainly useful for extracting code from bundles.

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

by stof at 2011/07/13 01:02:42 -0700

@fabpot any plan to add the bridges on the PEAR channel ?

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

by fabpot at 2011/07/13 02:27:05 -0700

@stof: Bridges will be added with the RC5 release.
2011-07-13 11:28:02 +02:00