Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 9aff1ec

Browse filesBrowse files
fabpotfabpot
committed
Merge branch '2.3' into 2.5
* 2.3: [2.3] More cs fixes Removed unused imports CS fixes bumped Symfony version to 2.3.24 updated VERSION for 2.3.23 update CONTRIBUTORS for 2.3.23 updated CHANGELOG for 2.3.23 Conflicts: src/Symfony/Bundle/FrameworkBundle/EventListener/SessionListener.php src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php src/Symfony/Component/HttpKernel/Kernel.php src/Symfony/Component/HttpKernel/Tests/Bundle/BundleTest.php src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
2 parents 51aa478 + 15551f2 commit 9aff1ec
Copy full SHA for 9aff1ec

File tree

Expand file treeCollapse file tree

42 files changed

+44
-77
lines changed
Filter options

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree

42 files changed

+44
-77
lines changed

‎CHANGELOG-2.3.md

Copy file name to clipboardExpand all lines: CHANGELOG-2.3.md
+10Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,16 @@ in 2.3 minor versions.
77
To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
88
To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v2.3.0...v2.3.1
99

10+
* 2.3.23 (2014-12-03)
11+
12+
* bug #12811 Configure firewall's kernel exception listener with configured entry point or a default entry point (rjkip)
13+
* bug #12784 [DependencyInjection] make paths relative to __DIR__ in the generated container (nicolas-grekas)
14+
* bug #12716 [ClassLoader] define constant only if it wasn't defined before (xabbuh)
15+
* bug #12553 [Debug] fix error message on double exception (nicolas-grekas)
16+
* bug #12550 [FrameworkBundle] backport #12489 (xabbuh)
17+
* bug #12570 Fix initialized() with aliased services (Daniel Wehner)
18+
* bug #12137 [FrameworkBundle] cache:clear command fills *.php.meta files with wrong data (Strate)
19+
1020
* 2.3.22 (2014-11-20)
1121

1222
* bug #12525 [Bundle][FrameworkBundle] be smarter when guessing the document root (xabbuh)

‎src/Symfony/Bridge/Doctrine/DependencyInjection/Security/UserProvider/EntityFactory.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/DependencyInjection/Security/UserProvider/EntityFactory.php
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Symfony\Bridge\Doctrine\DependencyInjection\Security\UserProvider;
1313

1414
use Symfony\Component\Config\Definition\Builder\NodeDefinition;
15-
1615
use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\UserProvider\UserProviderFactoryInterface;
1716
use Symfony\Component\DependencyInjection\DefinitionDecorator;
1817
use Symfony\Component\DependencyInjection\ContainerBuilder;

‎src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111

1212
namespace Symfony\Bridge\Propel1\Form\ChoiceList;
1313

14-
use \ModelCriteria;
15-
use \BaseObject;
16-
use \Persistent;
14+
use ModelCriteria;
15+
use BaseObject;
16+
use Persistent;
1717
use Symfony\Component\Form\Exception\StringCastException;
1818
use Symfony\Component\Form\Extension\Core\ChoiceList\ObjectChoiceList;
1919
use Symfony\Component\OptionsResolver\Exception\InvalidOptionsException;

‎src/Symfony/Bridge/Propel1/Form/DataTransformer/CollectionToArrayTransformer.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Propel1/Form/DataTransformer/CollectionToArrayTransformer.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace Symfony\Bridge\Propel1\Form\DataTransformer;
1313

14-
use \PropelObjectCollection;
14+
use PropelObjectCollection;
1515
use Symfony\Component\Form\DataTransformerInterface;
1616
use Symfony\Component\Form\Exception\TransformationFailedException;
1717

‎src/Symfony/Bridge/Propel1/Tests/Fixtures/Item.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Propel1/Tests/Fixtures/Item.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace Symfony\Bridge\Propel1\Tests\Fixtures;
1313

14-
use \PropelPDO;
14+
use PropelPDO;
1515

