Skip to content

[RFC] Support foo.some_thing === foo.someThing #934

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
simensen wants to merge 1 commit into from
Closed

[RFC] Support foo.some_thing === foo.someThing #934

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions lib/Twig/Template.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,12 +405,20 @@ protected function getAttribute($object, $item, array $arguments = array(), $typ
}

$lcItem = strtolower($item);
$deunderscoreItem = str_replace('_', '', $lcItem);
$checkDecamelItem = $lcItem !== $deunderscoreItem;
if (isset(self::$cache[$class]['methods'][$lcItem])) {
$method = $item;
} elseif (isset(self::$cache[$class]['methods']['get'.$lcItem])) {
$method = 'get'.$item;
} elseif (isset(self::$cache[$class]['methods']['is'.$lcItem])) {
$method = 'is'.$item;
} elseif ($checkDecamelItem && isset(self::$cache[$class]['methods'][$deunderscoreItem])) {
$method = $deunderscoreItem;
} elseif ($checkDecamelItem && isset(self::$cache[$class]['methods']['get'.$deunderscoreItem])) {
$method = 'get'.$deunderscoreItem;
} elseif ($checkDecamelItem && isset(self::$cache[$class]['methods']['is'.$deunderscoreItem])) {
$method = 'is'.$deunderscoreItem;
} elseif (isset(self::$cache[$class]['methods']['__call'])) {
$method = $item;
} else {
Expand Down
15 changes: 15 additions & 0 deletions test/Twig/Tests/TemplateTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,15 @@ public function getGetAttributeTests()
array(false, null, $methodAndPropObject, 'c', array(), $methodType),
array(false, null, $methodAndPropObject, 'c', array(), $arrayType),

array(true, 'camelcase', $methodAndPropObject, 'camelcase', array(), $anyType),
array(true, 'camelcase', $methodAndPropObject, 'camelcase', array(), $methodType),

array(true, 'camelcase', $methodAndPropObject, 'camelCase', array(), $anyType),
array(true, 'camelcase', $methodAndPropObject, 'camelCase', array(), $methodType),

array(true, 'camelcase', $methodAndPropObject, 'camel_case', array(), $anyType),
array(true, 'camelcase', $methodAndPropObject, 'camel_case', array(), $methodType),
array(false, null, $methodAndPropObject, 'a', array(), $arrayType),
));

// tests when input is not an array or object
Expand Down Expand Up @@ -523,6 +532,12 @@ private function getC()
{
return 'c';
}

private $camelCase = 'camelcase_prop';
public function getCamelCase()
{
return 'camelcase';
}
}

class Twig_TemplateMagicMethodObject
Expand Down