phpcr · dbu · Jan 20, 2017 · Jan 20, 2017 · Jan 20, 2017
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,6 @@
 language: php
 
 php:
-  - 5.4
-  - 5.5
   - 5.6
   - 7.0
   - 7.1
@@ -15,7 +13,7 @@ sudo: false
 
 matrix:
   include:
-    - php: 5.3
+    - php: 5.6
       env: PACKAGE_VERSION=low
 
 before_script:

diff --git a/bin/phpcr b/bin/phpcr
@@ -1,6 +1,10 @@
 #!/usr/bin/env php
 <?php
 
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Helper\HelperSet;
+use PHPCR\Util\Console\Command;
+
 if (!class_exists('\Symfony\Component\Console\Application')) {
     if (is_file(__DIR__.'/../vendor/autoload.php')) {
         require __DIR__.'/../vendor/autoload.php';
@@ -19,7 +23,7 @@ $helperSet = null;
 if (file_exists($configFile)) {
     if (!is_readable($configFile)) {
         trigger_error(
-            'Configuration file [' . $configFile . '] does not have read permission.', E_USER_ERROR
+            "Configuration file [$configFile] does not have read permission.", E_USER_ERROR
         );
     }
 
@@ -33,29 +37,32 @@ if (file_exists($configFile)) {
     }
 } else {
     trigger_error(
-        'Configuration file [' . $configFile . '] does not exist. See https://github.com/doctrine/phpcr-odm/wiki/Command-line-tool-configuration', E_USER_ERROR
+        "Configuration file [$configFile] does not exist. See https://github.com/doctrine/phpcr-odm/wiki/Command-line-tool-configuration", E_USER_ERROR
     );
 }
 
-$helperSet = ($helperSet) ?: new \Symfony\Component\Console\Helper\HelperSet();
+$helperSet = $helperSet ?: new HelperSet();
+
+$cli = new Application('PHPCR Command Line Interface', '0.1');
 
-$cli = new \Symfony\Component\Console\Application('PHPCR Command Line Interface', '0.1');
 $cli->setCatchExceptions(true);
 $cli->setHelperSet($helperSet);
+
 $cli->addCommands(array(
-    new \PHPCR\Util\Console\Command\NodeDumpCommand(),
-    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(),
-    new \PHPCR\Util\Console\Command\WorkspaceDeleteCommand(),
-    new \PHPCR\Util\Console\Command\WorkspaceExportCommand(),
-    new \PHPCR\Util\Console\Command\WorkspaceImportCommand(),
-    new \PHPCR\Util\Console\Command\WorkspacePurgeCommand(),
-    new \PHPCR\Util\Console\Command\WorkspaceQueryCommand(),
+    new Command\NodeDumpCommand(),
+    new Command\NodeMoveCommand(),
+    new Command\NodeRemoveCommand(),
+    new Command\NodeTouchCommand(),
+    new Command\NodesUpdateCommand(),
+    new Command\NodeTypeListCommand(),
+    new Command\NodeTypeRegisterCommand(),
+    new Command\WorkspaceCreateCommand(),
+    new Command\WorkspaceDeleteCommand(),
+    new Command\WorkspaceExportCommand(),
+    new Command\WorkspaceImportCommand(),
+    new Command\WorkspacePurgeCommand(),
+    new Command\WorkspaceQueryCommand(),
 ));
+
 $cli->run();
 
diff --git a/composer.json b/composer.json
@@ -27,10 +27,13 @@
         }
     ],
     "require": {
-        "php": "^5.3.3|7.0.x|7.1.x",
+        "php": "^5.6|7.0.x|7.1.x",
         "phpcr/phpcr": "~2.1.0",
         "symfony/console": "~2.3|~3.0"
     },
+    "require-dev": {
+        "ramsey/uuid": "^3.5"
+    },
     "suggest": {
         "ramsey/uuid": "A PHP 5.4+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID)."
     },
