8000 Merge branch '2.4' · symfony/symfony@7d80045 · GitHub
[go: up one dir, main page]
Skip to content

Commit 7d80045

Browse files
fabpotfabpot
committed
Merge branch '2.4'
* 2.4: fixed typos Fixed deprecated method calls Add testing against HHVM at Travis-CI Fixed typo Fixed typo Fixed typo fixed acronyms [Validator] Fixed IBAN validator with 0750447346 value Conflicts: src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
2 parents f063108 + 3a1d220 commit 7d80045

File tree

35 files changed

+59
-46
lines changed

35 files changed

+59
-46
lines changed

‎.travis.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,17 @@ php:
55
- 5.3
66
- 5.4
77
- 5.5
8+
- hhvm
9+
10+
matrix:
11+
allow_failures:
12+
- php: hhvm
813

914
services: mongodb
1015

1116
before_script:
1217
- sudo apt-get install parallel
13-
- echo '' > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
18+
- sh -c 'if [ $(php -r "echo (int) defined("HHVM_VERSION");") -eq 0 ]; then echo "" >> "~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini"; fi;'
1419
- echo "extension = mongo.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
1520
- sh -c 'if [ $(php -r "echo PHP_MINOR_VERSION;") -le 4 ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'
1621
- echo "extension = memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini

‎src/Symfony/Bridge/Doctrine/Form/DoctrineOrmExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public function __construct(ManagerRegistry $registry)
2727
protected function loadTypes()
2828
{
2929
return array(
30-
new Type\EntityType($this->registry, PropertyAccess::getPropertyAccessor()),
30+
new Type\EntityType($this->registry, PropertyAccess::createPropertyAccessor()),
3131
);
3232
}
3333

‎src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ abstract class DoctrineType extends AbstractType
4545
public function __construct(ManagerRegistry $registry, PropertyAccessorInterface $propertyAccessor = null)
4646
{
4747
$this->registry = $registry;
48-
$this->propertyAccessor = $propertyAccessor ?: PropertyAccess::getPropertyAccessor();
48+
$this->propertyAccessor = $propertyAccessor ?: PropertyAccess::createPropertyAccessor();
4949
}
5050

5151
public function buildForm(FormBuilderInterface $builder, array $options)

‎src/Symfony/Bridge/Propel1/Form/PropelExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class PropelExtension extends AbstractExtension
2424
protected function loadTypes()
2525
{
2626
return array(
27-
new Type\ModelType(PropertyAccess::getPropertyAccessor()),
27+
new Type\ModelType(PropertyAccess::createPropertyAccessor()),
2828
new Type\TranslationCollectionType(),
2929
new Type\TranslationType()
3030
);

‎src/Symfony/Bridge/Propel1/Form/Type/ModelType.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class ModelType extends AbstractType
5757

5858
public function __construct(PropertyAccessorInterface $propertyAccessor = null)
5959
{
60-
$this->propertyAccessor = $propertyAccessor ?: PropertyAccess::getPropertyAccessor();
60+
$this->propertyAccessor = $propertyAccessor ?: PropertyAccess::createPropertyAccessor();
6161
}
6262

6363
public function buildForm(FormBuilderInterface $builder, array $options)

‎src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ CHANGELOG
4545
* replaced Symfony\Component\HttpKernel\Debug\ContainerAwareTraceableEventDispatcher by Symfony\Component\HttpKernel\Debug\TraceableEventDispatcher
4646
* added Client::enableProfiler()
4747
* a new parameter has been added to the DIC: `router.request_context.base_url`
48-
You can customize it for your functional tests or for generating urls with
49-
the right base url when your are in the cli context.
48+
You can customize it for your functional tests or for generating URLs with
49+
the right base URL when your are in the CLI context.
5050
* added support for default templates per render tag
5151

5252
2.1.0

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@
5757

5858
<service id="templating.asset.request_aware_package" class="Symfony\Component\Templating\Asset\PackageInterface" factory-service="templating.asset.package_factory" factory-method="getPackage" abstract="true">
5959
<argument type="service" id="request" strict="false" />
60-
<argument /> <!-- http id -->
61-
<argument /> <!-- ssl id -->
60+
<argument /> <!-- HTTP id -->
61+
<argument /> <!-- SSL id -->
6262
</service>
6363

6464
<service id="templating.asset.package_factory" class="%templating.asset.package_factory.class%">

‎src/Symfony/Bundle/FrameworkBundle/Templating/GlobalVariables.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public function getUser()
7474
/**
7575
* Returns the current request.
7676
*
77-
* @return Request|null The http request object
77+
* @return Request|null The HTTP request object
7878
*/
7979
public function getRequest()
8080
{

‎src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ protected static function getPhpUnitXmlDir()
9393
* PHPUnit will use the last configuration argument on the command line, so this only returns
9494
* the last configuration argument.
9595
*
96-
* @return string The value of the PHPUnit cli configuration option
96+
* @return string The value of the PHPUnit CLI configuration option
9797
*/
9898
private static function getPhpUnitCliConfigArgument()
9999
{

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ public function testTemplating()
153153

154154
$this->assertEquals('request', $container->getDefinition('templating.helper.assets')->getScope(), '->registerTemplatingConfiguration() sets request scope on assets helper if one or more packages are request-scoped');
155155

156-
// default package should have one http base url and path package ssl url
156+
// default package should have one HTTP base URL and path package SSL URL
157157
$this->assertTrue($container->hasDefinition('templating.asset.default_package.http'));
158158
$package = $container->getDefinition('templating.asset.default_package.http');
159159
$this->assertInstanceOf('Symfony\\Component\\DependencyInjection\\DefinitionDecorator', $package);

0 commit comments

Comments
 (0)
0