merged branch fabpot/removed-unused-code (PR #8440)

fabpot · fabpot · commit 4efac29ba2de · 2013-07-08T15:00:35.000+02:00
This PR was merged into the 2.3 branch. Discussion ---------- removed unused code | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a Commits ------- c60bdf5 removed unused code
diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php
@@ -12,7 +12,6 @@
 namespace Symfony\Bridge\Doctrine\DependencyInjection\CompilerPass;
 
 use Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException;
-
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
diff --git a/src/Symfony/Component/Intl/Util/IntlTestHelper.php b/src/Symfony/Component/Intl/Util/IntlTestHelper.php
@@ -39,11 +39,11 @@ public static function requireIntl(\PhpUnit_Framework_TestCase $testCase)
         //   * the intl extension is loaded with version Intl::getIcuStubVersion()
         //   * the intl extension is not loaded
 
-        if (IcuVersion::compare(Intl::getIcuVersion(), Intl::getIcuStubVersion(), '!=', $precision = 1)) {
+        if (IcuVersion::compare(Intl::getIcuVersion(), Intl::getIcuStubVersion(), '!=', 1)) {
             $testCase->markTestSkipped('Please change ICU version to ' . Intl::getIcuStubVersion());
         }
 
-        if (IcuVersion::compare(Intl::getIcuDataVersion(), Intl::getIcuStubVersion(), '!=', $precision = 1)) {
+        if (IcuVersion::compare(Intl::getIcuDataVersion(), Intl::getIcuStubVersion(), '!=', 1)) {
             $testCase->markTestSkipped('Please change the Icu component to version 1.0.x or 1.' . IcuVersion::normalize(Intl::getIcuStubVersion(), 1) . '.x');
         }
 
@@ -75,12 +75,12 @@ public static function requireFullIntl(\PhpUnit_Framework_TestCase $testCase)
         }
 
         // ... and only if the version is *one specific version* ...
-        if (IcuVersion::compare(Intl::getIcuVersion(), Intl::getIcuStubVersion(), '!=', $precision = 1)) {
+        if (IcuVersion::compare(Intl::getIcuVersion(), Intl::getIcuStubVersion(), '!=', 1)) {
             $testCase->markTestSkipped('Please change ICU version to ' . Intl::getIcuStubVersion());
         }
 
         // ... and only if the data in the Icu component matches that version.
-        if (IcuVersion::compare(Intl::getIcuDataVersion(), Intl::getIcuStubVersion(), '!=', $precision = 1)) {
+        if (IcuVersion::compare(Intl::getIcuDataVersion(), Intl::getIcuStubVersion(), '!=', 1)) {
             $testCase->markTestSkipped('Please change the Icu component to version 1.0.x or 1.' . IcuVersion::normalize(Intl::getIcuStubVersion(), 1) . '.x');
         }
 

Original file line number	Diff line number	Diff line change
`@@ -39,11 +39,11 @@ public static function requireIntl(\PhpUnit_Framework_TestCase $testCase)`
`39`	`39`	`// * the intl extension is loaded with version Intl::getIcuStubVersion()`
`40`	`40`	`// * the intl extension is not loaded`
`41`	`41`
`42`		`- if (IcuVersion::compare(Intl::getIcuVersion(), Intl::getIcuStubVersion(), '!=', $precision = 1)) {`
	`42`	`+ if (IcuVersion::compare(Intl::getIcuVersion(), Intl::getIcuStubVersion(), '!=', 1)) {`
`43`	`43`	`$testCase->markTestSkipped('Please change ICU version to ' . Intl::getIcuStubVersion());`
`44`	`44`	`}`
`45`	`45`
`46`		`- if (IcuVersion::compare(Intl::getIcuDataVersion(), Intl::getIcuStubVersion(), '!=', $precision = 1)) {`
	`46`	`+ if (IcuVersion::compare(Intl::getIcuDataVersion(), Intl::getIcuStubVersion(), '!=', 1)) {`
`47`	`47`	`$testCase->markTestSkipped('Please change the Icu component to version 1.0.x or 1.' . IcuVersion::normalize(Intl::getIcuStubVersion(), 1) . '.x');`
`48`	`48`	`}`
`49`	`49`
`@@ -75,12 +75,12 @@ public static function requireFullIntl(\PhpUnit_Framework_TestCase $testCase)`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`// ... and only if the version is one specific version ...`
`78`		`- if (IcuVersion::compare(Intl::getIcuVersion(), Intl::getIcuStubVersion(), '!=', $precision = 1)) {`
	`78`	`+ if (IcuVersion::compare(Intl::getIcuVersion(), Intl::getIcuStubVersion(), '!=', 1)) {`
`79`	`79`	`$testCase->markTestSkipped('Please change ICU version to ' . Intl::getIcuStubVersion());`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`// ... and only if the data in the Icu component matches that version.`
`83`		`- if (IcuVersion::compare(Intl::getIcuDataVersion(), Intl::getIcuStubVersion(), '!=', $precision = 1)) {`
	`83`	`+ if (IcuVersion::compare(Intl::getIcuDataVersion(), Intl::getIcuStubVersion(), '!=', 1)) {`
`84`	`84`	`$testCase->markTestSkipped('Please change the Icu component to version 1.0.x or 1.' . IcuVersion::normalize(Intl::getIcuStubVersion(), 1) . '.x');`
`85`	`85`	`}`
`86`	`86`