@@ -45,7 +48,7 @@
     "bin": ["bin/phpcr"],
     "extra": {
         "branch-alias": {
-            "dev-master": "1.2-dev"
+            "dev-master": "1.3-dev"
         }
     }
 }
diff --git a/src/PHPCR/Util/Console/Command/NodeTypeRegisterCommand.php b/src/PHPCR/Util/Console/Command/NodeTypeRegisterCommand.php
@@ -2,9 +2,10 @@
 
 namespace PHPCR\Util\Console\Command;
 
+use InvalidArgumentException;
+use PHPCR\RepositoryException;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use PHPCR\SessionInterface;
@@ -62,15 +63,15 @@ protected function configure()
 
     /**
      * {@inheritDoc}
+     *
+     * @throws InvalidArgumentException
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $definitions = $input->getArgument('cnd-file');
 
         if (count($definitions) == 0) {
-            throw new \InvalidArgumentException(
-                'At least one definition (i.e. file or folder) must be specified'
-            );
+            throw new InvalidArgumentException('At least one definition (i.e. file or folder) must be specified');
         }
 
         $allowUpdate = $input->getOption('allow-update');
@@ -99,7 +100,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
      * @param string           $cnd         the compact namespace and node type definition in string form
      * @param bool             $allowUpdate whether to allow updating existing node types.
      *
-     * @throws \PHPCR\RepositoryException on other errors
+     * @throws RepositoryException on other errors
      */
     protected function updateFromCnd(OutputInterface $output, SessionInterface $session, $cnd, $allowUpdate)
     {
@@ -124,6 +125,8 @@ protected function updateFromCnd(OutputInterface $output, SessionInterface $sess
      * @param array $definitions List of files of folders
      *
      * @return array Array of full paths to all the type node definition files.
+     *
+     * @throws InvalidArgumentException
      */
     protected function getFilePaths($definitions)
     {
@@ -141,7 +144,7 @@ protected function getFilePaths($definitions)
                     $filePath = sprintf('%s/%s', $definition, $file);
 
                     if (!is_readable($filePath)) {
-                        throw new \InvalidArgumentException(
+                        throw new InvalidArgumentException(
                             sprintf("Node type definition file '<info>%s</info>' does not have read permissions.", $file)
                         );
                     }
@@ -150,7 +153,7 @@ protected function getFilePaths($definitions)
                 }
             } else {
                 if (!file_exists($definition)) {
-                    throw new \InvalidArgumentException(
+                    throw new InvalidArgumentException(
                         sprintf("Node type definition file / folder '<info>%s</info>' does not exist.", $definition)
                     );
                 }

diff --git a/src/PHPCR/Util/Console/Command/WorkspaceImportCommand.php b/src/PHPCR/Util/Console/Command/WorkspaceImportCommand.php
@@ -61,7 +61,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             return 1;
         }
 
-        $session->importXml(
+        $session->importXML(
             $parentPath,
             $filename,
             ImportUUIDBehaviorInterface::IMPORT_UUID_CREATE_NEW

diff --git a/src/PHPCR/Util/Console/Helper/PhpcrHelper.php b/src/PHPCR/Util/Console/Helper/PhpcrHelper.php
@@ -2,6 +2,7 @@
 
 namespace PHPCR\Util\Console\Helper;
 
+use Exception;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Helper\Helper;
 use PHPCR\NodeInterface;
@@ -177,7 +178,7 @@ protected function validateQueryLanguage($language)
             }
         }
 
-        throw new \Exception(sprintf(
+        throw new Exception(sprintf(
             'Query language "%s" not supported, available query languages: %s',
             $language, implode(',', $langs)
         ));

diff --git a/src/PHPCR/Util/Console/Helper/TreeDumper/ConsoleDumperNodeVisitor.php b/src/PHPCR/Util/Console/Helper/TreeDumper/ConsoleDumperNodeVisitor.php
@@ -2,6 +2,7 @@
 
 namespace PHPCR\Util\Console\Helper\TreeDumper;
 
+use Exception;
 use Symfony\Component\Console\Output\OutputInterface;
 use PHPCR\ItemInterface;
 use PHPCR\NodeInterface;
@@ -51,14 +52,16 @@ public function setShowFullPath($showFullPath)
      * Print information about the visited node.
      *
      * @param ItemInterface $item the node to visit
+     *
+     * @throws Exception
      */
     public function visit(ItemInterface $item)
     {
         if (! $item instanceof NodeInterface) {
-            throw new \Exception("Internal error: did not expect to visit a non-node object: $item");
+            throw new Exception("Internal error: did not expect to visit a non-node object: $item");
         }
 
-        if ($item->getDepth() == 0) {
+        if ($item->getDepth() === 0) {
             $name = 'ROOT';
         } elseif ($this->showFullPath) {
             $name = $item->getPath();

diff --git a/src/PHPCR/Util/Console/Helper/TreeDumper/ConsoleDumperPropertyVisitor.php b/src/PHPCR/Util/Console/Helper/TreeDumper/ConsoleDumperPropertyVisitor.php
@@ -2,6 +2,7 @@
 
 namespace PHPCR\Util\Console\Helper\TreeDumper;
 
+use Exception;
 use Symfony\Component\Console\Output\OutputInterface;
 use PHPCR\ItemInterface;
 use PHPCR\PropertyInterface;
@@ -30,7 +31,7 @@ class ConsoleDumperPropertyVisitor extends ConsoleDumperItemVisitor
      * Instantiate property visitor
      *
      * @param OutputInterface $output
-     * @param int             $maxLineLength
+     * @param array           $options
      */
     public function __construct(OutputInterface $output, $options = array())
     {
@@ -49,11 +50,13 @@ public function __construct(OutputInterface $output, $options = array())
      * Print information about this property
      *
      * @param ItemInterface $item the property to visit
+     *
+     * @throws Exception
      */
     public function visit(ItemInterface $item)
     {
         if (! $item instanceof PropertyInterface) {
-            throw new \Exception(sprintf('Internal error: did not expect to visit a non-property object: %s', is_object($item) ? get_class($item) : $item));
+            throw new Exception(sprintf('Internal error: did not expect to visit a non-property object: %s', is_object($item) ? get_class($item) : $item));
         }
 
         $value = $item->getString();

diff --git a/src/PHPCR/Util/Console/Helper/TreeDumper/SystemNodeFilter.php b/src/PHPCR/Util/Console/Helper/TreeDumper/SystemNodeFilter.php
@@ -3,6 +3,7 @@
 namespace PHPCR\Util\Console\Helper\TreeDumper;
 
 use PHPCR\ItemInterface;
+use PHPCR\RepositoryException;
 use PHPCR\Util\TreeWalkerFilterInterface;
 use PHPCR\Util\NodeHelper;
 
@@ -19,6 +20,8 @@ class SystemNodeFilter implements TreeWalkerFilterInterface
      * @param ItemInterface $item
      *
      * @return boolean
+     *
+     * @throws RepositoryException
      */
     public function mustVisit(ItemInterface $item)
     {

diff --git a/src/PHPCR/Util/NodeHelper.php b/src/PHPCR/Util/NodeHelper.php
@@ -2,13 +2,19 @@
 
 namespace PHPCR\Util;
 
+use InvalidArgumentException;
+use PHPCR\ItemExistsException;
 use PHPCR\ItemInterface;
+use PHPCR\Lock\LockException;
 use PHPCR\NodeInterface;
+use PHPCR\NodeType\ConstraintViolationException;
+use PHPCR\PathNotFoundException;
 use PHPCR\PropertyInterface;
 use PHPCR\SessionInterface;
 use PHPCR\RepositoryException;
 use PHPCR\ItemNotFoundException;
 use PHPCR\NamespaceException;
+use PHPCR\Version\VersionException;
 
 /**
  * Helper with only static methods to work with PHPCR nodes
@@ -35,6 +41,14 @@ private function __construct()
      * @param string           $path    full path, like /content/jobs/data
      *
      * @return NodeInterface the last node of the path, i.e. data
+     *
+     * @throws InvalidArgumentException
+     * @throws RepositoryException
+     * @throws PathNotFoundException
+     * @throws ItemExistsException
+     * @throws LockException
+     * @throws ConstraintViolationException
+     * @throws VersionException
      */
     public static function createPath(SessionInterface $session, $path)
     {
@@ -65,6 +79,8 @@ public static function createPath(SessionInterface $session, $path)
      * @param SessionInterface $session the session to remove all children of
      *      the root node
      *
+     * @throws RepositoryException
+     *
      * @see isSystemItem
      */
     public static function purgeWorkspace(SessionInterface $session)
@@ -91,6 +107,8 @@ public static function purgeWorkspace(SessionInterface $session)
      *
      * @param SessionInterface $session
      *
+     * @throws RepositoryException
+     *
      * @deprecated
      */
     public static function deleteAllNodes(SessionInterface $session)
@@ -106,6 +124,8 @@ public static function deleteAllNodes(SessionInterface $session)
      * @param ItemInterface $item
      *
      * @return boolean true if $item is a system item, false otherwise
+     *
+     * @throws RepositoryException
      */
     public static function isSystemItem(ItemInterface $item)
     {
@@ -133,6 +153,8 @@ public static function isSystemItem(ItemInterface $item)
      * @throws NamespaceException if a namespace prefix is provided in the
      *      $nameHint which does not exist and this implementation performs
      *      this validation immediately.
+     *
+     * @throws RepositoryException
      */
     public static function generateAutoNodeName($usedNames, $namespaces, $defaultNamespace, $nameHint = null)
     {
@@ -150,15 +172,15 @@ public static function generateAutoNodeName($usedNames, $namespaces, $defaultNam
          * be in the empty namespace and the local part of the name will be
          * generated by the repository.
          */
-        if ('' === $nameHint || ':' == $nameHint || '{}' == $nameHint) {
+        if ('' === $nameHint || ':' === $nameHint || '{}' === $nameHint) {
             return self::generateWithPrefix($usedNames, '');
         }
 
          /*
           * "<i>somePrefix</i>:" where <i>somePrefix</i> is a syntactically
           * valid namespace prefix
           */
-        if (':' == $nameHint[strlen($nameHint)-1]
+        if (':' === $nameHint[strlen($nameHint)-1]
             && substr_count($nameHint, ':') === 1
             && preg_match('#^[a-zA-Z][a-zA-Z0-9]*:$#', $nameHint)
         ) {
@@ -175,8 +197,8 @@ public static function generateAutoNodeName($usedNames, $namespaces, $defaultNam
          * namespace URI
          */
         if (strlen($nameHint) > 2
-            && '{' == $nameHint[0]
-            && '}' == $nameHint[strlen($nameHint)-1]
+            && '{' === $nameHint[0]
+            && '}' === $nameHint[strlen($nameHint)-1]
             && filter_var(substr($nameHint, 1, -1), FILTER_VALIDATE_URL)
         ) {
             $prefix = array_search(substr($nameHint, 1, -1), $namespaces);
@@ -328,7 +350,7 @@ public static function calculateOrderBefore(array $old, array $new)
      *
      * @return array The updated $nodes array with new order
      *
-     * @throws \PHPCR\ItemNotFoundException if $srcChildRelPath or $destChildRelPath are not found in $nodes
+     * @throws ItemNotFoundException if $srcChildRelPath or $destChildRelPath are not found in $nodes
      */
     public static function orderBeforeArray($name, $destination, $list)
     {