diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.0' 

* 2.0:
  Revert "merged branch jakzal/2.0-StaticMethodLoaderFix (PR #3937)"
  fixed CS
This commit is contained in:
Fabien Potencier 2012-04-18 11:42:52 +02:00
parent ee0be6c408 29a41ec13b
commit 99f8a3ce97
4 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Symfony/Component/Locale/Resources/stubs/functions.php
View File

@ -19,7 +19,8 @@ use Symfony\Component\Locale\Stub\StubIntl;
* @return Boolean Whether the error code indicates an error
* @see Symfony\Component\Locale\Stub\StubIntl::isFailure
*/
function intl_is_failure($errorCode) {
function intl_is_failure($errorCode)
{
return StubIntl::isFailure($errorCode);
}
@ -31,9 +32,11 @@ function intl_is_failure($errorCode) {
* StubIntl::U_ZERO_ERROR if no error occurred
* @see Symfony\Component\Locale\Stub\StubIntl::getErrorCode
*/
function intl_get_error_code() {
function intl_get_error_code()
{
return StubIntl::getErrorCode();
}
/**
* Stub implementation for the intl_get_error_code function of the intl extension
*
@ -42,7 +45,8 @@ function intl_get_error_code() {
* "U_ZERO_ERROR" if no error occurred
* @see Symfony\Component\Locale\Stub\StubIntl::getErrorMessage
*/
function intl_get_error_message() {
function intl_get_error_message()
{
return StubIntl::getErrorMessage();
}
@ -53,6 +57,7 @@ function intl_get_error_message() {
*
* @see Symfony\Component\Locale\Stub\StubIntl::getErrorName
*/
function intl_error_name($errorCode) {
function intl_error_name($errorCode)
{
return StubIntl::getErrorName($errorCode);
}
}

1
src/Symfony/Component/Routing/RouteCompiler.php
View File

@ -124,6 +124,7 @@ class RouteCompiler implements RouteCompilerInterface
$regexp .= str_repeat(")?", $nbTokens - $firstOptional);
}
}
return $regexp;
}
}

2
src/Symfony/Component/Validator/Mapping/Loader/StaticMethodLoader.php
View File

@ -37,7 +37,7 @@ class StaticMethodLoader implements LoaderInterface
throw new MappingException(sprintf('The method %s::%s should be static', $reflClass->getName(), $this->methodName));
}
if ($reflClass->isAbstract() || $reflMethod->getDeclaringClass()->getName() != $reflClass->getName()) {
if ($reflMethod->getDeclaringClass()->getName() != $reflClass->getName()) {
return false;
}

13
src/Symfony/Component/Validator/Tests/Mapping/Loader/StaticMethodLoaderTest.php
View File

@ -33,14 +33,6 @@ class StaticMethodLoaderTest extends \PHPUnit_Framework_TestCase
$this->assertFalse($loader->loadClassMetadata($metadata));
}
public function testLoadClassMetadataReturnsFalseIfMethodIsAbstract()
{
$loader = new StaticMethodLoader('loadMetadata');
$metadata = new ClassMetadata(__NAMESPACE__.'\AbstractStaticLoaderEntity');
$this->assertFalse($loader->loadClassMetadata($metadata));
}
public function testLoadClassMetadata()
{
$loader = new StaticMethodLoader('loadMetadata');
@ -86,8 +78,3 @@ class BaseStaticLoaderDocument
$metadata->addConstraint(new ConstraintA());
}
}
abstract class AbstractStaticLoaderEntity
{
abstract public static function loadMetadata(ClassMetadata $metadata);
}