Merge pull request #88 from phpcr/allow_real_closure

Enable an actual closure to be passed to CliHelper apply-closures

Author: dbu

src/PHPCR/Util/Console/Helper/PhpcrCliHelper.php

@@ -116,12 +116,20 @@ public function processNode(OutputInterface $output, $node, $options)
             $node->removeMixin($removeMixin);
         }
 
-        foreach ($options['applyClosures'] as $closureString) {
-            $closure = create_function('$session, $node', $closureString);
-            $output->writeln(sprintf(
-                '<comment> > Applying closure: %s</comment>',
-                strlen($closureString) > 75 ? substr($closureString, 0, 72).'...' : $closureString
-            ));
+        foreach ($options['applyClosures'] as $closure) {
+            if ($closure instanceof \Closure) {
+                $output->writeln(
+                    '<comment> > Applying closure</comment>'
+                );
+            } else {
+                $closureString = $closure;
+                $closure = create_function('$session, $node', $closure);
+                $output->writeln(sprintf(
+                    '<comment> > Applying closure: %s</comment>',
+                    strlen($closureString) > 75 ? substr($closureString, 0, 72).'...' : $closureString
+                ));
+            }
+
             $closure($this->session, $node);
         }
 

tests/PHPCR/Tests/Util/Console/Command/NodesUpdateCommandTest.php

@@ -143,13 +143,16 @@ public function testApplyClosure()
             '--query' => "SELECT foo FROM bar",
             '--no-interaction' => true,
             '--apply-closure' => array(
-                '$session->getNodeByIdentifier("/foo"); $node->setProperty("foo", "bar");'
+                '$session->getNodeByIdentifier("/foo"); $node->setProperty("foo", "bar");',
+                function ($session, $node) {
+                    $node->setProperty('foo', 'bar');
+                }
             ),
         );
 
         $this->setupQueryManager(array('query' => 'SELECT foo FROM bar'));
 
-        $this->node1->expects($this->once())
+        $this->node1->expects($this->exactly(2))
             ->method('setProperty')
             ->with('foo', 'bar');