1616
class Item implements \Persistent
1717
{

‎src/Symfony/Bridge/Propel1/Tests/Form/DataTransformer/CollectionToArrayTransformerTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Propel1/Tests/Form/DataTransformer/CollectionToArrayTransformerTest.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace Symfony\Bridge\Propel1\Tests\Form\DataTransformer;
1313

14-
use \PropelObjectCollection;
14+
use PropelObjectCollection;
1515
use Symfony\Bridge\Propel1\Form\DataTransformer\CollectionToArrayTransformer;
1616
use Symfony\Bridge\Propel1\Tests\Propel1TestCase;
1717

‎src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory;
1313

1414
use Symfony\Component\Config\Definition\Builder\NodeDefinition;
15-
1615
use Symfony\Component\DependencyInjection\DefinitionDecorator;
1716
use Symfony\Component\DependencyInjection\ContainerBuilder;
1817
use Symfony\Component\DependencyInjection\Reference;

‎src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpBasicFactory.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpBasicFactory.php
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory;
1313

1414
use Symfony\Component\Config\Definition\Builder\NodeDefinition;
15-
1615
use Symfony\Component\DependencyInjection\DefinitionDecorator;
1716
use Symfony\Component\DependencyInjection\ContainerBuilder;
1817
use Symfony\Component\DependencyInjection\Reference;

‎src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpDigestFactory.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpDigestFactory.php
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory;
1313

1414
use Symfony\Component\Config\Definition\Builder\NodeDefinition;
15-
1615
use Symfony\Component\DependencyInjection\DefinitionDecorator;
1716
use Symfony\Component\DependencyInjection\ContainerBuilder;
1817
use Symfony\Component\DependencyInjection\Reference;

‎src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/X509Factory.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/X509Factory.php
-2Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@
1212
namespace Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory;
1313

1414
use Symfony\Component\Config\Definition\Builder\NodeDefinition;
15-
1615
use Symfony\Component\DependencyInjection\DefinitionDecorator;
17-
1816
use Symfony\Component\DependencyInjection\ContainerBuilder;
1917
use Symfony\Component\DependencyInjection\Reference;
2018

‎src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/InMemoryFactory.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/InMemoryFactory.php
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Symfony\Bundle\SecurityBundle\DependencyInjection\Security\UserProvider;
1313

1414
use Symfony\Component\Config\Definition\Builder\NodeDefinition;
15-
1615
use Symfony\Component\DependencyInjection\DefinitionDecorator;
1716
use Symfony\Component\DependencyInjection\ContainerBuilder;
1817
use Symfony\Component\DependencyInjection\Reference;

‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/DependencyInjection/FormLoginExtension.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/DependencyInjection/FormLoginExtension.php
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\FormLoginBundle\DependencyInjection;
1313

1414
use Symfony\Component\DependencyInjection\Reference;
15-
1615
use Symfony\Component\DependencyInjection\ContainerBuilder;
1716
use Symfony\Component\HttpKernel\DependencyInjection\Extension;
1817

‎src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Symfony\Bundle\WebProfilerBundle\Tests\DependencyInjection;
1313

1414
use Symfony\Bundle\WebProfilerBundle\Tests\TestCase;
15-
1615
use Symfony\Bundle\WebProfilerBundle\DependencyInjection\WebProfilerExtension;
1716
use Symfony\Component\DependencyInjection\Container;
1817
use Symfony\Component\DependencyInjection\ContainerBuilder;

‎src/Symfony/Component/DependencyInjection/Compiler/CheckExceptionOnInvalidReferenceBehaviorPass.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Compiler/CheckExceptionOnInvalidReferenceBehaviorPass.php
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Symfony\Component\DependencyInjection\Compiler;
1313

1414
use Symfony\Component\DependencyInjection\Definition;
15-
1615
use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
1716
use Symfony\Component\DependencyInjection\ContainerInterface;
1817
use Symfony\Component\DependencyInjection\Reference;

‎src/Symfony/Component/DependencyInjection/Tests/Compiler/AnalyzeServiceReferencesPassTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Compiler/AnalyzeServiceReferencesPassTest.php
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Symfony\Component\DependencyInjection\Tests\Compiler;
1313

1414
use Symfony\Component\DependencyInjection\Definition;
15-
use Symfony\Component\DependencyInjection\Compiler\Compiler;
1615
use Symfony\Component\DependencyInjection\Compiler\AnalyzeServiceReferencesPass;
1716
use Symfony\Component\DependencyInjection\Compiler\RepeatedPass;
1817
use Symfony\Component\DependencyInjection\Reference;

‎src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckCircularReferencesPassTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckCircularReferencesPassTest.php
-4Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,9 @@
1212
namespace Symfony\Component\DependencyInjection\Tests\Compiler;
1313

1414
use Symfony\Component\DependencyInjection\Reference;
15-
1615
use Symfony\Component\DependencyInjection\Compiler\CheckCircularReferencesPass;
17-
1816
use Symfony\Component\DependencyInjection\Compiler\AnalyzeServiceReferencesPass;
19-
2017
use Symfony\Component\DependencyInjection\Compiler\Compiler;
21-
2218
use Symfony\Component\DependencyInjection\ContainerBuilder;
2319

2420
class CheckCircularReferencesPassTest extends \PHPUnit_Framework_TestCase

‎src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckExceptionOnInvalidReferenceBehaviorPassTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckExceptionOnInvalidReferenceBehaviorPassTest.php
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Symfony\Component\DependencyInjection\Tests\Compiler;
1313

1414
use Symfony\Component\DependencyInjection\Definition;
15-
1615
use Symfony\Component\DependencyInjection\Compiler\CheckExceptionOnInvalidReferenceBehaviorPass;
1716
use Symfony\Component\DependencyInjection\Reference;
1817
use Symfony\Component\DependencyInjection\ContainerBuilder;

‎src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckReferenceValidityPassTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckReferenceValidityPassTest.php
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Symfony\Component\DependencyInjection\Tests\Compiler;
1313

1414
use Symfony\Component\DependencyInjection\Scope;
15-
1615
use Symfony\Component\DependencyInjection\Compiler\CheckReferenceValidityPass;
1716
use Symfony\Component\DependencyInjection\ContainerInterface;
1817
use Symfony\Component\DependencyInjection\Reference;

‎src/Symfony/Component/DependencyInjection/Tests/Compiler/RemoveUnusedDefinitionsPassTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Compiler/RemoveUnusedDefinitionsPassTest.php
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Symfony\Component\DependencyInjection\Tests\Compiler;
1313

1414
use Symfony\Component\DependencyInjection\Compiler\AnalyzeServiceReferencesPass;
15-
use Symfony\Component\DependencyInjection\Compiler\Compiler;
1615
use Symfony\Component\DependencyInjection\Compiler\RepeatedPass;
1716
use Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass;
1817
use Symfony\Component\DependencyInjection\Definition;

‎src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Symfony\Component\DependencyInjection\Tests\Loader;
1313

1414
use Symfony\Component\DependencyInjection\ContainerInterface;
15-
1615
use Symfony\Component\DependencyInjection\ContainerBuilder;
1716
use Symfony\Component\DependencyInjection\Reference;
1817
use Symfony\Component\DependencyInjection\Definition;

‎src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoicesToValuesTransformer.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoicesToValuesTransformer.php
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Symfony\Component\Form\Extension\Core\DataTransformer;
1313

1414
use Symfony\Component\Form\Exception\TransformationFailedException;
15-
1615
use Symfony\Component\Form\DataTransformerInterface;
1716
use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceListInterface;
1817

‎src/Symfony/Component/Form/Tests/AbstractLayoutTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1784,8 +1784,7 @@ public function testEmptyRootFormName()
17841784
$this->assertMatchesXpath($this->renderWidget($form->createView()),
17851785
'//input[@type="hidden"][@id="_token"][@name="_token"]
17861786
|
1787-
//input[@type="text"][@id="child"][@name="child"]'
1788-
, 2);
1787+
//input[@type="text"][@id="child"][@name="child"]', 2);
17891788
}
17901789

