Commit Graph

11102 Commits

Author SHA1 Message Date
Fabien Potencier
5a4a73ef94 merged branch havvg/2.1 (PR #5540)
Commits
-------

8dd19d8 fix Fatal error: Cannot access private property

Discussion
----------

fix Fatal error: Cannot access private property

The testsuite fails with fatal error with message:

```plain
PHP Fatal error: Cannot access private property Symfony\Component\HttpFoundation\Tests\Session\Storage\Handler\MongoDbSessionHandlerTest::$options
in src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php on line 85
```

on this system:

```plain
PHP 5.3.13 with Suhosin-Patch (cli) (built: Jun 20 2012 17:05:20)
Copyright (c) 1997-2012 The PHP Group
Zend Engine v2.3.0, Copyright (c) 1998-2012 Zend Technologies
    with Xdebug v2.1.3, Copyright (c) 2002-2012, by Derick Rethans
```

```plain
PHPUnit 3.6.11 by Sebastian Bergmann
```
2012-09-18 18:44:48 +02:00
Toni Uebernickel
8dd19d8d89 fix Fatal error: Cannot access private property
PHP Fatal error: Cannot access private property Symfony\Component\HttpFoundation\Tests\Session\Storage\Handler\MongoDbSessionHandlerTest::$options
in src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php on line 85
2012-09-18 18:09:52 +02:00
Fabien Potencier
ff1b990075 merged 2.0 2012-09-17 22:41:57 +02:00
Fabien Potencier
d62f492529 merged branch jmikola/2.0-contributing-file (PR #5533)
Commits
-------

71d8148 Create CONTRIBUTING.md file for auto-linking in PR's

Discussion
----------

Create CONTRIBUTING.md file for auto-linking in PR's

See: https://github.com/blog/1184-contributing-guidelines

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

by kbond at 2012-09-17T17:35:26Z

@jmikola won the race

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

by stof at 2012-09-17T17:37:35Z

and this should be updated according to the discussion on the dev mailing-list

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

by fabpot at 2012-09-17T17:42:28Z

Instead of duplicating the information, I would just linked to the documentation.

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

by jmikola at 2012-09-17T18:42:29Z

I reduced the file to the "Contributing" block from the readme.

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

by lsmith77 at 2012-09-17T19:36:36Z

+1
2012-09-17 22:33:03 +02:00
Jeremy Mikola
71d8148ad6 Create CONTRIBUTING.md file for auto-linking in PR's
See: https://github.com/blog/1184-contributing-guidelines
2012-09-17 14:40:53 -04:00
Fabien Potencier
470a770c7a merged branch RoumenMe/translation-2.1 (PR #5534)
Commits
-------

3269014 Added Bulgarian translation

Discussion
----------

Added Bulgarian translation

Bulgarian translation of validator messages
2012-09-17 19:56:59 +02:00
Roumen Damianoff
326901497a Added Bulgarian translation
Bulgarian translation of validator messages
2012-09-17 20:45:59 +03:00
Fabien Potencier
5bd1fd3e04 merged branch AndreyChernykh/2.1 (PR #5524)
Commits
-------

580d5a7 Typo fix

Discussion
----------

Typo fix

Typo fix in "Range" validator constraints.
2012-09-17 19:15:52 +02:00
Fabien Potencier
8e759076f0 merged branch armetiz/patch-7 (PR #5530)
Commits
-------

de6658b [Profiler]Use the abstract method to get client IP

Discussion
----------

[Profiler]Use the abstract method to get client IP

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

by armetiz at 2012-09-17T13:37:19Z

This PR is also done for master branch : https://github.com/symfony/symfony/pull/5527
2012-09-17 19:11:29 +02:00
Thomas Tourlourat
de6658b902 [Profiler]Use the abstract method to get client IP 2012-09-17 16:33:21 +03:00
Andrey Chernykh
580d5a7c54 Typo fix 2012-09-17 11:30:49 +04:00
Fabien Potencier
9993b86a48 merged branch richardmiller/fixing_twig_lint_description (PR #5523)
Commits
-------

2bcb6f2 Fixing incorrect word in twig:lint command description

Discussion
----------

[TwigBundle} Fixing incorrect word in twig:lint command description
2012-09-17 08:54:20 +02:00
Richard Miller
2bcb6f2c9b Fixing incorrect word in twig:lint command description 2012-09-16 20:33:46 +01:00
Fabien Potencier
846df269dd merged branch aderuwe/patch-1 (PR #5505)
Commits
-------

c2f8563 Rename $key parameter to $name for consistency

Discussion
----------

[DependencyInjection] Rename $key parameter to $name for consistency

When I worked on #5478, I noticed an inconsistency in parameter naming in the ```ParameterBag#remove``` method. This PR brings things in line with the rest of the class.

Bug fix: no
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
License of the code: MIT
2012-09-16 09:41:02 +02:00
Alexander Deruwe
c2f8563a52 Rename $key parameter to $name for consistency 2012-09-13 09:24:01 +02:00
Fabien Potencier
f23fd03732 bumped Symfony version to 2.1.2-DEV 2012-09-11 11:12:50 +02:00
Fabien Potencier
87065dc0ba merged branch besnikb/2.0 (PR #5482)
Commits
-------

3648abe =Minor chnage: replaced function by method

Discussion
----------

=Minor chnage: replaced function by method
2012-09-11 09:00:20 +02:00
Fabien Potencier
173711a462 updated VERSION for 2.1.1 2012-09-11 07:00:41 +02:00
Fabien Potencier
f6ff2fae89 updated CHANGELOG for 2.1.1 2012-09-11 06:59:00 +02:00
Fabien Potencier
d0818dd1c4 added CHANGELOG for 2.1 2012-09-11 06:58:24 +02:00
Besnik Br
3648abea9b =Minor chnage: replaced function by method 2012-09-10 20:40:01 +02:00
Fabien Potencier
597819eff1 reintroduced self.version for the replace entry 2012-09-10 16:10:21 +02:00
Fabien Potencier
3c32fd993d replaced self.version by 2.1.* in composer.json files 2012-09-10 12:53:42 +02:00
Fabien Potencier
487b8c1bbb merged branch aderuwe/issue-5477 (PR #5478)
Commits
-------

690e28e Convert parameter name to lowercase when removing an element from ParameterBag

Discussion
----------

[DependencyInjection] Convert parameter name to lowercase when removing an element from ParameterBag

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: #5477
License of the code: MIT

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

by sstok at 2012-09-10T08:42:30Z

👍

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

by fabpot at 2012-09-10T09:28:16Z

Shouldn't it be done on the 2.0 branch?

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

by stloyd at 2012-09-10T09:29:35Z

@fabpot AFAIK `2.0` don't have `ParameterBag#remove()` method

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

by aderuwe at 2012-09-10T09:29:52Z

The remove method is not present in 2.0.

On Mon, Sep 10, 2012 at 11:28 AM, Fabien Potencier <notifications@github.com
> wrote:

> Shouldn't it be done on the 2.0 branch?
>
> —
> Reply to this email directly or view it on GitHub<https://github.com/symfony/symfony/pull/5478#issuecomment-8418300>.
>
>
2012-09-10 11:46:45 +02:00
Alexander Deruwe
690e28e3df Convert parameter name to lowercase when removing an element from ParameterBag 2012-09-10 10:22:46 +02:00
Fabien Potencier
2e7e296fec merged branch stof/fix_phpdoc (PR #5467)
Commits
-------

05f7f78 Fixed the phpdoc in the DependencyInjection component

Discussion
----------

Fixed the phpdoc in the DependencyInjection component

I was sick of having a warning in my IDE each time I used DefinitionDecorator because of an invalid phpdoc in the constructor, so I took some time and fixed it in the whole DI component.

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

by stof at 2012-09-07T23:09:04Z

The travis failure is unrelated. It is all about some intl failures.

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

by eventhorizonpl at 2012-09-07T23:37:04Z

Reviewed-by: Michal Piotrowski <michal@eventhorizon.pl>

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

by pborreli at 2012-09-08T01:42:26Z

👍
2012-09-08 13:19:38 +02:00
Christophe Coevoet
05f7f78332 Fixed the phpdoc in the DependencyInjection component 2012-09-08 00:56:45 +02:00
Fabien Potencier
e7059b44c7 bumped Symfony version to 2.1.1-DEV 2012-09-06 12:12:03 +02:00
Fabien Potencier
5745b53d05 updated VERSION for 2.1.0 2012-09-06 11:01:56 +02:00
Fabien Potencier
4035e1a755 Merge branch '2.0'
* 2.0:
  bumped Symfony version to 2.0.18-DEV

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2012-09-06 10:57:51 +02:00
Fabien Potencier
00ec9b5391 Revert "merged branch Tobion/strictrequirements (PR #5181)"
This reverts commit 2da2a44382, reversing
changes made to 58855475c6.
2012-09-05 17:44:14 +02:00
Fabien Potencier
aae4ceea56 Revert "merged branch Tobion/requirementscheck (PR #5187)"
This reverts commit 2cf50b7801, reversing
changes made to 569e29d91f.
2012-09-05 17:44:10 +02:00
Fabien Potencier
fdf25289f8 Revert "merged branch Tobion/uselessparamdefaults (PR #5400)"
This reverts commit 0f61b2eb90, reversing
changes made to 5e7723fcbb.
2012-09-05 17:44:05 +02:00
Fabien Potencier
1dd153205b merged branch beberlei/RevertDbalAcl (PR #5253)
Commits
-------

1b5ad17 Revert "Removed MySQL-exclusive usage of unsigned integer from table creation"

Discussion
----------

[Security][DBAL] Revert MySQL unsigned removal

Revert "Removed MySQL-exclusive usage of unsigned integer from table creation"

This reverts commit 57694aaa94.

The problem is underlying in Doctrine DBAL change tracking and should
either be fixed or ignored there.

I opened a ticket on Doctrine Jira http://doctrine-project.org/jira/browse/DBAL-322

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

by fabpot at 2012-08-14T06:40:47Z

I will merge this PR after we have a release of DBAL that includes the fix for DBAL-322.

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

by acasademont at 2012-08-20T08:01:48Z

This was already fixed 2 weeks ago in doctrine/dbal#183 so i guess this can be closed

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

by acasademont at 2012-08-20T08:02:06Z

merged i mean
2012-09-04 16:49:55 +02:00
Fabien Potencier
0919361e2e merged branch eventhorizonpl/100ptc_component_httpfundation (PR #5409)
Commits
-------

3036b00 JsonResponseTest

Discussion
----------

JsonResponseTest

Hi,

This patch adds some tests for JsonResponse.

Best regards,
Michal

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

by eventhorizonpl at 2012-09-01T07:09:12Z

Done. Thanks for the review!
2012-09-04 14:24:42 +02:00
Fabien Potencier
2cd61ab8d9 merged branch eventhorizonpl/100_ptc_symfony_component_class_loader_p3 (PR #5412)
Commits
-------

8a3c8c9 load test

Discussion
----------

load test

Hi,

This patch add test that covers this situation

public static function load($classes, $cacheDir, $name, $autoReload, $adaptive = false, $extension = '.php')
{
  // each $name can only be loaded once per PHP process
  if (isset(self::$loaded[$name])) {
     return;
}

Best regards,
Michal
2012-09-04 14:23:54 +02:00
Fabien Potencier
5040599272 merged branch eventhorizonpl/100ptc_component_httpfundation_p2 (PR #5413)
Commits
-------

0af8778 Response tests

Discussion
----------

Response tests

Hi,

This patch adds some tests to ResponseTest.

Best regards,
Michal

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

by eventhorizonpl at 2012-09-01T09:45:16Z

Fixed, thanks for the review.

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

by eventhorizonpl at 2012-09-02T19:39:26Z

CS fixed. Thanks for the review :)
2012-09-04 14:19:30 +02:00
Fabien Potencier
a44c8d8c84 merged branch eventhorizonpl/100ptc_component_httpfundation_p3 (PR #5414)
Commits
-------

c74d9a9 ResponseHeaderBag tests

Discussion
----------

ResponseHeaderBag tests

Hi,

This patch adds some ResponseHeaderBag tests. Now ResponseHeaderBag got 100% test coverage :)

Best regards,
Michal
2012-09-04 14:18:55 +02:00
Fabien Potencier
ee51ca8c16 merged branch eventhorizonpl/100ptc_component_httpfundation_p4 (PR #5415)
Commits
-------

b89d4ee StreamedResponseTest

Discussion
----------

StreamedResponseTest

Hi,

This patch adds one test to StreamedResponseTest and fixes another. StreamedResponse has 100% test coverage.

Best regards,
Michal
2012-09-04 14:18:30 +02:00
Fabien Potencier
36c64e0e33 merged branch eventhorizonpl/100ptc_component_httpfundation_p5 (PR #5416)
Commits
-------

21a5841 RedirectResponse tests

Discussion
----------

RedirectResponse tests

Hi,

This patch adds 100% test coverage for RedirectResponse class.

Best regards,
Michal
2012-09-04 14:18:13 +02:00
Fabien Potencier
7888598547 merged branch armetiz/patch-2 (PR #5429)
Commits
-------

6d49bfb Remove "you" word.

Discussion
----------

Remove "you" word.
2012-09-04 12:57:37 +02:00
Thomas Tourlourat
6d49bfb394 Remove "you" word. 2012-09-04 12:35:57 +03:00
Michal Piotrowski
0af87785a7 Response tests
fix things pointed out by Koc

fix things pointed out by stof
2012-09-02 15:37:09 -04:00
Michal Piotrowski
21a5841c6a RedirectResponse tests 2012-09-01 08:25:20 -04:00
Michal Piotrowski
b89d4eeb23 StreamedResponseTest 2012-09-01 07:57:21 -04:00
Michal Piotrowski
c74d9a90f5 ResponseHeaderBag tests 2012-09-01 07:18:47 -04:00
Michal Piotrowski
8a3c8c9c03 load test 2012-09-01 03:02:36 -04:00
Michal Piotrowski
3036b009a3 JsonResponseTest 2012-09-01 02:56:27 -04:00
Sebastian Bergmann
41ffd006e5 Point to information on how to run the test suite. (closes #5405) 2012-09-01 08:52:18 +02:00
Fabien Potencier
797ba6846a merged branch bschussek/issue4670 (PR #5406)
Commits
-------

04fd5f1 [Form] Fixed PropertyPath to not modify Collection instances (not even their clones)

Discussion
----------

[Form] Fixed PropertyPath to not modify Collection instances

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: #4670
Todo: -

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

by pocallaghan at 2012-08-31T14:20:52Z

As far as I can see the pull request does fix the issue, which makes sense based on the code change (I didn't know iterator_to_array existed, good call). One thing I would say, I'm not sure on the use in the change to the test case. It's not clear to me what additional protection this extra assertion gives, as both the old and new code seem to pass.

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

by bschussek at 2012-08-31T14:21:46Z

The new assertion is there because not even the old code (`clone`) was tested.

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

by stof at 2012-08-31T14:37:38Z

@bschussek but was it failing without the code change ?

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

by bschussek at 2012-08-31T22:12:00Z

@stof It was not, but I was unable to write a good test for the change within reasonable time. I added an explanatory comment instead.
2012-09-01 08:47:43 +02:00