cleanups

Author: dbu

src/PHPCR/Util/PathHelper.php

@@ -68,19 +68,10 @@ public static function assertValidAbsolutePath($path, $destination = false, $thr
             || strlen($path) > 1 && '/' === $path[strlen($path) - 1]
             || preg_match('-//|/\./|/\.\./-', $path)
         ) {
-            if ($throw) {
-                throw new RepositoryException("Invalid path $path");
-            }
-
-            return false;
+            return self::error("Invalid path $path", $throw);
         }
         if ($destination && ']' === $path[strlen($path) - 1]) {
-            if ($throw) {
-                throw new RepositoryException("Destination path may not end with index $path");
-            }
-
-            return false;
-
+            return self::error("Destination path may not end with index $path", $throw);
         }
 
         return true;
@@ -97,7 +88,8 @@ public static function assertValidAbsolutePath($path, $destination = false, $thr
      * encode and decode characters that are not natively allowed by a storage
      * engine.
      *
-     * @param string $name The name to check
+     * @param string  $name  The name to check
+     * @param boolean $throw whether to throw an exception on validation errors.
      *
      * @return bool true if valid, false if not valid and $throw was false
      *
@@ -108,11 +100,11 @@ public static function assertValidAbsolutePath($path, $destination = false, $thr
     public static function assertValidLocalName($name, $throw = true)
     {
         if ('.' == $name || '..' == $name) {
-            throw new RepositoryException('Name may not be parent or self identifier: ' . $name);
+            return self::error("Name may not be parent or self identifier: $name", $throw);
         }
 
         if (preg_match('/\\/|:|\\[|\\]|\\||\\*/', $name)) {
-            throw new RepositoryException('Name contains illegal characters: '.$name);
+            return self::error("Name contains illegal characters: $name", $throw);
         }
 
         return true;
@@ -143,30 +135,18 @@ public static function assertValidLocalName($name, $throw = true)
     public static function normalizePath($path, $destination = false, $throw = true)
     {
         if (!is_string($path)) {
-            if ($throw) {
-                throw new RepositoryException('Expected string but got ' . gettype($path));
-            }
-
-            return false;
+            return self::error('Expected string but got ' . gettype($path), $throw);
         }
         if (strlen($path) === 0) {
-            if ($throw) {
-                throw new RepositoryException('Path must not be of zero length');
-            }
-
-            return false;
+            return self::error('Path must not be of zero length', $throw);
         }
 
         if ('/' === $path) {
             return '/';
         }
 
         if ('/' !== $path[0]) {
-            if ($throw) {
-                throw new RepositoryException("Not an absolute path '$path'");
-            }
-
-            return false;
+            return self::error("Not an absolute path '$path'", $throw);
         }
 
         $finalParts= array();
@@ -220,25 +200,13 @@ public static function normalizePath($path, $destination = false, $throw = true)
     public static function absolutizePath($path, $context, $destination = false, $throw = true)
     {
         if (!is_string($path)) {
-            if ($throw) {
-                throw new RepositoryException('Expected string path but got ' . gettype($path));
-            }
-
-            return false;
+            return self::error('Expected string path but got ' . gettype($path), $throw);
         }
         if (!is_string($context)) {
-            if ($throw) {
-                throw new RepositoryException('Expected string context but got ' . gettype($context));
-            }
-
-            return false;
+            return self::error('Expected string context but got ' . gettype($context), $throw);
         }
         if (strlen($path) === 0) {
-            if ($throw) {
-                throw new RepositoryException('Path must not be of zero length');
-            }
-
-            return false;
+            return self::error('Path must not be of zero length', $throw);
         }
 
         if ('/' !== $path[0]) {
@@ -297,4 +265,24 @@ public static function getPathDepth($path)
     {
         return substr_count(rtrim($path, '/'), '/');
     }
+
+    /**
+     * If $throw is true, throw a RepositoryException with $msg. Otherwise
+     * return false.
+     *
+     * @param string  $msg   the exception message to use in case of throw being true
+     * @param boolean $throw whether to throw the exception or return false
+     *
+     * @return boolean false
+     *
+     * @throws RepositoryException
+     */
+    private static function error($msg, $throw)
+    {
+        if ($throw) {
+            throw new RepositoryException($msg);
+        }
+
+        return false;
+    }
 }

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

@@ -44,17 +44,17 @@ abstract class BaseCommandTest extends \PHPUnit_Framework_TestCase
     /**
      * @var NodeInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $node1;
+    public $node1;
 
     /**
      * @var RowInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $row1;
+    public $row1;
 
     /**
      * @var QueryManagerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $queryManager;
+    public $queryManager;
 
     /**
      * @var HelperSet