17911790
public function testButton()

‎src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ChoicesToValuesTransformerTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ChoicesToValuesTransformerTest.php
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer;
1313

1414
use Symfony\Component\Form\Extension\Core\ChoiceList\SimpleChoiceList;
15-
1615
use Symfony\Component\Form\Extension\Core\DataTransformer\ChoicesToValuesTransformer;
1716

1817
class ChoicesToValuesTransformerTest extends \PHPUnit_Framework_TestCase

‎src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ public function testHandleClosureValidationGroups()
367367
$object = $this->getMock('\stdClass');
368368
$options = array('validation_groups' => function (FormInterface $form) {
369369
return array('group1', 'group2');
370-
},);
370+
});
371371
$form = $this->getBuilder('name', '\stdClass', $options)
372372
->setData($object)
373373
->getForm();

‎src/Symfony/Component/HttpKernel/Tests/ClientTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/Tests/ClientTest.php
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Symfony\Component\HttpKernel\Tests;
1313

1414
use Symfony\Component\HttpKernel\Client;
15-
use Symfony\Component\HttpKernel\HttpKernel;
1615
use Symfony\Component\HttpFoundation\Request;
1716
use Symfony\Component\HttpFoundation\Response;
1817
use Symfony\Component\HttpFoundation\StreamedResponse;

