From 57e1aebb278c1874c2d2ac5453cc42d9414a6bfb Mon Sep 17 00:00:00 2001 From: William DURAND Date: Sun, 25 Sep 2011 23:38:31 +0200 Subject: [PATCH 1/7] Fixed undefined index notice in readProperty() method (PropertyPath) --- src/Symfony/Component/Form/Util/PropertyPath.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Component/Form/Util/PropertyPath.php b/src/Symfony/Component/Form/Util/PropertyPath.php index 756377d0df..3e7086f86d 100644 --- a/src/Symfony/Component/Form/Util/PropertyPath.php +++ b/src/Symfony/Component/Form/Util/PropertyPath.php @@ -279,7 +279,9 @@ class PropertyPath implements \IteratorAggregate throw new InvalidPropertyException(sprintf('Index "%s" cannot be read from object of type "%s" because it doesn\'t implement \ArrayAccess', $property, get_class($object))); } - return $object[$property]; + if (isset($object[$property])) { + return $object[$property]; + } } else { $camelProp = $this->camelize($property); $reflClass = new \ReflectionClass($object); From 4fbcc202f633b13067acd72c341b8f5af82dede8 Mon Sep 17 00:00:00 2001 From: Adam Monsen Date: Tue, 15 Nov 2011 10:19:29 -0800 Subject: [PATCH 2/7] UPDATE.md: trivial markdown syntax fix --- UPDATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UPDATE.md b/UPDATE.md index c61249ae71..632b78d4f0 100644 --- a/UPDATE.md +++ b/UPDATE.md @@ -24,7 +24,7 @@ RC4 to RC5 `Symfony\Bridge\Doctrine\Security\User\EntityUserProvider`. * Cookies access from `HeaderBag` has been removed. Accessing Request cookies - must be done via `Request::$cookies``. + must be done via `Request::$cookies`. * `ResponseHeaderBag::getCookie()` and `ResponseHeaderBag::hasCookie()` methods were removed. From 86a8b9f567d8d30a1c629c46a6a8950944d2a4bb Mon Sep 17 00:00:00 2001 From: Drak Date: Wed, 16 Nov 2011 08:26:56 +0545 Subject: [PATCH 3/7] Allow vendors checkout transport method to be overridden manually. --- vendors.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/vendors.php b/vendors.php index b64859de1c..6e8208e1bd 100755 --- a/vendors.php +++ b/vendors.php @@ -25,6 +25,12 @@ if (!is_dir($vendorDir = dirname(__FILE__).'/vendor')) { mkdir($vendorDir, 0777, true); } +// optional transport change +$transport = false; +if (isset($argv[1]) && in_array($argv[1], array('--transport=http', '--transport=https', '--transport=git'))) { + $transport = preg_replace('/^--transport=(.*)$/', '$1', $argv[1]); +} + $deps = array( array('doctrine', 'http://github.com/doctrine/doctrine2.git', '2.1.2'), array('doctrine-dbal', 'http://github.com/doctrine/dbal.git', '2.1.3'), @@ -36,6 +42,10 @@ $deps = array( foreach ($deps as $dep) { list($name, $url, $rev) = $dep; + + if ($transport) { + $url = preg_replace('/^(http:|https:|git:)(.*)/', $transport . ':$2', $url); + } echo "> Installing/Updating $name\n"; From 79ae3fced982331aa89885289b942a5961646846 Mon Sep 17 00:00:00 2001 From: Kris Wallsmith Date: Wed, 16 Nov 2011 13:22:07 -0800 Subject: [PATCH 4/7] [Form] fixed radio and checkbox when data is not bool --- .../Form/Extension/Core/Type/CheckboxType.php | 2 +- .../Form/Extension/Core/Type/RadioType.php | 2 +- .../Extension/Core/Type/CheckboxTypeTest.php | 37 +++++++++++++++++++ 3 files changed, 39 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/Form/Extension/Core/Type/CheckboxType.php b/src/Symfony/Component/Form/Extension/Core/Type/CheckboxType.php index d2c82d3ac4..2ac3a0ffad 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/CheckboxType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/CheckboxType.php @@ -37,7 +37,7 @@ class CheckboxType extends AbstractType { $view ->set('value', $form->getAttribute('value')) - ->set('checked', (Boolean) $form->getData()) + ->set('checked', (Boolean) $form->getClientData()) ; } diff --git a/src/Symfony/Component/Form/Extension/Core/Type/RadioType.php b/src/Symfony/Component/Form/Extension/Core/Type/RadioType.php index f3b98b9775..97a5d03948 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/RadioType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/RadioType.php @@ -37,7 +37,7 @@ class RadioType extends AbstractType { $view ->set('value', $form->getAttribute('value')) - ->set('checked', (Boolean) $form->getData()) + ->set('checked', (Boolean) $form->getClientData()) ; if ($view->hasParent()) { diff --git a/tests/Symfony/Tests/Component/Form/Extension/Core/Type/CheckboxTypeTest.php b/tests/Symfony/Tests/Component/Form/Extension/Core/Type/CheckboxTypeTest.php index e028448424..129dac3043 100644 --- a/tests/Symfony/Tests/Component/Form/Extension/Core/Type/CheckboxTypeTest.php +++ b/tests/Symfony/Tests/Component/Form/Extension/Core/Type/CheckboxTypeTest.php @@ -11,6 +11,8 @@ namespace Symfony\Tests\Component\Form\Extension\Core\Type; +use Symfony\Component\Form\CallbackTransformer; + class CheckboxTypeTest extends TypeTestCase { public function testPassValueToView() @@ -38,4 +40,39 @@ class CheckboxTypeTest extends TypeTestCase $this->assertFalse($view->get('checked')); } + + /** + * @dataProvider proviceTransformedData + */ + public function testTransformedData($data, $expected) + { + // present a binary status field as a checkbox + $transformer = new CallbackTransformer( + function ($value) + { + return 'expedited' == $value; + }, + function ($value) + { + return $value ? 'expedited' : 'standard'; + } + ); + + $form = $this->builder + ->create('expedited_shipping', 'checkbox') + ->prependClientTransformer($transformer) + ->getForm(); + $form->setData($data); + $view = $form->createView(); + + $this->assertEquals($expected, $view->get('checked')); + } + + public function proviceTransformedData() + { + return array( + array('expedited', true), + array('standard', false), + ); + } } From d4f1721336f9730ed6880cf493659985a7207aa3 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 18 Nov 2011 17:32:56 +0100 Subject: [PATCH 5/7] [Swiftmailer] fixed composer.json --- src/Symfony/Bridge/Swiftmailer/composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Symfony/Bridge/Swiftmailer/composer.json b/src/Symfony/Bridge/Swiftmailer/composer.json index c33f72945a..05aa5a29e7 100644 --- a/src/Symfony/Bridge/Swiftmailer/composer.json +++ b/src/Symfony/Bridge/Swiftmailer/composer.json @@ -17,11 +17,11 @@ } ], "require": { - "php": ">=5.3.2" - "swiftmailer/swiftmailer": ">=4.1", + "php": ">=5.3.2", + "swiftmailer/swiftmailer": ">=4.1" }, "suggest": { - "symfony/http-kernel": ">=2.0", + "symfony/http-kernel": ">=2.0" }, "autoload": { "psr-0": { "Symfony\\Bridge\\Swiftmailer": "" } From 1dcf74ab70d2a889a797765b5fbfbba23a008efb Mon Sep 17 00:00:00 2001 From: ondrowan Date: Mon, 21 Nov 2011 21:11:59 +0100 Subject: [PATCH 6/7] Fixed small typo in phpdoc. --- .../Security/Core/Authorization/Voter/VoterInterface.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/Security/Core/Authorization/Voter/VoterInterface.php b/src/Symfony/Component/Security/Core/Authorization/Voter/VoterInterface.php index b37880fdc5..41d9e6475a 100644 --- a/src/Symfony/Component/Security/Core/Authorization/Voter/VoterInterface.php +++ b/src/Symfony/Component/Security/Core/Authorization/Voter/VoterInterface.php @@ -45,7 +45,7 @@ interface VoterInterface /** * Returns the vote for the given parameters. * - * This method must return one of the following constant: + * This method must return one of the following constants: * ACCESS_GRANTED, ACCESS_DENIED, or ACCESS_ABSTAIN. * * @param TokenInterface $token A TokenInterface instance From 1fb90397c45d337958fe5dbeb981686886572428 Mon Sep 17 00:00:00 2001 From: pborreli Date: Mon, 21 Nov 2011 04:06:46 +0000 Subject: [PATCH 7/7] [FrameworkBundle] Skipping one test failing on PHP5.3.2 --- src/Symfony/Bundle/FrameworkBundle/Tests/HttpKernelTest.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/HttpKernelTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/HttpKernelTest.php index b4afbc55a9..e3eddc5d85 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/HttpKernelTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/HttpKernelTest.php @@ -169,6 +169,10 @@ class HttpKernelTest extends \PHPUnit_Framework_TestCase public function testExceptionInSubRequestsDoesNotMangleOutputBuffers() { + if (version_compare(phpversion(), "5.3.2", "<=")) { + $this->markTestSkipped('Test fails with PHP5.3.2 due to https://bugs.php.net/bug.php?id=50563'); + } + $request = new Request(); $container = $this->getMock('Symfony\\Component\\DependencyInjection\\ContainerInterface');