Made apply-closure use create_function instead of eval

- Also polished up documentation etc.

Author: dantleech

bin/phpcr

@@ -44,6 +44,7 @@ $cli->addCommands(array(
     new \PHPCR\Util\Console\Command\NodeMoveCommand(),
     new \PHPCR\Util\Console\Command\NodeRemoveCommand(),
     new \PHPCR\Util\Console\Command\NodeTouchCommand(),
+    new \PHPCR\Util\Console\Command\NodesUpdateCommand(),
     new \PHPCR\Util\Console\Command\NodeTypeListCommand(),
     new \PHPCR\Util\Console\Command\NodeTypeRegisterCommand(),
     new \PHPCR\Util\Console\Command\WorkspaceCreateCommand(),

src/PHPCR/Util/Console/Command/NodesUpdateCommand.php

@@ -61,17 +61,28 @@ protected function configure()
 The <info>phpcr:nodes:update</info> can manipulate the properties of nodes 
 found using the given query.
 
-For example, to set the property "foo" to "bar" on all unstructured nodes:
+For example, to set the property <comment>foo</comment> to <comment>bar</comment> on all unstructured nodes:
 
-    php bin/phpcr phpcr:nodes:update --query="SELECT * FROM [nt:unstructured]" --set-prop=foo=bar
+    <info>php bin/phpcr phpcr:nodes:update --query="SELECT * FROM [nt:unstructured]" --set-prop=foo=bar</info>
 
 Or to update only nodes matching a certain criteria:
 
-    php bin/phpcr nodes:update --query="SELECT * FROM [nt:unstructured] WHERE [phpcr:class]=\"Some\\Class\\Here\" --add-mixin=mix:mimetype
+    <info>php bin/phpcr phpcr:nodes:update \
+        --query="SELECT * FROM [nt:unstructured] WHERE [phpcr:class]=\"Some\\Class\\Here\"" \
+        --add-mixin=mix:mimetype</info>
 
 The options for manipulating nodes are the same as with the 
 <info>node:touch</info> command and
 can be repeated to update multiple properties.
+
+If you have an advanced use case you can use the <comment>--apply-closure</comment> option:
+
+    <info>php bin/phpcr phpcr:nodes:update \
+        --query="SELECT * FROM [nt:unstructured] WHERE [phpcr:class]=\"Some\\Class\\Here\"" \
+        --apply-closure="\\\$session->doSomething(); \\\$node->setProperty('foo', 'bar');"</info>
+
+For each node in the result set, the closure will be passed the current 
+<comment>PHPCR\SessionInterface</comment> implementation and the node (<comment>PHPCR\NodeInterface</comment>) as <comment>\$session</comment> and <comment>\$node</comment>.
 HERE
 );
     }

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

@@ -117,8 +117,11 @@ public function processNode(OutputInterface $output, $node, $options)
         }
 
         foreach ($options['applyClosures'] as $closureString) {
-            $evalCode = sprintf('$closure = %s;', $closureString);
-            eval($evalCode);
+            $closure = create_function('$session, $node', $closureString);
+            $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,7 +143,7 @@ public function testApplyClosure()
             '--query' => "SELECT foo FROM bar",
             '--no-interaction' => true,
             '--apply-closure' => array(
-                'function ($session, $node) { $session->getNodeByIdentifier("/foo"); $node->setProperty("foo", "bar"); }'
+                '$session->getNodeByIdentifier("/foo"); $node->setProperty("foo", "bar");'
             ),
         );