‎src/Symfony/Component/Intl/Intl.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Intl.php
-4Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,11 @@
1111

1212
namespace Symfony\Component\Intl;
1313

14-
use Symfony\Component\Intl\Data\Bundle\Reader\BundleReaderInterface;
1514
use Symfony\Component\Intl\Data\Bundle\Reader\JsonBundleReader;
16-
use Symfony\Component\Intl\Data\Bundle\Reader\IntlBundleReader;
1715
use Symfony\Component\Intl\Data\Bundle\Reader\BufferedBundleReader;
1816
use Symfony\Component\Intl\Data\Bundle\Reader\BundleEntryReader;
1917
use Symfony\Component\Intl\Data\Bundle\Reader\BundleEntryReaderInterface;
20-
use Symfony\Component\Intl\Data\Bundle\Reader\PhpBundleReader;
2118
use Symfony\Component\Intl\Data\Provider\ScriptDataProvider;
22-
use Symfony\Component\Intl\Exception\InvalidArgumentException;
2319
use Symfony\Component\Intl\ResourceBundle\CurrencyBundle;
2420
use Symfony\Component\Intl\ResourceBundle\CurrencyBundleInterface;
2521
use Symfony\Component\Intl\ResourceBundle\LanguageBundle;

‎src/Symfony/Component/Intl/ResourceBundle/CurrencyBundle.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/ResourceBundle/CurrencyBundle.php
+6-7Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
use Symfony\Component\Intl\Data\Provider\CurrencyDataProvider;
1616
use Symfony\Component\Intl\Data\Provider\LocaleDataProvider;
1717
use Symfony\Component\Intl\Exception\MissingResourceException;
18-
use Symfony\Component\Intl\Intl;
1918

