Merge branch 'release/0.1.10'

bobthecow · Jun 19, 2014 · 60bf0ad · 60bf0ad
2 parents c290226 + 13754d2
commit 60bf0ad
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/src/Psy/CodeCleaner/CalledClassPass.php b/src/Psy/CodeCleaner/CalledClassPass.php
@@ -54,6 +54,11 @@ public function enterNode(Node $node)
  return;
  }
 
+ // We'll ignore name expressions as well (things like `$foo()`)
+ if (!($node->name instanceof Name)) {
+ return;
+ }
+
  $name = strtolower($node->name);
  if (in_array($name, array('get_class', 'get_called_class'))) {
  $msg = sprintf('%s() called without object from outside a class', $name);

diff --git a/src/Psy/Shell.php b/src/Psy/Shell.php
@@ -39,7 +39,7 @@
  */
 class Shell extends Application
 {
- const VERSION = 'v0.1.9';
+ const VERSION = 'v0.1.10';
 
  const PROMPT = '>>> ';
  const BUFF_PROMPT = '... ';

diff --git a/test/Psy/Test/CodeCleaner/CalledClassPassTest.php b/test/Psy/Test/CodeCleaner/CalledClassPassTest.php
@@ -69,6 +69,7 @@ public function validStatements()
  array('class Foo { function bar() { return get_class(null); } }'),
  array('class Foo { function bar() { return get_called_class(); } }'),
  array('class Foo { function bar() { return get_called_class(null); } }'),
+ array('$foo = function(){}; $foo()'),
  );
  }