2019
/**
2120
* Default implementation of {@link CurrencyBundleInterface}.
@@ -53,7 +52,7 @@ public function getCurrencySymbol($currency, $displayLocale = null)
5352
try {
5453
return $this->getSymbol($currency, $displayLocale);
5554
} catch (MissingResourceException $e) {
56-
return null;
55+
return;
5756
}
5857
}
5958

@@ -65,7 +64,7 @@ public function getCurrencyName($currency, $displayLocale = null)
6564
try {
6665
return $this->getName($currency, $displayLocale);
6766
} catch (MissingResourceException $e) {
68-
return null;
67+
return;
6968
}
7069
}
7170

@@ -77,7 +76,7 @@ public function getCurrencyNames($displayLocale = null)
7776
try {
7877
return $this->getNames($displayLocale);
7978
} catch (MissingResourceException $e) {
80-
return null;
79+
return;
8180
}
8281
}
8382

@@ -89,7 +88,7 @@ public function getFractionDigits($currency)
8988
try {
9089
return parent::getFractionDigits($currency);
9190
} catch (MissingResourceException $e) {
92-
return null;
91+
return;
9392
}
9493
}
9594

@@ -101,7 +100,7 @@ public function getRoundingIncrement($currency)
101100
try {
102101
return parent::getRoundingIncrement($currency);
103102
} catch (MissingResourceException $e) {
104-
return null;
103+
return;
105104
}
106105
}
107106

@@ -113,7 +112,7 @@ public function getLocales()
113112
try {
114113
return $this->localeProvider->getLocales();
115114
} catch (MissingResourceException $e) {
116-
return null;
115+
return;
117116
}
118117
}
119118
}

‎src/Symfony/Component/Intl/ResourceBundle/LanguageBundle.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/ResourceBundle/LanguageBundle.php
+5-6Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
use Symfony\Component\Intl\Data\Provider\LocaleDataProvider;
1717
use Symfony\Component\Intl\Data\Provider\ScriptDataProvider;
1818
use Symfony\Component\Intl\Exception\MissingResourceException;
19-
use Symfony\Component\Intl\Intl;
2019

2120
/**
2221
* Default implementation of {@link LanguageBundleInterface}.
@@ -69,7 +68,7 @@ public function getLanguageName($language, $region = null, $displayLocale = null
6968
try {
7069
return $this->getName($language, $displayLocale);
7170
} catch (MissingResourceException $e) {
72-
return null;
71+
return;
7372
}
7473
}
7574

@@ -81,7 +80,7 @@ public function getLanguageNames($displayLocale = null)
8180
try {
8281
return $this->getNames($displayLocale);
8382
} catch (MissingResourceException $e) {
84-
return null;
83+
return;
8584
}
8685
}
8786

@@ -93,7 +92,7 @@ public function getScriptName($script, $language = null, $displayLocale = null)
9392
try {
9493
return $this->scriptProvider->getName($script, $displayLocale);
9594
} catch (MissingResourceException $e) {
96-
return null;
95+
return;
9796
}
9897
}
9998

@@ -105,7 +104,7 @@ public function getScriptNames($displayLocale = null)
105104
try {
106105
return $this->scriptProvider->getNames($displayLocale);
107106
} catch (MissingResourceException $e) {
108-
return null;
107+
return;
109108
}
110109
}
111110

@@ -117,7 +116,7 @@ public function getLocales()
117116
try {
118117
return $this->localeProvider->getLocales();
119118
} catch (MissingResourceException $e) {
120-
return null;
119+
return;
121120
}
122121
}
123122
}

‎src/Symfony/Component/Intl/ResourceBundle/LocaleBundle.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/ResourceBundle/LocaleBundle.php
+3-5Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@
1111

1212
namespace Symfony\Component\Intl\ResourceBundle;
1313

14-
use Symfony\Component\Intl\Data\Bundle\Reader\BundleEntryReaderInterface;
1514
use Symfony\Component\Intl\Data\Provider\LocaleDataProvider;
1615
use Symfony\Component\Intl\Exception\MissingResourceException;
17-
use Symfony\Component\Intl\Intl;
1816

1917
/**
2018
* Default implementation of {@link LocaleBundleInterface}.
@@ -33,7 +31,7 @@ public function getLocales()
3331
try {
3432
return parent::getLocales();
3533
} catch (MissingResourceException $e) {
36-
return null;
34+
return;
3735
}
3836
}
3937

@@ -45,7 +43,7 @@ public function getLocaleName($locale, $displayLocale = null)
4543
try {
4644
return $this->getName($locale, $displayLocale);
4745
} catch (MissingResourceException $e) {
48-
return null;
46+
return;
4947
}
5048
}
5149

@@ -57,7 +55,7 @@ public function getLocaleNames($displayLocale = null)
5755
try {
5856
return $this->getNames($displayLocale);
5957
} catch (MissingResourceException $e) {
60-
return null;
58+
return;
6159
}
6260
}
6361
}

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.